Fixups for PMBus and new sensors
v2 cover Fixups for PMBus and new sensors
This patch series contains updates to PMBus in QEMU along with some PMBus device models for Renesas regulators.
I have also added myself to MAINTAINERS as this code is in use daily, where I am responsible for it.
v2:
- split PMBus commit with updates into individual fixes
- renamed isl_pmbus[.ch] adding _vr for voltage regulators
Shengtan Mao (1):
hw/i2c: Added linear mode translation for pmbus devices
Titus Rwantare (8):
hw/i2c: pmbus: add registers
hw/i2c: pmbus: guard against out of range accesses hw/i2c: pmbus: add PEC unsupported warning
hw/i2c: pmbus: refactor uint handling and update MAINTAINERS hw/sensor: add Intersil ISL69260 device model hw/sensor: add Renesas raa229004 PMBus device hw/sensor: add Renesas raa228000 device
hw/sensor: rename isl_pmbus to isl_pmbus_vr
MAINTAINERS | 13 + hw/arm/Kconfig | 1 + hw/i2c/pmbus_device.c | 106 ++++++- hw/sensor/Kconfig | 5 + hw/sensor/isl_pmbus_vr.c | 279 ++++++++++++++++++ hw/sensor/meson.build | 1 + include/hw/i2c/pmbus_device.h | 23 +- include/hw/sensor/isl_pmbus_vr.h | 52 ++++ tests/qtest/isl_pmbus_vr-test.c | 474 +++++++++++++++++++++++++++++++ tests/qtest/meson.build | 1 + 10 files changed, 944 insertions(+), 11 deletions(-) create mode 100644 hw/sensor/isl_pmbus_vr.c create mode 100644 include/hw/sensor/isl_pmbus_vr.h create mode 100644 tests/qtest/isl_pmbus_vr-test.c
Signature · 1 line
2.35.1.616.g0bdcbb4464-goog
PATCH v2 1/9 hw/i2c: pmbus: add registers
- add the VOUT_MIN and STATUS_MFR registers
--- hw/i2c/pmbus_device.c | 24 ++++++++++++++++++++++++ include/hw/i2c/pmbus_device.h | 3 +++ 2 files changed, 27 insertions(+)
hw/i2c/pmbus_device.c +24 -0
@@ -368,6 +368,14 @@ static uint8_t pmbus_receive_byte(SMBusDevice *smd) }break ; +case PMBUS_VOUT_MIN :/* R/W word */ +if (pmdev->pages[index].page_flags &PB_HAS_VOUT_RATING ) { +pmbus_send16 (pmdev, pmdev->pages[index].vout_min); + }else { + goto passthough; + } +break ; +/* TODO: implement coefficients support */ case PMBUS_POUT_MAX :/* R/W word */
@@ -708,6 +716,10 @@ static uint8_t pmbus_receive_byte(SMBusDevice *smd)pmbus_send8 (pmdev, pmdev->pages[index].status_other);break ; +case PMBUS_STATUS_MFR_SPECIFIC :/* R/W byte */ +pmbus_send8 (pmdev, pmdev->pages[index].status_mfr_specific); +break ; +case PMBUS_READ_EIN :/* Read-Only block 5 bytes */ if (pmdev->pages[index].page_flags &PB_HAS_EIN ) {pmbus_send (pmdev, pmdev->pages[index].read_ein,5 );
@@ -1149,6 +1161,14 @@ static int pmbus_write_data(SMBusDevice *smd, uint8_t *buf, uint8_t len) }break ; +case PMBUS_VOUT_MIN :/* R/W word */ +if (pmdev->pages[index].page_flags &PB_HAS_VOUT_RATING ) { + pmdev->pages[index].vout_min =pmbus_receive16 (pmdev); + }else { + goto passthrough; + } +break ; +case PMBUS_POUT_MAX :/* R/W word */ if (pmdev->pages[index].page_flags &PB_HAS_VOUT ) { pmdev->pages[index].pout_max =pmbus_receive16 (pmdev);
@@ -1482,6 +1502,10 @@ static int pmbus_write_data(SMBusDevice *smd, uint8_t *buf, uint8_t len) pmdev->pages[index].status_other =pmbus_receive8 (pmdev);break ; +case PMBUS_STATUS_MFR_SPECIFIC :/* R/W byte */ + pmdev->pages[index].status_mfr_specific =pmbus_receive8 (pmdev); +break ; +case PMBUS_PAGE_PLUS_READ :/* Block Read-only */ case PMBUS_CAPABILITY :/* Read-Only byte */ case PMBUS_COEFFICIENTS :/* Read-only block 5 bytes */
include/hw/i2c/pmbus_device.h +3 -0
@@ -43,6 +43,7 @@ enum pmbus_registers {PMBUS_VOUT_DROOP =0x28 ,/* R/W word */ PMBUS_VOUT_SCALE_LOOP =0x29 ,/* R/W word */ PMBUS_VOUT_SCALE_MONITOR =0x2A ,/* R/W word */ +PMBUS_VOUT_MIN =0x2B ,/* R/W word */ PMBUS_COEFFICIENTS =0x30 ,/* Read-only block 5 bytes */ PMBUS_POUT_MAX =0x31 ,/* R/W word */ PMBUS_MAX_DUTY = 0x32, /* R/W word */
@@ -255,6 +256,7 @@ OBJECT_DECLARE_TYPE(PMBusDevice, PMBusDeviceClass,#define PB_HAS_TEMP3 BIT_ULL(42)#define PB_HAS_TEMP_RATING BIT_ULL(43)#define PB_HAS_MFR_INFO BIT_ULL(50) +#define PB_HAS_STATUS_MFR_SPECIFIC BIT_ULL(51)struct PMBusDeviceClass {SMBusDeviceClass parent_class;
@@ -295,6 +297,7 @@ typedef struct PMBusPage {uint16_t vout_droop;/* R/W word */ uint16_t vout_scale_loop;/* R/W word */ uint16_t vout_scale_monitor;/* R/W word */ +uint16_t vout_min;/* R/W word */ uint8_t coefficients[5 ];/* Read-only block 5 bytes */ uint16_t pout_max;/* R/W word */ uint16_t max_duty;/* R/W word */
Signature · 1 line
2.35.1.616.g0bdcbb4464-goog
PATCH v2 2/9 hw/i2c: pmbus: guard against out of range accesses
In reply to Titus Rwantare--- hw/i2c/pmbus_device.c | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-)
hw/i2c/pmbus_device.c +40 -1
@@ -243,18 +243,47 @@ void pmbus_check_limits(PMBusDevice *pmdev) } } +/* assert the status_cml error upon receipt of malformed command */ +static void pmbus_cml_error (PMBusDevice *pmdev) +{ +for (int i =0 ; i < pmdev->num_pages; i++) { + pmdev->pages[i].status_word |=PMBUS_STATUS_CML ; + pmdev->pages[i].status_cml |=PB_CML_FAULT_INVALID_CMD ; + } +} +static uint8_t pmbus_receive_byte (SMBusDevice *smd) {PMBusDevice *pmdev =PMBUS_DEVICE (smd);PMBusDeviceClass *pmdc =PMBUS_DEVICE_GET_CLASS (pmdev);uint8_t ret =0xFF ; -uint8_t index = pmdev->page; +uint8_t index;if (pmdev->out_buf_len !=0 ) { ret =pmbus_out_buf_pop (pmdev);return ret; } +/* +* Reading from all pages will return the value from page 0, +* this is unspecified behaviour in general. +*/ +if (pmdev->page ==PB_ALL_PAGES ) { + index =0 ; +qemu_log_mask (LOG_GUEST_ERROR , +"%s: tried to read from all pages\n" , + __func__); +pmbus_cml_error (pmdev); + }else if (pmdev->page > pmdev->num_pages -1 ) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: page %d is out of range\n" , + __func__, pmdev->page); +pmbus_cml_error (pmdev); +return -1 ; + }else { + index = pmdev->page; + } +switch (pmdev->code) {case PMBUS_PAGE :pmbus_send8 (pmdev, pmdev->page);
@@ -1038,6 +1067,7 @@ static int pmbus_write_data(SMBusDevice *smd, uint8_t *buf, uint8_t len) pmdev->page =pmbus_receive8 (pmdev);return 0 ; } +/* loop through all the pages when 0xFF is received */ if (pmdev->page ==PB_ALL_PAGES ) {for (int i =0 ; i < pmdev->num_pages; i++) {
@@ -1048,6 +1078,15 @@ static int pmbus_write_data(SMBusDevice *smd, uint8_t *buf, uint8_t len)return 0 ; } +if (pmdev->page > pmdev->num_pages -1 ) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: page %u is out of range\n" , + __func__, pmdev->page); + pmdev->page =0 ;/* undefined behaviour - reset to page 0 */ +pmbus_cml_error (pmdev); +return -1 ; + } + index = pmdev->page;switch (pmdev->code) {
Signature · 1 line
2.35.1.616.g0bdcbb4464-goog
PATCH v2 3/9 hw/i2c: pmbus: add PEC unsupported warning
In reply to Titus Rwantare--- hw/i2c/pmbus_device.c | 5 +++++ 1 file changed, 5 insertions(+)
hw/i2c/pmbus_device.c +5 -0
@@ -307,6 +307,11 @@ static uint8_t pmbus_receive_byte(SMBusDevice *smd)case PMBUS_CAPABILITY :pmbus_send8 (pmdev, pmdev->capability); +if (pmdev->capability &BIT (7 )) { +qemu_log_mask (LOG_GUEST_ERROR , +"%s: PEC is enabled but not yet supported.\n" , + __func__); + }break ;case PMBUS_VOUT_MODE :/* R/W byte */
Signature · 1 line
2.35.1.616.g0bdcbb4464-goog
PATCH v2 4/9 hw/i2c: pmbus: refactor uint handling and update MAINTAINERS
In reply to Titus Rwantare--- MAINTAINERS | 10 ++++++++++ hw/i2c/pmbus_device.c | 18 +++++++++--------- 2 files changed, 19 insertions(+), 9 deletions(-)
MAINTAINERS +10 -0
@@ -3135,6 +3135,16 @@ F: include/hw/i2c/smbus_master.h F: include/hw/i2c/smbus_slave.h F: include/hw/i2c/smbus_eeprom.h +PMBus +M: Titus Rwantare <[email protected]> +S: Maintained +F: hw/i2c/pmbus_device.c +F: hw/sensor/adm1272.c +F: hw/sensor/max34451.c +F: include/hw/i2c/pmbus_device.h +F: tests/qtest/adm1272-test.c +F: tests/qtest/max34451-test.c + Firmware schema specifications M: Philippe Mathieu-Daudé <[email protected]> R: Daniel P. Berrange <[email protected]>
hw/i2c/pmbus_device.c +9 -9
@@ -89,16 +89,16 @@ void pmbus_send_string(PMBusDevice *pmdev, const char *data) } -static uint64_t pmbus_receive_uint (const uint8_t *buf,uint8_t len) +static uint64_t pmbus_receive_uint (PMBusDevice *pmdev) {uint64_t ret =0 ;/* Exclude command code from return value */ - buf++; - len--; + pmdev->in_buf++; + pmdev->in_buf_len--; -for (int i = len -1 ; i >=0 ; i--) { - ret = ret <<8 | buf[i]; +for (int i = pmdev->in_buf_len -1 ; i >=0 ; i--) { + ret = ret <<8 | pmdev->in_buf[i]; }return ret; }
@@ -110,7 +110,7 @@ uint8_t pmbus_receive8(PMBusDevice *pmdev)"%s: length mismatch. Expected 1 byte, got %d bytes\n" , __func__, pmdev->in_buf_len - 1); } -return pmbus_receive_uint (pmdev->in_buf, pmdev->in_buf_len); +return pmbus_receive_uint (pmdev); }uint16_t pmbus_receive16 (PMBusDevice *pmdev)
@@ -120,7 +120,7 @@ uint16_t pmbus_receive16(PMBusDevice *pmdev)"%s: length mismatch. Expected 2 bytes, got %d bytes\n" , __func__, pmdev->in_buf_len - 1); } -return pmbus_receive_uint (pmdev->in_buf, pmdev->in_buf_len); +return pmbus_receive_uint (pmdev); }uint32_t pmbus_receive32 (PMBusDevice *pmdev)
@@ -130,7 +130,7 @@ uint32_t pmbus_receive32(PMBusDevice *pmdev)"%s: length mismatch. Expected 4 bytes, got %d bytes\n" , __func__, pmdev->in_buf_len - 1); } -return pmbus_receive_uint (pmdev->in_buf, pmdev->in_buf_len); +return pmbus_receive_uint (pmdev); }uint64_t pmbus_receive64 (PMBusDevice *pmdev)
@@ -140,7 +140,7 @@ uint64_t pmbus_receive64(PMBusDevice *pmdev)"%s: length mismatch. Expected 8 bytes, got %d bytes\n" , __func__, pmdev->in_buf_len - 1); } -return pmbus_receive_uint (pmdev->in_buf, pmdev->in_buf_len); +return pmbus_receive_uint (pmdev); }static uint8_t pmbus_out_buf_pop (PMBusDevice *pmdev)
Signature · 1 line
2.35.1.616.g0bdcbb4464-goog
Re: [PATCH v2 4/9] hw/i2c: pmbus: refactor uint handling and update MAINTAINERS
Quoted 5 lines · Titus Rwantare
Signed-off-by Titus Rwantare <[email protected]>--- MAINTAINERS | 10 ++++++++++ hw/i2c/pmbus_device.c | 18 +++++++++--------- 2 files changed, 19 insertions(+), 9 deletions(-)
This makes sense, but can you split it into two patches and give a bit more explaination about the uint handling. Usually patches without explaination are frowned upon, even if it's kind of obvious.
-corey
Quoted 87 lines
MAINTAINERS +10
-0@@ -3135,6 +3135,16 @@ F: include/hw/i2c/smbus_master.h F: include/hw/i2c/smbus_slave.h F: include/hw/i2c/smbus_eeprom.h +PMBus +M: Titus Rwantare <[email protected]> +S: Maintained +F: hw/i2c/pmbus_device.c +F: hw/sensor/adm1272.c +F: hw/sensor/max34451.c +F: include/hw/i2c/pmbus_device.h +F: tests/qtest/adm1272-test.c +F: tests/qtest/max34451-test.c + Firmware schema specifications M: Philippe Mathieu-Daudé <[email protected]> R: Daniel P. Berrange <[email protected]>hw/i2c/pmbus_device.c +9
-9@@ -89,16 +89,16 @@ void pmbus_send_string(PMBusDevice *pmdev, const char *data) } -static uint64_t pmbus_receive_uint (const uint8_t *buf,uint8_t len) +static uint64_t pmbus_receive_uint (PMBusDevice *pmdev) {uint64_t ret =0 ;/* Exclude command code from return value */ - buf++; - len--; + pmdev->in_buf++; + pmdev->in_buf_len--; -for (int i = len -1 ; i >=0 ; i--) { - ret = ret <<8 | buf[i]; +for (int i = pmdev->in_buf_len -1 ; i >=0 ; i--) { + ret = ret <<8 | pmdev->in_buf[i]; }return ret; }@@ -110,7 +110,7 @@ uint8_t pmbus_receive8(PMBusDevice *pmdev)"%s: length mismatch. Expected 1 byte, got %d bytes\n" , __func__, pmdev->in_buf_len - 1); } -return pmbus_receive_uint (pmdev->in_buf, pmdev->in_buf_len); +return pmbus_receive_uint (pmdev); }uint16_t pmbus_receive16 (PMBusDevice *pmdev)@@ -120,7 +120,7 @@ uint16_t pmbus_receive16(PMBusDevice *pmdev)"%s: length mismatch. Expected 2 bytes, got %d bytes\n" , __func__, pmdev->in_buf_len - 1); } -return pmbus_receive_uint (pmdev->in_buf, pmdev->in_buf_len); +return pmbus_receive_uint (pmdev); }uint32_t pmbus_receive32 (PMBusDevice *pmdev)@@ -130,7 +130,7 @@ uint32_t pmbus_receive32(PMBusDevice *pmdev)"%s: length mismatch. Expected 4 bytes, got %d bytes\n" , __func__, pmdev->in_buf_len - 1); } -return pmbus_receive_uint (pmdev->in_buf, pmdev->in_buf_len); +return pmbus_receive_uint (pmdev); }uint64_t pmbus_receive64 (PMBusDevice *pmdev)@@ -140,7 +140,7 @@ uint64_t pmbus_receive64(PMBusDevice *pmdev)"%s: length mismatch. Expected 8 bytes, got %d bytes\n" , __func__, pmdev->in_buf_len - 1); } -return pmbus_receive_uint (pmdev->in_buf, pmdev->in_buf_len); +return pmbus_receive_uint (pmdev); }static uint8_t pmbus_out_buf_pop (PMBusDevice *pmdev)Signature · 1 line
2.35.1.616.g0bdcbb4464-goog
PATCH v2 5/9 hw/i2c: Added linear mode translation for pmbus devices
In reply to Titus RwantareFrom: Shengtan Mao <[email protected]>
--- hw/i2c/pmbus_device.c | 18 ++++++++++++++++++ include/hw/i2c/pmbus_device.h | 20 +++++++++++++++++++- 2 files changed, 37 insertions(+), 1 deletion(-)
hw/i2c/pmbus_device.c +18 -0
@@ -28,6 +28,24 @@ uint32_t pmbus_direct_mode2data(PMBusCoefficients c, uint16_t value)return x; } +uint16_t pmbus_data2linear_mode (uint16_t value,int exp) +{ +/* L = D * 2^(-e) */ +if (exp <0 ) { +return value << (-exp); + } +return value >> exp; +} + +uint16_t pmbus_linear_mode2data (uint16_t value,int exp) +{ +/* D = L * 2^e */ +if (exp <0 ) { +return value >> (-exp); + } +return value << exp; +} +void pmbus_send (PMBusDevice *pmdev,const uint8_t *data,uint16_t len) {if (pmdev->out_buf_len + len >SMBUS_DATA_MAX_LEN ) {
include/hw/i2c/pmbus_device.h +19 -1
@@ -446,7 +446,7 @@ typedef struct PMBusCoefficients {* * Y = (m * x - b) * 10^R * -* @return uint32_t +* @return uint16_t */ uint16_t pmbus_data2direct_mode (PMBusCoefficients c,uint32_t value);
@@ -459,6 +459,24 @@ uint16_t pmbus_data2direct_mode(PMBusCoefficients c, uint32_t value);*/ uint32_t pmbus_direct_mode2data (PMBusCoefficients c,uint16_t value); +/** +* Convert sensor values to linear mode format +* +* L = D * 2^(-e) +* +* @return uint16 +*/ +uint16_t pmbus_data2linear_mode (uint16_t value,int exp); + +/** +* Convert linear mode formatted data into sensor reading +* +* D = L * 2^e +* +* @return uint16 +*/ +uint16_t pmbus_linear_mode2data (uint16_t value,int exp); +/** * @brief Send a block of data over PMBus * Assumes that the bytes in the block are already ordered correctly,
Signature · 1 line
2.35.1.616.g0bdcbb4464-goog
PATCH v2 6/9 hw/sensor: add Intersil ISL69260 device model
In reply to Titus Rwantare--- MAINTAINERS | 3 + hw/arm/Kconfig | 1 + hw/sensor/Kconfig | 5 + hw/sensor/isl_pmbus.c | 210 ++++++++++++++++++ hw/sensor/meson.build | 1 + include/hw/sensor/isl_pmbus.h | 50 +++++ tests/qtest/isl_pmbus-test.c | 393 ++++++++++++++++++++++++++++++++++ tests/qtest/meson.build | 1 + 8 files changed, 664 insertions(+) create mode 100644 hw/sensor/isl_pmbus.c create mode 100644 include/hw/sensor/isl_pmbus.h create mode 100644 tests/qtest/isl_pmbus-test.c
MAINTAINERS +3 -0
@@ -3140,10 +3140,13 @@ M: Titus Rwantare <[email protected]> S: Maintained F: hw/i2c/pmbus_device.c F: hw/sensor/adm1272.c +F: hw/sensor/isl_pmbus.c F: hw/sensor/max34451.c F: include/hw/i2c/pmbus_device.h +F: include/hw/sensor/isl_pmbus.h F: tests/qtest/adm1272-test.c F: tests/qtest/max34451-test.c +F: tests/qtest/isl_pmbus-test.c Firmware schema specifications M: Philippe Mathieu-Daudé <[email protected]>
hw/arm/Kconfig +1 -0
@@ -400,6 +400,7 @@ config NPCM7XX select SMBUS select AT24C # EEPROM select MAX34451 + select ISL_PMBUS select PL310 # cache controller select PMBUS select SERIAL
hw/sensor/Kconfig +5 -0
@@ -30,3 +30,8 @@ config LSM303DLHC_MAG bool depends on I2C default y if I2C_DEVICES + +config ISL_PMBUS + bool + depends on I2C +
hw/sensor/isl_pmbus.c new file +210 -0
210 lines not on this page · raw message
hw/sensor/meson.build +1 -0
@@ -5,3 +5,4 @@ softmmu_ss.add(when: 'CONFIG_EMC141X', if_true: files('emc141x.c')) softmmu_ss.add(when: 'CONFIG_ADM1272', if_true: files('adm1272.c')) softmmu_ss.add(when: 'CONFIG_MAX34451', if_true: files('max34451.c')) softmmu_ss.add(when: 'CONFIG_LSM303DLHC_MAG', if_true: files('lsm303dlhc_mag.c')) +softmmu_ss.add(when: 'CONFIG_ISL_PMBUS', if_true: files('isl_pmbus.c'))
include/hw/sensor/isl_pmbus.h new file +50 -0
50 lines not on this page · raw message
tests/qtest/isl_pmbus-test.c new file +393 -0
393 lines not on this page · raw message
tests/qtest/meson.build +1 -0
@@ -244,6 +244,7 @@ qos_test_ss.add( 'es1370-test.c', 'ipoctal232-test.c', 'lsm303dlhc-mag-test.c', + 'isl_pmbus-test.c', 'max34451-test.c', 'megasas-test.c', 'ne2000-test.c',
Signature · 1 line
2.35.1.616.g0bdcbb4464-goog
PATCH v2 7/9 hw/sensor: add Renesas raa229004 PMBus device
In reply to Titus RwantareThe Renesas RAA229004 is a PMBus Multiphase Voltage Regulator
--- hw/sensor/isl_pmbus.c | 18 ++++++++++++++++++ include/hw/sensor/isl_pmbus.h | 1 + tests/qtest/isl_pmbus-test.c | 8 ++++++++ 3 files changed, 27 insertions(+)
hw/sensor/isl_pmbus.c +18 -0
@@ -194,6 +194,15 @@ static void isl69260_class_init(ObjectClass *klass, void *data)isl_pmbus_class_init (klass, data,2 ); } +static void raa229004_class_init (ObjectClass *klass,void *data) +{ +ResettableClass *rc =RESETTABLE_CLASS (klass); +DeviceClass *dc =DEVICE_CLASS (klass); + dc->desc ="Renesas 229004 Digital Multiphase Voltage Regulator" ; + rc->phases.exit = isl_pmbus_exit_reset; +isl_pmbus_class_init (klass, data,2 ); +} +static const TypeInfo isl69260_info = { .name =TYPE_ISL69260 , .parent =TYPE_PMBUS_DEVICE ,
@@ -202,9 +211,18 @@ static const TypeInfo isl69260_info = { .class_init = isl69260_class_init, }; +static const TypeInfo raa229004_info = { + .name =TYPE_RAA229004 , + .parent =TYPE_PMBUS_DEVICE , + .instance_size =sizeof (ISLState), + .instance_init = raa22xx_init, + .class_init = raa229004_class_init, +}; +static void isl_pmbus_register_types (void ) {type_register_static (&isl69260_info); +type_register_static (&raa229004_info); }type_init (isl_pmbus_register_types)
include/hw/sensor/isl_pmbus.h +1 -0
@@ -13,6 +13,7 @@#include "qom/object.h" #define TYPE_ISL69260 "isl69260" +#define TYPE_RAA229004 "raa229004"struct ISLState {PMBusDevice parent;
tests/qtest/isl_pmbus-test.c +8 -0
@@ -383,11 +383,19 @@ static void isl_pmbus_register_nodes(void)qos_node_create_driver ("isl69260" , i2c_device_create);qos_node_consumes ("isl69260" ,"i2c-bus" , &opts); +qos_node_create_driver ("raa229004" , i2c_device_create); +qos_node_consumes ("raa229004" ,"i2c-bus" , &opts); +qos_add_test ("test_defaults" ,"isl69260" , test_defaults,NULL );qos_add_test ("test_tx_rx" ,"isl69260" , test_tx_rx,NULL );qos_add_test ("test_rw_regs" ,"isl69260" , test_rw_regs,NULL );qos_add_test ("test_pages_rw" ,"isl69260" , test_pages_rw,NULL );qos_add_test ("test_ro_regs" ,"isl69260" , test_ro_regs,NULL );qos_add_test ("test_ov_faults" ,"isl69260" , test_voltage_faults,NULL ); + +qos_add_test ("test_tx_rx" ,"raa229004" , test_tx_rx,NULL ); +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 ); }libqos_init (isl_pmbus_register_nodes);
Signature · 1 line
2.35.1.616.g0bdcbb4464-goog
PATCH v2 8/9 hw/sensor: add Renesas raa228000 device
In reply to Titus Rwantare--- hw/sensor/isl_pmbus.c | 50 ++++++++++++++++++++++ include/hw/sensor/isl_pmbus.h | 1 + tests/qtest/isl_pmbus-test.c | 78 +++++++++++++++++++++++++++++++++-- 3 files changed, 126 insertions(+), 3 deletions(-)
hw/sensor/isl_pmbus.c +50 -0
@@ -89,6 +89,24 @@ static void isl_pmbus_exit_reset(Object *obj) } } +/* The raa228000 uses different direct mode coefficents from most isl devices */ +static void raa228000_exit_reset (Object *obj) +{ +isl_pmbus_exit_reset (obj); + +PMBusDevice *pmdev =PMBUS_DEVICE (obj); + + pmdev->pages[0 ].read_vout =0 ; + pmdev->pages[0 ].read_iout =0 ; + pmdev->pages[0 ].read_pout =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_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_add_props (obj, flags,2 ); } +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_add_props (obj, flags,1 ); +} +static void isl_pmbus_class_init (ObjectClass *klass,void *data,uint8_t pages) {PMBusDeviceClass *k =PMBUS_DEVICE_CLASS (klass);
@@ -194,6 +226,15 @@ static void isl69260_class_init(ObjectClass *klass, void *data)isl_pmbus_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_class_init (klass, data,1 ); +} +static void raa229004_class_init (ObjectClass *klass,void *data) {ResettableClass *rc =RESETTABLE_CLASS (klass);
@@ -219,9 +260,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_register_types (void ) {type_register_static (&isl69260_info); +type_register_static (&raa228000_info);type_register_static (&raa229004_info); }
include/hw/sensor/isl_pmbus.h +1 -0
@@ -13,6 +13,7 @@#include "qom/object.h" #define TYPE_ISL69260 "isl69260" +#define TYPE_RAA228000 "raa228000"#define TYPE_RAA229004 "raa229004"struct ISLState {
tests/qtest/isl_pmbus-test.c +75 -3
99 lines not on this page · raw message
Signature · 1 line
2.35.1.616.g0bdcbb4464-goog
PATCH v2 9/9 hw/sensor: rename isl_pmbus to isl_pmbus_vr
In reply to Titus Rwantare---
MAINTAINERS | 6 +-
hw/arm/Kconfig | 2 +-
hw/sensor/Kconfig | 2 +-
hw/sensor/{isl_pmbus.c => isl_pmbus_vr.c} | 77 ++---
hw/sensor/meson.build | 2 +-
.../hw/sensor/{isl_pmbus.h => isl_pmbus_vr.h} | 4 +-
.../{isl_pmbus-test.c => isl_pmbus_vr-test.c} | 263 +++++++++---------
tests/qtest/meson.build | 2 +-
8 files changed, 180 insertions(+), 178 deletions(-)
rename hw/sensor/{isl_pmbus.c => isl_pmbus_vr.c} (80%)
rename include/hw/sensor/{isl_pmbus.h => isl_pmbus_vr.h} (96%)
rename tests/qtest/{isl_pmbus-test.c => isl_pmbus_vr-test.c} (55%)MAINTAINERS +3 -3
@@ -3140,13 +3140,13 @@ M: Titus Rwantare <[email protected]> S: Maintained F: hw/i2c/pmbus_device.c F: hw/sensor/adm1272.c -F: hw/sensor/isl_pmbus.c +F: hw/sensor/isl_pmbus_vr.c F: hw/sensor/max34451.c F: include/hw/i2c/pmbus_device.h -F: include/hw/sensor/isl_pmbus.h +F: include/hw/sensor/isl_pmbus_vr.h F: tests/qtest/adm1272-test.c F: tests/qtest/max34451-test.c -F: tests/qtest/isl_pmbus-test.c +F: tests/qtest/isl_pmbus_vr-test.c Firmware schema specifications M: Philippe Mathieu-Daudé <[email protected]>
hw/arm/Kconfig +1 -1
@@ -400,7 +400,7 @@ config NPCM7XX select SMBUS select AT24C # EEPROM select MAX34451 - select ISL_PMBUS + select ISL_PMBUS_VR select PL310 # cache controller select PMBUS select SERIAL
hw/sensor/Kconfig +1 -1
@@ -31,7 +31,7 @@ config LSM303DLHC_MAG depends on I2C default y if I2C_DEVICES -config ISL_PMBUS +config ISL_PMBUS_VR bool depends on I2C
hw/sensor/isl_pmbus_vr.c renamed from hw/sensor/isl_pmbus.c +39 -38
211 lines not on this page · raw message
hw/sensor/meson.build +1 -1
@@ -5,4 +5,4 @@ softmmu_ss.add(when: 'CONFIG_EMC141X', if_true: files('emc141x.c')) softmmu_ss.add(when: 'CONFIG_ADM1272', if_true: files('adm1272.c')) softmmu_ss.add(when: 'CONFIG_MAX34451', if_true: files('max34451.c')) softmmu_ss.add(when: 'CONFIG_LSM303DLHC_MAG', if_true: files('lsm303dlhc_mag.c')) -softmmu_ss.add(when: 'CONFIG_ISL_PMBUS', if_true: files('isl_pmbus.c')) +softmmu_ss.add(when: 'CONFIG_ISL_PMBUS_VR', if_true: files('isl_pmbus_vr.c'))
include/hw/sensor/isl_pmbus_vr.h renamed from include/hw/sensor/isl_pmbus.h +2 -2
@@ -6,8 +6,8 @@* SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef HW_MISC_ISL_PMBUS_H -#define HW_MISC_ISL_PMBUS_H +#ifndef HW_MISC_ISL_PMBUS_VR_H +#define HW_MISC_ISL_PMBUS_VR_H #include "hw/i2c/pmbus_device.h" #include "qom/object.h"
tests/qtest/isl_pmbus_vr-test.c renamed from tests/qtest/isl_pmbus-test.c +132 -131
480 lines not on this page · raw message
tests/qtest/meson.build +1 -1
@@ -244,7 +244,7 @@ qos_test_ss.add( 'es1370-test.c', 'ipoctal232-test.c', 'lsm303dlhc-mag-test.c', - 'isl_pmbus-test.c', + 'isl_pmbus_vr-test.c', 'max34451-test.c', 'megasas-test.c', 'ne2000-test.c',
Signature · 1 line
2.35.1.616.g0bdcbb4464-goog
Re: [PATCH v2 9/9] hw/sensor: rename isl_pmbus to isl_pmbus_vr
Quoted 1 line · Titus Rwantare
Signed-off-by Titus Rwantare <[email protected]>
Two things:
* Why do you want to rename this?
* This patch doesn't really add anything, it just renames things in a previous patch. Can it be folded in to the patch that added these fields?
-corey
Quoted 837 lines
--- MAINTAINERS | 6 +- hw/arm/Kconfig | 2 +- hw/sensor/Kconfig | 2 +- hw/sensor/{isl_pmbus.c => isl_pmbus_vr.c} | 77 ++--- hw/sensor/meson.build | 2 +- .../hw/sensor/{isl_pmbus.h => isl_pmbus_vr.h} | 4 +- .../{isl_pmbus-test.c => isl_pmbus_vr-test.c} | 263 +++++++++--------- tests/qtest/meson.build | 2 +- 8 files changed, 180 insertions(+), 178 deletions(-) rename hw/sensor/{isl_pmbus.c => isl_pmbus_vr.c} (80%) rename include/hw/sensor/{isl_pmbus.h => isl_pmbus_vr.h} (96%) rename tests/qtest/{isl_pmbus-test.c => isl_pmbus_vr-test.c} (55%)MAINTAINERS +3
-3@@ -3140,13 +3140,13 @@ M: Titus Rwantare <[email protected]> S: Maintained F: hw/i2c/pmbus_device.c F: hw/sensor/adm1272.c -F: hw/sensor/isl_pmbus.c +F: hw/sensor/isl_pmbus_vr.c F: hw/sensor/max34451.c F: include/hw/i2c/pmbus_device.h -F: include/hw/sensor/isl_pmbus.h +F: include/hw/sensor/isl_pmbus_vr.h F: tests/qtest/adm1272-test.c F: tests/qtest/max34451-test.c -F: tests/qtest/isl_pmbus-test.c +F: tests/qtest/isl_pmbus_vr-test.c Firmware schema specifications M: Philippe Mathieu-Daudé <[email protected]>hw/arm/Kconfig +1
-1@@ -400,7 +400,7 @@ config NPCM7XX select SMBUS select AT24C # EEPROM select MAX34451 - select ISL_PMBUS + select ISL_PMBUS_VR select PL310 # cache controller select PMBUS select SERIALhw/sensor/Kconfig +1
-1@@ -31,7 +31,7 @@ config LSM303DLHC_MAG depends on I2C default y if I2C_DEVICES -config ISL_PMBUS +config ISL_PMBUS_VR bool depends on I2Chw/sensor/isl_pmbus_vr.c renamed from hw/sensor/isl_pmbus.c +39
-38@@ -7,13 +7,13 @@*/ #include "qemu/osdep.h" -#include "hw/sensor/isl_pmbus.h" +#include "hw/sensor/isl_pmbus_vr.h" #include "hw/qdev-properties.h" #include "qapi/visitor.h" #include "qemu/log.h" #include "qemu/module.h" -static uint8_t isl_pmbus_read_byte (PMBusDevice *pmdev) +static uint8_t isl_pmbus_vr_read_byte (PMBusDevice *pmdev) { qemu_log_mask(LOG_GUEST_ERROR, "%s: reading from unsupported register: 0x%02x\n",@@ -21,7 +21,7 @@ static uint8_t isl_pmbus_read_byte(PMBusDevice *pmdev)return 0xFF ; } -static int isl_pmbus_write_data (PMBusDevice *pmdev,const uint8_t *buf, +static int isl_pmbus_vr_write_data (PMBusDevice *pmdev,const uint8_t *buf,uint8_t len) { qemu_log_mask(LOG_GUEST_ERROR,@@ -31,13 +31,13 @@ static int isl_pmbus_write_data(PMBusDevice *pmdev, const uint8_t *buf, }/* TODO: Implement coefficients support in pmbus_device.c for qmp */ -static void isl_pmbus_get (Object *obj,Visitor *v,const char *name, +static void isl_pmbus_vr_get (Object *obj,Visitor *v,const char *name,void *opaque,Error **errp) {visit_type_uint16 (v, name, (uint16_t *)opaque, errp); } -static void isl_pmbus_set (Object *obj,Visitor *v,const char *name, +static void isl_pmbus_vr_set (Object *obj,Visitor *v,const char *name,void *opaque,Error **errp) {PMBusDevice *pmdev =PMBUS_DEVICE (obj);@@ -51,7 +51,7 @@ static void isl_pmbus_set(Object *obj, Visitor *v, const char *name,pmbus_check_limits (pmdev); } -static void isl_pmbus_exit_reset (Object *obj) +static void isl_pmbus_vr_exit_reset (Object *obj) {PMBusDevice *pmdev =PMBUS_DEVICE (obj);@@ -92,7 +92,7 @@ static void isl_pmbus_exit_reset(Object *obj)/* The raa228000 uses different direct mode coefficents from most isl devices */ static void raa228000_exit_reset (Object *obj) { -isl_pmbus_exit_reset (obj); +isl_pmbus_vr_exit_reset (obj);PMBusDevice *pmdev =PMBUS_DEVICE (obj);@@ -107,70 +107,70 @@ static void raa228000_exit_reset(Object *obj) pmdev->pages[0 ].read_temperature_3 =0 ; } -static void isl_pmbus_add_props (Object *obj,uint64_t *flags,uint8_t pages) +static void isl_pmbus_vr_add_props (Object *obj,uint64_t *flags,uint8_t pages) {PMBusDevice *pmdev =PMBUS_DEVICE (obj);for (int i =0 ; i < pages; i++) {if (flags[i] &PB_HAS_VIN ) {object_property_add (obj,"vin[*]" ,"uint16" , - isl_pmbus_get, - isl_pmbus_set, + isl_pmbus_vr_get, + isl_pmbus_vr_set,NULL , &pmdev->pages[i].read_vin); }if (flags[i] &PB_HAS_VOUT ) {object_property_add (obj,"vout[*]" ,"uint16" , - isl_pmbus_get, - isl_pmbus_set, + isl_pmbus_vr_get, + isl_pmbus_vr_set,NULL , &pmdev->pages[i].read_vout); }if (flags[i] &PB_HAS_IIN ) {object_property_add (obj,"iin[*]" ,"uint16" , - isl_pmbus_get, - isl_pmbus_set, + isl_pmbus_vr_get, + isl_pmbus_vr_set,NULL , &pmdev->pages[i].read_iin); }if (flags[i] &PB_HAS_IOUT ) {object_property_add (obj,"iout[*]" ,"uint16" , - isl_pmbus_get, - isl_pmbus_set, + isl_pmbus_vr_get, + isl_pmbus_vr_set,NULL , &pmdev->pages[i].read_iout); }if (flags[i] &PB_HAS_PIN ) {object_property_add (obj,"pin[*]" ,"uint16" , - isl_pmbus_get, - isl_pmbus_set, + isl_pmbus_vr_get, + isl_pmbus_vr_set,NULL , &pmdev->pages[i].read_pin); }if (flags[i] &PB_HAS_POUT ) {object_property_add (obj,"pout[*]" ,"uint16" , - isl_pmbus_get, - isl_pmbus_set, + isl_pmbus_vr_get, + isl_pmbus_vr_set,NULL , &pmdev->pages[i].read_pout); }if (flags[i] &PB_HAS_TEMPERATURE ) {object_property_add (obj,"temp1[*]" ,"uint16" , - isl_pmbus_get, - isl_pmbus_set, + isl_pmbus_vr_get, + isl_pmbus_vr_set,NULL , &pmdev->pages[i].read_temperature_1); }if (flags[i] &PB_HAS_TEMP2 ) {object_property_add (obj,"temp2[*]" ,"uint16" , - isl_pmbus_get, - isl_pmbus_set, + isl_pmbus_vr_get, + isl_pmbus_vr_set,NULL , &pmdev->pages[i].read_temperature_2); }if (flags[i] &PB_HAS_TEMP3 ) {object_property_add (obj,"temp3[*]" ,"uint16" , - isl_pmbus_get, - isl_pmbus_set, + isl_pmbus_vr_get, + isl_pmbus_vr_set,NULL , &pmdev->pages[i].read_temperature_3); } }@@ -192,7 +192,7 @@ static void raa22xx_init(Object *obj)pmbus_page_config (pmdev,0 , flags[0 ]);pmbus_page_config (pmdev,1 , flags[1 ]); -isl_pmbus_add_props (obj, flags,2 ); +isl_pmbus_vr_add_props (obj, flags,2 ); }static void raa228000_init (Object *obj)@@ -206,14 +206,15 @@ static void raa228000_init(Object *obj)PB_HAS_TEMP2 |PB_HAS_TEMP3 |PB_HAS_STATUS_MFR_SPECIFIC ;pmbus_page_config (pmdev,0 , flags[0 ]); -isl_pmbus_add_props (obj, flags,1 ); +isl_pmbus_vr_add_props (obj, flags,1 ); } -static void isl_pmbus_class_init (ObjectClass *klass,void *data,uint8_t pages) +static void isl_pmbus_vr_class_init (ObjectClass *klass,void *data, +uint8_t pages) {PMBusDeviceClass *k =PMBUS_DEVICE_CLASS (klass); - k->write_data = isl_pmbus_write_data; - k->receive_byte = isl_pmbus_read_byte; + k->write_data = isl_pmbus_vr_write_data; + k->receive_byte = isl_pmbus_vr_read_byte; k->device_num_pages = pages; }@@ -222,8 +223,8 @@ static void isl69260_class_init(ObjectClass *klass, void *data)ResettableClass *rc =RESETTABLE_CLASS (klass);DeviceClass *dc =DEVICE_CLASS (klass); dc->desc ="Renesas ISL69260 Digital Multiphase Voltage Regulator" ; - rc->phases.exit = isl_pmbus_exit_reset; -isl_pmbus_class_init (klass, data,2 ); + rc->phases.exit = isl_pmbus_vr_exit_reset; +isl_pmbus_vr_class_init (klass, data,2 ); }static void raa228000_class_init (ObjectClass *klass,void *data)@@ -232,7 +233,7 @@ static void raa228000_class_init(ObjectClass *klass, void *data)DeviceClass *dc =DEVICE_CLASS (klass); dc->desc ="Renesas 228000 Digital Multiphase Voltage Regulator" ; rc->phases.exit = raa228000_exit_reset; -isl_pmbus_class_init (klass, data,1 ); +isl_pmbus_vr_class_init (klass, data,1 ); }static void raa229004_class_init (ObjectClass *klass,void *data)@@ -240,8 +241,8 @@ static void raa229004_class_init(ObjectClass *klass, void *data)ResettableClass *rc =RESETTABLE_CLASS (klass);DeviceClass *dc =DEVICE_CLASS (klass); dc->desc ="Renesas 229004 Digital Multiphase Voltage Regulator" ; - rc->phases.exit = isl_pmbus_exit_reset; -isl_pmbus_class_init (klass, data,2 ); + rc->phases.exit = isl_pmbus_vr_exit_reset; +isl_pmbus_vr_class_init (klass, data,2 ); }static const TypeInfo isl69260_info = {@@ -268,11 +269,11 @@ static const TypeInfo raa228000_info = { .class_init = raa228000_class_init, }; -static void isl_pmbus_register_types (void ) +static void isl_pmbus_vr_register_types (void ) {type_register_static (&isl69260_info);type_register_static (&raa228000_info);type_register_static (&raa229004_info); } -type_init (isl_pmbus_register_types) +type_init (isl_pmbus_vr_register_types)hw/sensor/meson.build +1
-1@@ -5,4 +5,4 @@ softmmu_ss.add(when: 'CONFIG_EMC141X', if_true: files('emc141x.c')) softmmu_ss.add(when: 'CONFIG_ADM1272', if_true: files('adm1272.c')) softmmu_ss.add(when: 'CONFIG_MAX34451', if_true: files('max34451.c')) softmmu_ss.add(when: 'CONFIG_LSM303DLHC_MAG', if_true: files('lsm303dlhc_mag.c')) -softmmu_ss.add(when: 'CONFIG_ISL_PMBUS', if_true: files('isl_pmbus.c')) +softmmu_ss.add(when: 'CONFIG_ISL_PMBUS_VR', if_true: files('isl_pmbus_vr.c'))include/hw/sensor/isl_pmbus_vr.h renamed from include/hw/sensor/isl_pmbus.h +2
-2@@ -6,8 +6,8 @@* SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef HW_MISC_ISL_PMBUS_H -#define HW_MISC_ISL_PMBUS_H +#ifndef HW_MISC_ISL_PMBUS_VR_H +#define HW_MISC_ISL_PMBUS_VR_H #include "hw/i2c/pmbus_device.h" #include "qom/object.h" tests/qtest/isl_pmbus_vr-test.c renamed from tests/qtest/isl_pmbus-test.c +132
-131@@ -17,7 +17,7 @@#include "qemu/osdep.h" #include <math.h> #include "hw/i2c/pmbus_device.h" -#include "hw/sensor/isl_pmbus.h" +#include "hw/sensor/isl_pmbus_vr.h" #include "libqtest-single.h" #include "libqos/qgraph.h" #include "libqos/i2c.h" @@ -25,10 +25,10 @@#include "qapi/qmp/qnum.h" #include "qemu/bitops.h" -#define TEST_ID "isl_pmbus-test" +#define TEST_ID "isl_pmbus_vr-test"#define TEST_ADDR (0x43) -static uint16_t qmp_isl_pmbus_get (const char *id,const char *property) +static uint16_t qmp_isl_pmbus_vr_get (const char *id,const char *property) {QDict *response;uint64_t ret;@@ -41,7 +41,7 @@ static uint16_t qmp_isl_pmbus_get(const char *id, const char *property)return ret; } -static void qmp_isl_pmbus_set (const char *id, +static void qmp_isl_pmbus_vr_set (const char *id,const char *property,uint16_t value) {@@ -54,7 +54,7 @@ static void qmp_isl_pmbus_set(const char *id, }/* PMBus commands are little endian vs i2c_set16 in i2c.h which is big endian */ -static uint16_t isl_pmbus_i2c_get16 (QI2CDevice *i2cdev,uint8_t reg) +static uint16_t isl_pmbus_vr_i2c_get16 (QI2CDevice *i2cdev,uint8_t reg) {uint8_t resp[2 ];i2c_read_block (i2cdev, reg, resp,sizeof (resp));@@ -62,7 +62,8 @@ static uint16_t isl_pmbus_i2c_get16(QI2CDevice *i2cdev, uint8_t reg) }/* PMBus commands are little endian vs i2c_set16 in i2c.h which is big endian */ -static void isl_pmbus_i2c_set16 (QI2CDevice *i2cdev,uint8_t reg,uint16_t value) +static void isl_pmbus_vr_i2c_set16 (QI2CDevice *i2cdev,uint8_t reg, +uint16_t value) {uint8_t data[2 ];@@ -76,28 +77,28 @@ static void test_defaults(void *obj, void *data, QGuestAllocator *alloc)uint16_t value, i2c_value;QI2CDevice *i2cdev = (QI2CDevice *)obj; - value =qmp_isl_pmbus_get (TEST_ID ,"vout[0]" ); + value =qmp_isl_pmbus_vr_get (TEST_ID ,"vout[0]" ); g_assert_cmpuint(value, ==, ISL_READ_VOUT_DEFAULT); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_IOUT ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_IOUT ); g_assert_cmpuint(i2c_value, ==, ISL_READ_IOUT_DEFAULT); - value =qmp_isl_pmbus_get (TEST_ID ,"pout[0]" ); + value =qmp_isl_pmbus_vr_get (TEST_ID ,"pout[0]" ); g_assert_cmpuint(value, ==, ISL_READ_POUT_DEFAULT); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_VIN ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_VIN ); g_assert_cmpuint(i2c_value, ==, ISL_READ_VIN_DEFAULT); - value =qmp_isl_pmbus_get (TEST_ID ,"iin[0]" ); + value =qmp_isl_pmbus_vr_get (TEST_ID ,"iin[0]" ); g_assert_cmpuint(value, ==, ISL_READ_IIN_DEFAULT); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_PIN ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_PIN ); g_assert_cmpuint(i2c_value, ==, ISL_READ_PIN_DEFAULT); - value =qmp_isl_pmbus_get (TEST_ID ,"temp1[0]" ); + value =qmp_isl_pmbus_vr_get (TEST_ID ,"temp1[0]" ); g_assert_cmpuint(value, ==, ISL_READ_TEMP_DEFAULT); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_2 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_2 ); g_assert_cmpuint(i2c_value, ==, ISL_READ_TEMP_DEFAULT); i2c_value =i2c_get8 (i2cdev,PMBUS_CAPABILITY );@@ -112,37 +113,37 @@ static void test_defaults(void *obj, void *data, QGuestAllocator *alloc) i2c_value =i2c_get8 (i2cdev,PMBUS_VOUT_MODE ); g_assert_cmphex(i2c_value, ==, ISL_VOUT_MODE_DEFAULT); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_COMMAND ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VOUT_COMMAND ); g_assert_cmphex(i2c_value, ==, ISL_VOUT_COMMAND_DEFAULT); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_MAX ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VOUT_MAX ); g_assert_cmphex(i2c_value, ==, ISL_VOUT_MAX_DEFAULT); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_MARGIN_HIGH ); + 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_i2c_get16 (i2cdev,PMBUS_VOUT_MARGIN_LOW ); + 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_i2c_get16 (i2cdev,PMBUS_VOUT_TRANSITION_RATE ); + 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_i2c_get16 (i2cdev,PMBUS_VOUT_OV_FAULT_LIMIT ); + 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_i2c_get16 (i2cdev,PMBUS_OT_FAULT_LIMIT ); + 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_i2c_get16 (i2cdev,PMBUS_OT_WARN_LIMIT ); + 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_i2c_get16 (i2cdev,PMBUS_VIN_OV_WARN_LIMIT ); + 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_i2c_get16 (i2cdev,PMBUS_VIN_UV_WARN_LIMIT ); + 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_i2c_get16 (i2cdev,PMBUS_IIN_OC_FAULT_LIMIT ); + 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 );@@ -155,13 +156,13 @@ static void raa228000_test_defaults(void *obj, void *data,uint16_t value, i2c_value;QI2CDevice *i2cdev = (QI2CDevice *)obj; - value =qmp_isl_pmbus_get (TEST_ID ,"vout[0]" ); + value =qmp_isl_pmbus_vr_get (TEST_ID ,"vout[0]" ); g_assert_cmpuint(value, ==, 0); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_IOUT ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_IOUT ); g_assert_cmpuint(i2c_value, ==, 0); - value =qmp_isl_pmbus_get (TEST_ID ,"pout[0]" ); + value =qmp_isl_pmbus_vr_get (TEST_ID ,"pout[0]" ); g_assert_cmpuint(value, ==, 0); i2c_value =i2c_get8 (i2cdev,PMBUS_CAPABILITY );@@ -176,37 +177,37 @@ static void raa228000_test_defaults(void *obj, void *data, i2c_value =i2c_get8 (i2cdev,PMBUS_VOUT_MODE ); g_assert_cmphex(i2c_value, ==, ISL_VOUT_MODE_DEFAULT); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_COMMAND ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VOUT_COMMAND ); g_assert_cmphex(i2c_value, ==, ISL_VOUT_COMMAND_DEFAULT); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_MAX ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VOUT_MAX ); g_assert_cmphex(i2c_value, ==, ISL_VOUT_MAX_DEFAULT); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_MARGIN_HIGH ); + 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_i2c_get16 (i2cdev,PMBUS_VOUT_MARGIN_LOW ); + 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_i2c_get16 (i2cdev,PMBUS_VOUT_TRANSITION_RATE ); + 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_i2c_get16 (i2cdev,PMBUS_VOUT_OV_FAULT_LIMIT ); + 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_i2c_get16 (i2cdev,PMBUS_OT_FAULT_LIMIT ); + 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_i2c_get16 (i2cdev,PMBUS_OT_WARN_LIMIT ); + 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_i2c_get16 (i2cdev,PMBUS_VIN_OV_WARN_LIMIT ); + 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_i2c_get16 (i2cdev,PMBUS_VIN_UV_WARN_LIMIT ); + 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_i2c_get16 (i2cdev,PMBUS_IIN_OC_FAULT_LIMIT ); + 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 );@@ -219,49 +220,49 @@ static void test_tx_rx(void *obj, void *data, QGuestAllocator *alloc)uint16_t i2c_value, value;QI2CDevice *i2cdev = (QI2CDevice *)obj; -qmp_isl_pmbus_set (TEST_ID ,"vin[0]" ,200 ); - value =qmp_isl_pmbus_get (TEST_ID ,"vin[0]" ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_VIN ); +qmp_isl_pmbus_vr_set (TEST_ID ,"vin[0]" ,200 ); + value =qmp_isl_pmbus_vr_get (TEST_ID ,"vin[0]" ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_VIN ); g_assert_cmpuint(value, ==, i2c_value); -qmp_isl_pmbus_set (TEST_ID ,"vout[0]" ,2500 ); - value =qmp_isl_pmbus_get (TEST_ID ,"vout[0]" ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_VOUT ); +qmp_isl_pmbus_vr_set (TEST_ID ,"vout[0]" ,2500 ); + value =qmp_isl_pmbus_vr_get (TEST_ID ,"vout[0]" ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_VOUT ); g_assert_cmpuint(value, ==, i2c_value); -qmp_isl_pmbus_set (TEST_ID ,"iin[0]" ,300 ); - value =qmp_isl_pmbus_get (TEST_ID ,"iin[0]" ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_IIN ); +qmp_isl_pmbus_vr_set (TEST_ID ,"iin[0]" ,300 ); + value =qmp_isl_pmbus_vr_get (TEST_ID ,"iin[0]" ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_IIN ); g_assert_cmpuint(value, ==, i2c_value); -qmp_isl_pmbus_set (TEST_ID ,"iout[0]" ,310 ); - value =qmp_isl_pmbus_get (TEST_ID ,"iout[0]" ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_IOUT ); +qmp_isl_pmbus_vr_set (TEST_ID ,"iout[0]" ,310 ); + value =qmp_isl_pmbus_vr_get (TEST_ID ,"iout[0]" ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_IOUT ); g_assert_cmpuint(value, ==, i2c_value); -qmp_isl_pmbus_set (TEST_ID ,"pin[0]" ,100 ); - value =qmp_isl_pmbus_get (TEST_ID ,"pin[0]" ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_PIN ); +qmp_isl_pmbus_vr_set (TEST_ID ,"pin[0]" ,100 ); + value =qmp_isl_pmbus_vr_get (TEST_ID ,"pin[0]" ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_PIN ); g_assert_cmpuint(value, ==, i2c_value); -qmp_isl_pmbus_set (TEST_ID ,"pout[0]" ,95 ); - value =qmp_isl_pmbus_get (TEST_ID ,"pout[0]" ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_POUT ); +qmp_isl_pmbus_vr_set (TEST_ID ,"pout[0]" ,95 ); + value =qmp_isl_pmbus_vr_get (TEST_ID ,"pout[0]" ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_POUT ); g_assert_cmpuint(value, ==, i2c_value); -qmp_isl_pmbus_set (TEST_ID ,"temp1[0]" ,26 ); - value =qmp_isl_pmbus_get (TEST_ID ,"temp1[0]" ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_1 ); +qmp_isl_pmbus_vr_set (TEST_ID ,"temp1[0]" ,26 ); + value =qmp_isl_pmbus_vr_get (TEST_ID ,"temp1[0]" ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_1 ); g_assert_cmpuint(value, ==, i2c_value); -qmp_isl_pmbus_set (TEST_ID ,"temp2[0]" ,27 ); - value =qmp_isl_pmbus_get (TEST_ID ,"temp2[0]" ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_2 ); +qmp_isl_pmbus_vr_set (TEST_ID ,"temp2[0]" ,27 ); + value =qmp_isl_pmbus_vr_get (TEST_ID ,"temp2[0]" ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_2 ); g_assert_cmpuint(value, ==, i2c_value); -qmp_isl_pmbus_set (TEST_ID ,"temp3[0]" ,28 ); - value =qmp_isl_pmbus_get (TEST_ID ,"temp3[0]" ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_3 ); +qmp_isl_pmbus_vr_set (TEST_ID ,"temp3[0]" ,28 ); + value =qmp_isl_pmbus_vr_get (TEST_ID ,"temp3[0]" ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_3 ); g_assert_cmpuint(value, ==, i2c_value); }@@ -272,64 +273,64 @@ static void test_rw_regs(void *obj, void *data, QGuestAllocator *alloc)uint16_t i2c_value;QI2CDevice *i2cdev = (QI2CDevice *)obj; -isl_pmbus_i2c_set16 (i2cdev,PMBUS_VOUT_COMMAND ,0x1234 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_COMMAND ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_VOUT_COMMAND ,0x1234 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VOUT_COMMAND ); g_assert_cmphex(i2c_value, ==, 0x1234); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_VOUT_TRIM ,0x4567 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_TRIM ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_VOUT_TRIM ,0x4567 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VOUT_TRIM ); g_assert_cmphex(i2c_value, ==, 0x4567); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_VOUT_MAX ,0x9876 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_MAX ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_VOUT_MAX ,0x9876 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VOUT_MAX ); g_assert_cmphex(i2c_value, ==, 0x9876); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_VOUT_MARGIN_HIGH ,0xABCD ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_MARGIN_HIGH ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_VOUT_MARGIN_HIGH ,0xABCD ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VOUT_MARGIN_HIGH ); g_assert_cmphex(i2c_value, ==, 0xABCD); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_VOUT_MARGIN_LOW ,0xA1B2 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_MARGIN_LOW ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_VOUT_MARGIN_LOW ,0xA1B2 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VOUT_MARGIN_LOW ); g_assert_cmphex(i2c_value, ==, 0xA1B2); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_VOUT_TRANSITION_RATE ,0xDEF1 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_TRANSITION_RATE ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_VOUT_TRANSITION_RATE ,0xDEF1 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VOUT_TRANSITION_RATE ); g_assert_cmphex(i2c_value, ==, 0xDEF1); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_VOUT_DROOP ,0x5678 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_DROOP ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_VOUT_DROOP ,0x5678 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VOUT_DROOP ); g_assert_cmphex(i2c_value, ==, 0x5678); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_VOUT_MIN ,0x1234 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_MIN ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_VOUT_MIN ,0x1234 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VOUT_MIN ); g_assert_cmphex(i2c_value, ==, 0x1234); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_VOUT_OV_FAULT_LIMIT ,0x2345 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_OV_FAULT_LIMIT ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_VOUT_OV_FAULT_LIMIT ,0x2345 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VOUT_OV_FAULT_LIMIT ); g_assert_cmphex(i2c_value, ==, 0x2345); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_VOUT_UV_FAULT_LIMIT ,0xFA12 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_UV_FAULT_LIMIT ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_VOUT_UV_FAULT_LIMIT ,0xFA12 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VOUT_UV_FAULT_LIMIT ); g_assert_cmphex(i2c_value, ==, 0xFA12); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_OT_FAULT_LIMIT ,0xF077 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_OT_FAULT_LIMIT ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_OT_FAULT_LIMIT ,0xF077 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_OT_FAULT_LIMIT ); g_assert_cmphex(i2c_value, ==, 0xF077); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_OT_WARN_LIMIT ,0x7137 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_OT_WARN_LIMIT ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_OT_WARN_LIMIT ,0x7137 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_OT_WARN_LIMIT ); g_assert_cmphex(i2c_value, ==, 0x7137); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_VIN_OV_FAULT_LIMIT ,0x3456 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VIN_OV_FAULT_LIMIT ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_VIN_OV_FAULT_LIMIT ,0x3456 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VIN_OV_FAULT_LIMIT ); g_assert_cmphex(i2c_value, ==, 0x3456); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_VIN_UV_FAULT_LIMIT ,0xBADA ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VIN_UV_FAULT_LIMIT ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_VIN_UV_FAULT_LIMIT ,0xBADA ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VIN_UV_FAULT_LIMIT ); g_assert_cmphex(i2c_value, ==, 0xBADA); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_IIN_OC_FAULT_LIMIT ,0xB1B0 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_IIN_OC_FAULT_LIMIT ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_IIN_OC_FAULT_LIMIT ,0xB1B0 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_IIN_OC_FAULT_LIMIT ); g_assert_cmphex(i2c_value, ==, 0xB1B0);i2c_set8 (i2cdev,PMBUS_OPERATION ,0xA );@@ -362,49 +363,49 @@ static void test_ro_regs(void *obj, void *data, QGuestAllocator *alloc)uint16_t i2c_init_value, i2c_value;QI2CDevice *i2cdev = (QI2CDevice *)obj; - i2c_init_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_VIN ); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_READ_VIN ,0xBEEF ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_VIN ); + i2c_init_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_VIN ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_READ_VIN ,0xBEEF ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_VIN ); g_assert_cmphex(i2c_init_value, ==, i2c_value); - i2c_init_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_IIN ); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_READ_IIN ,0xB00F ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_IIN ); + i2c_init_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_IIN ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_READ_IIN ,0xB00F ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_IIN ); g_assert_cmphex(i2c_init_value, ==, i2c_value); - i2c_init_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_VOUT ); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_READ_VOUT ,0x1234 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_VOUT ); + i2c_init_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_VOUT ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_READ_VOUT ,0x1234 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_VOUT ); g_assert_cmphex(i2c_init_value, ==, i2c_value); - i2c_init_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_IOUT ); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_READ_IOUT ,0x6547 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_IOUT ); + i2c_init_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_IOUT ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_READ_IOUT ,0x6547 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_IOUT ); g_assert_cmphex(i2c_init_value, ==, i2c_value); - i2c_init_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_1 ); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_READ_TEMPERATURE_1 ,0x1597 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_1 ); + i2c_init_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_1 ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_READ_TEMPERATURE_1 ,0x1597 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_1 ); g_assert_cmphex(i2c_init_value, ==, i2c_value); - i2c_init_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_2 ); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_READ_TEMPERATURE_2 ,0x1897 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_2 ); + i2c_init_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_2 ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_READ_TEMPERATURE_2 ,0x1897 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_2 ); g_assert_cmphex(i2c_init_value, ==, i2c_value); - i2c_init_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_3 ); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_READ_TEMPERATURE_3 ,0x1007 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_3 ); + i2c_init_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_3 ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_READ_TEMPERATURE_3 ,0x1007 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_3 ); g_assert_cmphex(i2c_init_value, ==, i2c_value); - i2c_init_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_PIN ); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_READ_PIN ,0xDEAD ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_PIN ); + i2c_init_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_PIN ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_READ_PIN ,0xDEAD ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_PIN ); g_assert_cmphex(i2c_init_value, ==, i2c_value); - i2c_init_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_POUT ); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_READ_POUT ,0xD00D ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_POUT ); + i2c_init_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_POUT ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_READ_POUT ,0xD00D ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_POUT ); g_assert_cmphex(i2c_init_value, ==, i2c_value); }@@ -415,29 +416,29 @@ static void test_voltage_faults(void *obj, void *data, QGuestAllocator *alloc)uint8_t i2c_byte;QI2CDevice *i2cdev = (QI2CDevice *)obj; -isl_pmbus_i2c_set16 (i2cdev,PMBUS_VOUT_OV_WARN_LIMIT ,5000 ); -qmp_isl_pmbus_set (TEST_ID ,"vout[0]" ,5100 ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_VOUT_OV_WARN_LIMIT ,5000 ); +qmp_isl_pmbus_vr_set (TEST_ID ,"vout[0]" ,5100 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_STATUS_WORD ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_STATUS_WORD ); i2c_byte =i2c_get8 (i2cdev,PMBUS_STATUS_VOUT );g_assert_true ((i2c_value &PB_STATUS_VOUT ) !=0 );g_assert_true ((i2c_byte &PB_STATUS_VOUT_OV_WARN ) !=0 ); -qmp_isl_pmbus_set (TEST_ID ,"vout[0]" ,4500 ); +qmp_isl_pmbus_vr_set (TEST_ID ,"vout[0]" ,4500 );i2c_set8 (i2cdev,PMBUS_CLEAR_FAULTS ,0 ); i2c_byte =i2c_get8 (i2cdev,PMBUS_STATUS_VOUT );g_assert_true ((i2c_byte &PB_STATUS_VOUT_OV_WARN ) ==0 ); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_VOUT_UV_WARN_LIMIT ,4600 ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_VOUT_UV_WARN_LIMIT ,4600 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_STATUS_WORD ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_STATUS_WORD ); i2c_byte =i2c_get8 (i2cdev,PMBUS_STATUS_VOUT );g_assert_true ((i2c_value &PB_STATUS_VOUT ) !=0 );g_assert_true ((i2c_byte &PB_STATUS_VOUT_UV_WARN ) !=0 ); } -static void isl_pmbus_register_nodes (void ) +static void isl_pmbus_vr_register_nodes (void ) {QOSGraphEdgeOptions opts = { .extra_device_opts ="id=" TEST_ID ",address=0x43" @@ -470,4 +471,4 @@ static void isl_pmbus_register_nodes(void)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_register_nodes); +libqos_init (isl_pmbus_vr_register_nodes);tests/qtest/meson.build +1
-1@@ -244,7 +244,7 @@ qos_test_ss.add( 'es1370-test.c', 'ipoctal232-test.c', 'lsm303dlhc-mag-test.c', - 'isl_pmbus-test.c', + 'isl_pmbus_vr-test.c', 'max34451-test.c', 'megasas-test.c', 'ne2000-test.c',Signature · 1 line
2.35.1.616.g0bdcbb4464-goog
Re: [PATCH v2 9/9] hw/sensor: rename isl_pmbus to isl_pmbus_vr
The rename is from feedback in v1 by Peter. I did this in a separate patch as it's easier to merge, compared to editing the 4 commits affected by this.
Titus
Quoted 851 lines · Corey Minyard
Quoted 1 line · Titus Rwantare
Signed-off-by Titus Rwantare <[email protected]>Two things:
* Why do you want to rename this?
* This patch doesn't really add anything, it just renames things in a previous patch. Can it be folded in to the patch that added these fields?
-corey
Quoted 837 lines
--- MAINTAINERS | 6 +- hw/arm/Kconfig | 2 +- hw/sensor/Kconfig | 2 +- hw/sensor/{isl_pmbus.c => isl_pmbus_vr.c} | 77 ++--- hw/sensor/meson.build | 2 +- .../hw/sensor/{isl_pmbus.h => isl_pmbus_vr.h} | 4 +- .../{isl_pmbus-test.c => isl_pmbus_vr-test.c} | 263 +++++++++--------- tests/qtest/meson.build | 2 +- 8 files changed, 180 insertions(+), 178 deletions(-) rename hw/sensor/{isl_pmbus.c => isl_pmbus_vr.c} (80%) rename include/hw/sensor/{isl_pmbus.h => isl_pmbus_vr.h} (96%) rename tests/qtest/{isl_pmbus-test.c => isl_pmbus_vr-test.c} (55%)MAINTAINERS +3
-3@@ -3140,13 +3140,13 @@ M: Titus Rwantare <[email protected]> S: Maintained F: hw/i2c/pmbus_device.c F: hw/sensor/adm1272.c -F: hw/sensor/isl_pmbus.c +F: hw/sensor/isl_pmbus_vr.c F: hw/sensor/max34451.c F: include/hw/i2c/pmbus_device.h -F: include/hw/sensor/isl_pmbus.h +F: include/hw/sensor/isl_pmbus_vr.h F: tests/qtest/adm1272-test.c F: tests/qtest/max34451-test.c -F: tests/qtest/isl_pmbus-test.c +F: tests/qtest/isl_pmbus_vr-test.c Firmware schema specifications M: Philippe Mathieu-Daudé <[email protected]>hw/arm/Kconfig +1
-1@@ -400,7 +400,7 @@ config NPCM7XX select SMBUS select AT24C # EEPROM select MAX34451 - select ISL_PMBUS + select ISL_PMBUS_VR select PL310 # cache controller select PMBUS select SERIALhw/sensor/Kconfig +1
-1@@ -31,7 +31,7 @@ config LSM303DLHC_MAG depends on I2C default y if I2C_DEVICES -config ISL_PMBUS +config ISL_PMBUS_VR bool depends on I2Chw/sensor/isl_pmbus_vr.c renamed from hw/sensor/isl_pmbus.c +39
-38@@ -7,13 +7,13 @@*/ #include "qemu/osdep.h" -#include "hw/sensor/isl_pmbus.h" +#include "hw/sensor/isl_pmbus_vr.h" #include "hw/qdev-properties.h" #include "qapi/visitor.h" #include "qemu/log.h" #include "qemu/module.h" -static uint8_t isl_pmbus_read_byte (PMBusDevice *pmdev) +static uint8_t isl_pmbus_vr_read_byte (PMBusDevice *pmdev) { qemu_log_mask(LOG_GUEST_ERROR, "%s: reading from unsupported register: 0x%02x\n",@@ -21,7 +21,7 @@ static uint8_t isl_pmbus_read_byte(PMBusDevice *pmdev)return 0xFF ; } -static int isl_pmbus_write_data (PMBusDevice *pmdev,const uint8_t *buf, +static int isl_pmbus_vr_write_data (PMBusDevice *pmdev,const uint8_t *buf,uint8_t len) { qemu_log_mask(LOG_GUEST_ERROR,@@ -31,13 +31,13 @@ static int isl_pmbus_write_data(PMBusDevice *pmdev, const uint8_t *buf, }/* TODO: Implement coefficients support in pmbus_device.c for qmp */ -static void isl_pmbus_get (Object *obj,Visitor *v,const char *name, +static void isl_pmbus_vr_get (Object *obj,Visitor *v,const char *name,void *opaque,Error **errp) {visit_type_uint16 (v, name, (uint16_t *)opaque, errp); } -static void isl_pmbus_set (Object *obj,Visitor *v,const char *name, +static void isl_pmbus_vr_set (Object *obj,Visitor *v,const char *name,void *opaque,Error **errp) {PMBusDevice *pmdev =PMBUS_DEVICE (obj);@@ -51,7 +51,7 @@ static void isl_pmbus_set(Object *obj, Visitor *v, const char *name,pmbus_check_limits (pmdev); } -static void isl_pmbus_exit_reset (Object *obj) +static void isl_pmbus_vr_exit_reset (Object *obj) {PMBusDevice *pmdev =PMBUS_DEVICE (obj);@@ -92,7 +92,7 @@ static void isl_pmbus_exit_reset(Object *obj)/* The raa228000 uses different direct mode coefficents from most isl devices */ static void raa228000_exit_reset (Object *obj) { -isl_pmbus_exit_reset (obj); +isl_pmbus_vr_exit_reset (obj);PMBusDevice *pmdev =PMBUS_DEVICE (obj);@@ -107,70 +107,70 @@ static void raa228000_exit_reset(Object *obj) pmdev->pages[0 ].read_temperature_3 =0 ; } -static void isl_pmbus_add_props (Object *obj,uint64_t *flags,uint8_t pages) +static void isl_pmbus_vr_add_props (Object *obj,uint64_t *flags,uint8_t pages) {PMBusDevice *pmdev =PMBUS_DEVICE (obj);for (int i =0 ; i < pages; i++) {if (flags[i] &PB_HAS_VIN ) {object_property_add (obj,"vin[*]" ,"uint16" , - isl_pmbus_get, - isl_pmbus_set, + isl_pmbus_vr_get, + isl_pmbus_vr_set,NULL , &pmdev->pages[i].read_vin); }if (flags[i] &PB_HAS_VOUT ) {object_property_add (obj,"vout[*]" ,"uint16" , - isl_pmbus_get, - isl_pmbus_set, + isl_pmbus_vr_get, + isl_pmbus_vr_set,NULL , &pmdev->pages[i].read_vout); }if (flags[i] &PB_HAS_IIN ) {object_property_add (obj,"iin[*]" ,"uint16" , - isl_pmbus_get, - isl_pmbus_set, + isl_pmbus_vr_get, + isl_pmbus_vr_set,NULL , &pmdev->pages[i].read_iin); }if (flags[i] &PB_HAS_IOUT ) {object_property_add (obj,"iout[*]" ,"uint16" , - isl_pmbus_get, - isl_pmbus_set, + isl_pmbus_vr_get, + isl_pmbus_vr_set,NULL , &pmdev->pages[i].read_iout); }if (flags[i] &PB_HAS_PIN ) {object_property_add (obj,"pin[*]" ,"uint16" , - isl_pmbus_get, - isl_pmbus_set, + isl_pmbus_vr_get, + isl_pmbus_vr_set,NULL , &pmdev->pages[i].read_pin); }if (flags[i] &PB_HAS_POUT ) {object_property_add (obj,"pout[*]" ,"uint16" , - isl_pmbus_get, - isl_pmbus_set, + isl_pmbus_vr_get, + isl_pmbus_vr_set,NULL , &pmdev->pages[i].read_pout); }if (flags[i] &PB_HAS_TEMPERATURE ) {object_property_add (obj,"temp1[*]" ,"uint16" , - isl_pmbus_get, - isl_pmbus_set, + isl_pmbus_vr_get, + isl_pmbus_vr_set,NULL , &pmdev->pages[i].read_temperature_1); }if (flags[i] &PB_HAS_TEMP2 ) {object_property_add (obj,"temp2[*]" ,"uint16" , - isl_pmbus_get, - isl_pmbus_set, + isl_pmbus_vr_get, + isl_pmbus_vr_set,NULL , &pmdev->pages[i].read_temperature_2); }if (flags[i] &PB_HAS_TEMP3 ) {object_property_add (obj,"temp3[*]" ,"uint16" , - isl_pmbus_get, - isl_pmbus_set, + isl_pmbus_vr_get, + isl_pmbus_vr_set,NULL , &pmdev->pages[i].read_temperature_3); } }@@ -192,7 +192,7 @@ static void raa22xx_init(Object *obj)pmbus_page_config (pmdev,0 , flags[0 ]);pmbus_page_config (pmdev,1 , flags[1 ]); -isl_pmbus_add_props (obj, flags,2 ); +isl_pmbus_vr_add_props (obj, flags,2 ); }static void raa228000_init (Object *obj)@@ -206,14 +206,15 @@ static void raa228000_init(Object *obj)PB_HAS_TEMP2 |PB_HAS_TEMP3 |PB_HAS_STATUS_MFR_SPECIFIC ;pmbus_page_config (pmdev,0 , flags[0 ]); -isl_pmbus_add_props (obj, flags,1 ); +isl_pmbus_vr_add_props (obj, flags,1 ); } -static void isl_pmbus_class_init (ObjectClass *klass,void *data,uint8_t pages) +static void isl_pmbus_vr_class_init (ObjectClass *klass,void *data, +uint8_t pages) {PMBusDeviceClass *k =PMBUS_DEVICE_CLASS (klass); - k->write_data = isl_pmbus_write_data; - k->receive_byte = isl_pmbus_read_byte; + k->write_data = isl_pmbus_vr_write_data; + k->receive_byte = isl_pmbus_vr_read_byte; k->device_num_pages = pages; }@@ -222,8 +223,8 @@ static void isl69260_class_init(ObjectClass *klass, void *data)ResettableClass *rc =RESETTABLE_CLASS (klass);DeviceClass *dc =DEVICE_CLASS (klass); dc->desc ="Renesas ISL69260 Digital Multiphase Voltage Regulator" ; - rc->phases.exit = isl_pmbus_exit_reset; -isl_pmbus_class_init (klass, data,2 ); + rc->phases.exit = isl_pmbus_vr_exit_reset; +isl_pmbus_vr_class_init (klass, data,2 ); }static void raa228000_class_init (ObjectClass *klass,void *data)@@ -232,7 +233,7 @@ static void raa228000_class_init(ObjectClass *klass, void *data)DeviceClass *dc =DEVICE_CLASS (klass); dc->desc ="Renesas 228000 Digital Multiphase Voltage Regulator" ; rc->phases.exit = raa228000_exit_reset; -isl_pmbus_class_init (klass, data,1 ); +isl_pmbus_vr_class_init (klass, data,1 ); }static void raa229004_class_init (ObjectClass *klass,void *data)@@ -240,8 +241,8 @@ static void raa229004_class_init(ObjectClass *klass, void *data)ResettableClass *rc =RESETTABLE_CLASS (klass);DeviceClass *dc =DEVICE_CLASS (klass); dc->desc ="Renesas 229004 Digital Multiphase Voltage Regulator" ; - rc->phases.exit = isl_pmbus_exit_reset; -isl_pmbus_class_init (klass, data,2 ); + rc->phases.exit = isl_pmbus_vr_exit_reset; +isl_pmbus_vr_class_init (klass, data,2 ); }static const TypeInfo isl69260_info = {@@ -268,11 +269,11 @@ static const TypeInfo raa228000_info = { .class_init = raa228000_class_init, }; -static void isl_pmbus_register_types (void ) +static void isl_pmbus_vr_register_types (void ) {type_register_static (&isl69260_info);type_register_static (&raa228000_info);type_register_static (&raa229004_info); } -type_init (isl_pmbus_register_types) +type_init (isl_pmbus_vr_register_types)hw/sensor/meson.build +1
-1@@ -5,4 +5,4 @@ softmmu_ss.add(when: 'CONFIG_EMC141X', if_true: files('emc141x.c')) softmmu_ss.add(when: 'CONFIG_ADM1272', if_true: files('adm1272.c')) softmmu_ss.add(when: 'CONFIG_MAX34451', if_true: files('max34451.c')) softmmu_ss.add(when: 'CONFIG_LSM303DLHC_MAG', if_true: files('lsm303dlhc_mag.c')) -softmmu_ss.add(when: 'CONFIG_ISL_PMBUS', if_true: files('isl_pmbus.c')) +softmmu_ss.add(when: 'CONFIG_ISL_PMBUS_VR', if_true: files('isl_pmbus_vr.c'))include/hw/sensor/isl_pmbus_vr.h renamed from include/hw/sensor/isl_pmbus.h +2
-2@@ -6,8 +6,8 @@* SPDX-License-Identifier: GPL-2.0-or-later */ -#ifndef HW_MISC_ISL_PMBUS_H -#define HW_MISC_ISL_PMBUS_H +#ifndef HW_MISC_ISL_PMBUS_VR_H +#define HW_MISC_ISL_PMBUS_VR_H #include "hw/i2c/pmbus_device.h" #include "qom/object.h" tests/qtest/isl_pmbus_vr-test.c renamed from tests/qtest/isl_pmbus-test.c +132
-131@@ -17,7 +17,7 @@#include "qemu/osdep.h" #include <math.h> #include "hw/i2c/pmbus_device.h" -#include "hw/sensor/isl_pmbus.h" +#include "hw/sensor/isl_pmbus_vr.h" #include "libqtest-single.h" #include "libqos/qgraph.h" #include "libqos/i2c.h" @@ -25,10 +25,10 @@#include "qapi/qmp/qnum.h" #include "qemu/bitops.h" -#define TEST_ID "isl_pmbus-test" +#define TEST_ID "isl_pmbus_vr-test"#define TEST_ADDR (0x43) -static uint16_t qmp_isl_pmbus_get (const char *id,const char *property) +static uint16_t qmp_isl_pmbus_vr_get (const char *id,const char *property) {QDict *response;uint64_t ret;@@ -41,7 +41,7 @@ static uint16_t qmp_isl_pmbus_get(const char *id, const char *property)return ret; } -static void qmp_isl_pmbus_set (const char *id, +static void qmp_isl_pmbus_vr_set (const char *id,const char *property,uint16_t value) {@@ -54,7 +54,7 @@ static void qmp_isl_pmbus_set(const char *id, }/* PMBus commands are little endian vs i2c_set16 in i2c.h which is big endian */ -static uint16_t isl_pmbus_i2c_get16 (QI2CDevice *i2cdev,uint8_t reg) +static uint16_t isl_pmbus_vr_i2c_get16 (QI2CDevice *i2cdev,uint8_t reg) {uint8_t resp[2 ];i2c_read_block (i2cdev, reg, resp,sizeof (resp));@@ -62,7 +62,8 @@ static uint16_t isl_pmbus_i2c_get16(QI2CDevice *i2cdev, uint8_t reg) }/* PMBus commands are little endian vs i2c_set16 in i2c.h which is big endian */ -static void isl_pmbus_i2c_set16 (QI2CDevice *i2cdev,uint8_t reg,uint16_t value) +static void isl_pmbus_vr_i2c_set16 (QI2CDevice *i2cdev,uint8_t reg, +uint16_t value) {uint8_t data[2 ];@@ -76,28 +77,28 @@ static void test_defaults(void *obj, void *data, QGuestAllocator *alloc)uint16_t value, i2c_value;QI2CDevice *i2cdev = (QI2CDevice *)obj; - value =qmp_isl_pmbus_get (TEST_ID ,"vout[0]" ); + value =qmp_isl_pmbus_vr_get (TEST_ID ,"vout[0]" ); g_assert_cmpuint(value, ==, ISL_READ_VOUT_DEFAULT); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_IOUT ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_IOUT ); g_assert_cmpuint(i2c_value, ==, ISL_READ_IOUT_DEFAULT); - value =qmp_isl_pmbus_get (TEST_ID ,"pout[0]" ); + value =qmp_isl_pmbus_vr_get (TEST_ID ,"pout[0]" ); g_assert_cmpuint(value, ==, ISL_READ_POUT_DEFAULT); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_VIN ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_VIN ); g_assert_cmpuint(i2c_value, ==, ISL_READ_VIN_DEFAULT); - value =qmp_isl_pmbus_get (TEST_ID ,"iin[0]" ); + value =qmp_isl_pmbus_vr_get (TEST_ID ,"iin[0]" ); g_assert_cmpuint(value, ==, ISL_READ_IIN_DEFAULT); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_PIN ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_PIN ); g_assert_cmpuint(i2c_value, ==, ISL_READ_PIN_DEFAULT); - value =qmp_isl_pmbus_get (TEST_ID ,"temp1[0]" ); + value =qmp_isl_pmbus_vr_get (TEST_ID ,"temp1[0]" ); g_assert_cmpuint(value, ==, ISL_READ_TEMP_DEFAULT); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_2 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_2 ); g_assert_cmpuint(i2c_value, ==, ISL_READ_TEMP_DEFAULT); i2c_value =i2c_get8 (i2cdev,PMBUS_CAPABILITY );@@ -112,37 +113,37 @@ static void test_defaults(void *obj, void *data, QGuestAllocator *alloc) i2c_value =i2c_get8 (i2cdev,PMBUS_VOUT_MODE ); g_assert_cmphex(i2c_value, ==, ISL_VOUT_MODE_DEFAULT); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_COMMAND ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VOUT_COMMAND ); g_assert_cmphex(i2c_value, ==, ISL_VOUT_COMMAND_DEFAULT); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_MAX ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VOUT_MAX ); g_assert_cmphex(i2c_value, ==, ISL_VOUT_MAX_DEFAULT); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_MARGIN_HIGH ); + 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_i2c_get16 (i2cdev,PMBUS_VOUT_MARGIN_LOW ); + 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_i2c_get16 (i2cdev,PMBUS_VOUT_TRANSITION_RATE ); + 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_i2c_get16 (i2cdev,PMBUS_VOUT_OV_FAULT_LIMIT ); + 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_i2c_get16 (i2cdev,PMBUS_OT_FAULT_LIMIT ); + 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_i2c_get16 (i2cdev,PMBUS_OT_WARN_LIMIT ); + 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_i2c_get16 (i2cdev,PMBUS_VIN_OV_WARN_LIMIT ); + 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_i2c_get16 (i2cdev,PMBUS_VIN_UV_WARN_LIMIT ); + 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_i2c_get16 (i2cdev,PMBUS_IIN_OC_FAULT_LIMIT ); + 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 );@@ -155,13 +156,13 @@ static void raa228000_test_defaults(void *obj, void *data,uint16_t value, i2c_value;QI2CDevice *i2cdev = (QI2CDevice *)obj; - value =qmp_isl_pmbus_get (TEST_ID ,"vout[0]" ); + value =qmp_isl_pmbus_vr_get (TEST_ID ,"vout[0]" ); g_assert_cmpuint(value, ==, 0); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_IOUT ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_IOUT ); g_assert_cmpuint(i2c_value, ==, 0); - value =qmp_isl_pmbus_get (TEST_ID ,"pout[0]" ); + value =qmp_isl_pmbus_vr_get (TEST_ID ,"pout[0]" ); g_assert_cmpuint(value, ==, 0); i2c_value =i2c_get8 (i2cdev,PMBUS_CAPABILITY );@@ -176,37 +177,37 @@ static void raa228000_test_defaults(void *obj, void *data, i2c_value =i2c_get8 (i2cdev,PMBUS_VOUT_MODE ); g_assert_cmphex(i2c_value, ==, ISL_VOUT_MODE_DEFAULT); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_COMMAND ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VOUT_COMMAND ); g_assert_cmphex(i2c_value, ==, ISL_VOUT_COMMAND_DEFAULT); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_MAX ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VOUT_MAX ); g_assert_cmphex(i2c_value, ==, ISL_VOUT_MAX_DEFAULT); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_MARGIN_HIGH ); + 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_i2c_get16 (i2cdev,PMBUS_VOUT_MARGIN_LOW ); + 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_i2c_get16 (i2cdev,PMBUS_VOUT_TRANSITION_RATE ); + 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_i2c_get16 (i2cdev,PMBUS_VOUT_OV_FAULT_LIMIT ); + 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_i2c_get16 (i2cdev,PMBUS_OT_FAULT_LIMIT ); + 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_i2c_get16 (i2cdev,PMBUS_OT_WARN_LIMIT ); + 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_i2c_get16 (i2cdev,PMBUS_VIN_OV_WARN_LIMIT ); + 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_i2c_get16 (i2cdev,PMBUS_VIN_UV_WARN_LIMIT ); + 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_i2c_get16 (i2cdev,PMBUS_IIN_OC_FAULT_LIMIT ); + 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 );@@ -219,49 +220,49 @@ static void test_tx_rx(void *obj, void *data, QGuestAllocator *alloc)uint16_t i2c_value, value;QI2CDevice *i2cdev = (QI2CDevice *)obj; -qmp_isl_pmbus_set (TEST_ID ,"vin[0]" ,200 ); - value =qmp_isl_pmbus_get (TEST_ID ,"vin[0]" ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_VIN ); +qmp_isl_pmbus_vr_set (TEST_ID ,"vin[0]" ,200 ); + value =qmp_isl_pmbus_vr_get (TEST_ID ,"vin[0]" ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_VIN ); g_assert_cmpuint(value, ==, i2c_value); -qmp_isl_pmbus_set (TEST_ID ,"vout[0]" ,2500 ); - value =qmp_isl_pmbus_get (TEST_ID ,"vout[0]" ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_VOUT ); +qmp_isl_pmbus_vr_set (TEST_ID ,"vout[0]" ,2500 ); + value =qmp_isl_pmbus_vr_get (TEST_ID ,"vout[0]" ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_VOUT ); g_assert_cmpuint(value, ==, i2c_value); -qmp_isl_pmbus_set (TEST_ID ,"iin[0]" ,300 ); - value =qmp_isl_pmbus_get (TEST_ID ,"iin[0]" ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_IIN ); +qmp_isl_pmbus_vr_set (TEST_ID ,"iin[0]" ,300 ); + value =qmp_isl_pmbus_vr_get (TEST_ID ,"iin[0]" ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_IIN ); g_assert_cmpuint(value, ==, i2c_value); -qmp_isl_pmbus_set (TEST_ID ,"iout[0]" ,310 ); - value =qmp_isl_pmbus_get (TEST_ID ,"iout[0]" ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_IOUT ); +qmp_isl_pmbus_vr_set (TEST_ID ,"iout[0]" ,310 ); + value =qmp_isl_pmbus_vr_get (TEST_ID ,"iout[0]" ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_IOUT ); g_assert_cmpuint(value, ==, i2c_value); -qmp_isl_pmbus_set (TEST_ID ,"pin[0]" ,100 ); - value =qmp_isl_pmbus_get (TEST_ID ,"pin[0]" ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_PIN ); +qmp_isl_pmbus_vr_set (TEST_ID ,"pin[0]" ,100 ); + value =qmp_isl_pmbus_vr_get (TEST_ID ,"pin[0]" ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_PIN ); g_assert_cmpuint(value, ==, i2c_value); -qmp_isl_pmbus_set (TEST_ID ,"pout[0]" ,95 ); - value =qmp_isl_pmbus_get (TEST_ID ,"pout[0]" ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_POUT ); +qmp_isl_pmbus_vr_set (TEST_ID ,"pout[0]" ,95 ); + value =qmp_isl_pmbus_vr_get (TEST_ID ,"pout[0]" ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_POUT ); g_assert_cmpuint(value, ==, i2c_value); -qmp_isl_pmbus_set (TEST_ID ,"temp1[0]" ,26 ); - value =qmp_isl_pmbus_get (TEST_ID ,"temp1[0]" ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_1 ); +qmp_isl_pmbus_vr_set (TEST_ID ,"temp1[0]" ,26 ); + value =qmp_isl_pmbus_vr_get (TEST_ID ,"temp1[0]" ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_1 ); g_assert_cmpuint(value, ==, i2c_value); -qmp_isl_pmbus_set (TEST_ID ,"temp2[0]" ,27 ); - value =qmp_isl_pmbus_get (TEST_ID ,"temp2[0]" ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_2 ); +qmp_isl_pmbus_vr_set (TEST_ID ,"temp2[0]" ,27 ); + value =qmp_isl_pmbus_vr_get (TEST_ID ,"temp2[0]" ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_2 ); g_assert_cmpuint(value, ==, i2c_value); -qmp_isl_pmbus_set (TEST_ID ,"temp3[0]" ,28 ); - value =qmp_isl_pmbus_get (TEST_ID ,"temp3[0]" ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_3 ); +qmp_isl_pmbus_vr_set (TEST_ID ,"temp3[0]" ,28 ); + value =qmp_isl_pmbus_vr_get (TEST_ID ,"temp3[0]" ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_3 ); g_assert_cmpuint(value, ==, i2c_value); }@@ -272,64 +273,64 @@ static void test_rw_regs(void *obj, void *data, QGuestAllocator *alloc)uint16_t i2c_value;QI2CDevice *i2cdev = (QI2CDevice *)obj; -isl_pmbus_i2c_set16 (i2cdev,PMBUS_VOUT_COMMAND ,0x1234 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_COMMAND ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_VOUT_COMMAND ,0x1234 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VOUT_COMMAND ); g_assert_cmphex(i2c_value, ==, 0x1234); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_VOUT_TRIM ,0x4567 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_TRIM ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_VOUT_TRIM ,0x4567 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VOUT_TRIM ); g_assert_cmphex(i2c_value, ==, 0x4567); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_VOUT_MAX ,0x9876 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_MAX ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_VOUT_MAX ,0x9876 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VOUT_MAX ); g_assert_cmphex(i2c_value, ==, 0x9876); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_VOUT_MARGIN_HIGH ,0xABCD ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_MARGIN_HIGH ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_VOUT_MARGIN_HIGH ,0xABCD ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VOUT_MARGIN_HIGH ); g_assert_cmphex(i2c_value, ==, 0xABCD); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_VOUT_MARGIN_LOW ,0xA1B2 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_MARGIN_LOW ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_VOUT_MARGIN_LOW ,0xA1B2 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VOUT_MARGIN_LOW ); g_assert_cmphex(i2c_value, ==, 0xA1B2); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_VOUT_TRANSITION_RATE ,0xDEF1 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_TRANSITION_RATE ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_VOUT_TRANSITION_RATE ,0xDEF1 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VOUT_TRANSITION_RATE ); g_assert_cmphex(i2c_value, ==, 0xDEF1); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_VOUT_DROOP ,0x5678 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_DROOP ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_VOUT_DROOP ,0x5678 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VOUT_DROOP ); g_assert_cmphex(i2c_value, ==, 0x5678); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_VOUT_MIN ,0x1234 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_MIN ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_VOUT_MIN ,0x1234 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VOUT_MIN ); g_assert_cmphex(i2c_value, ==, 0x1234); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_VOUT_OV_FAULT_LIMIT ,0x2345 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_OV_FAULT_LIMIT ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_VOUT_OV_FAULT_LIMIT ,0x2345 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VOUT_OV_FAULT_LIMIT ); g_assert_cmphex(i2c_value, ==, 0x2345); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_VOUT_UV_FAULT_LIMIT ,0xFA12 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VOUT_UV_FAULT_LIMIT ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_VOUT_UV_FAULT_LIMIT ,0xFA12 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VOUT_UV_FAULT_LIMIT ); g_assert_cmphex(i2c_value, ==, 0xFA12); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_OT_FAULT_LIMIT ,0xF077 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_OT_FAULT_LIMIT ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_OT_FAULT_LIMIT ,0xF077 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_OT_FAULT_LIMIT ); g_assert_cmphex(i2c_value, ==, 0xF077); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_OT_WARN_LIMIT ,0x7137 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_OT_WARN_LIMIT ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_OT_WARN_LIMIT ,0x7137 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_OT_WARN_LIMIT ); g_assert_cmphex(i2c_value, ==, 0x7137); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_VIN_OV_FAULT_LIMIT ,0x3456 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VIN_OV_FAULT_LIMIT ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_VIN_OV_FAULT_LIMIT ,0x3456 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VIN_OV_FAULT_LIMIT ); g_assert_cmphex(i2c_value, ==, 0x3456); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_VIN_UV_FAULT_LIMIT ,0xBADA ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_VIN_UV_FAULT_LIMIT ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_VIN_UV_FAULT_LIMIT ,0xBADA ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_VIN_UV_FAULT_LIMIT ); g_assert_cmphex(i2c_value, ==, 0xBADA); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_IIN_OC_FAULT_LIMIT ,0xB1B0 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_IIN_OC_FAULT_LIMIT ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_IIN_OC_FAULT_LIMIT ,0xB1B0 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_IIN_OC_FAULT_LIMIT ); g_assert_cmphex(i2c_value, ==, 0xB1B0);i2c_set8 (i2cdev,PMBUS_OPERATION ,0xA );@@ -362,49 +363,49 @@ static void test_ro_regs(void *obj, void *data, QGuestAllocator *alloc)uint16_t i2c_init_value, i2c_value;QI2CDevice *i2cdev = (QI2CDevice *)obj; - i2c_init_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_VIN ); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_READ_VIN ,0xBEEF ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_VIN ); + i2c_init_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_VIN ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_READ_VIN ,0xBEEF ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_VIN ); g_assert_cmphex(i2c_init_value, ==, i2c_value); - i2c_init_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_IIN ); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_READ_IIN ,0xB00F ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_IIN ); + i2c_init_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_IIN ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_READ_IIN ,0xB00F ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_IIN ); g_assert_cmphex(i2c_init_value, ==, i2c_value); - i2c_init_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_VOUT ); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_READ_VOUT ,0x1234 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_VOUT ); + i2c_init_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_VOUT ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_READ_VOUT ,0x1234 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_VOUT ); g_assert_cmphex(i2c_init_value, ==, i2c_value); - i2c_init_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_IOUT ); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_READ_IOUT ,0x6547 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_IOUT ); + i2c_init_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_IOUT ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_READ_IOUT ,0x6547 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_IOUT ); g_assert_cmphex(i2c_init_value, ==, i2c_value); - i2c_init_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_1 ); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_READ_TEMPERATURE_1 ,0x1597 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_1 ); + i2c_init_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_1 ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_READ_TEMPERATURE_1 ,0x1597 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_1 ); g_assert_cmphex(i2c_init_value, ==, i2c_value); - i2c_init_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_2 ); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_READ_TEMPERATURE_2 ,0x1897 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_2 ); + i2c_init_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_2 ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_READ_TEMPERATURE_2 ,0x1897 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_2 ); g_assert_cmphex(i2c_init_value, ==, i2c_value); - i2c_init_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_3 ); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_READ_TEMPERATURE_3 ,0x1007 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_3 ); + i2c_init_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_3 ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_READ_TEMPERATURE_3 ,0x1007 ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_3 ); g_assert_cmphex(i2c_init_value, ==, i2c_value); - i2c_init_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_PIN ); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_READ_PIN ,0xDEAD ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_PIN ); + i2c_init_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_PIN ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_READ_PIN ,0xDEAD ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_PIN ); g_assert_cmphex(i2c_init_value, ==, i2c_value); - i2c_init_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_POUT ); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_READ_POUT ,0xD00D ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_READ_POUT ); + i2c_init_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_POUT ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_READ_POUT ,0xD00D ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_READ_POUT ); g_assert_cmphex(i2c_init_value, ==, i2c_value); }@@ -415,29 +416,29 @@ static void test_voltage_faults(void *obj, void *data, QGuestAllocator *alloc)uint8_t i2c_byte;QI2CDevice *i2cdev = (QI2CDevice *)obj; -isl_pmbus_i2c_set16 (i2cdev,PMBUS_VOUT_OV_WARN_LIMIT ,5000 ); -qmp_isl_pmbus_set (TEST_ID ,"vout[0]" ,5100 ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_VOUT_OV_WARN_LIMIT ,5000 ); +qmp_isl_pmbus_vr_set (TEST_ID ,"vout[0]" ,5100 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_STATUS_WORD ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_STATUS_WORD ); i2c_byte =i2c_get8 (i2cdev,PMBUS_STATUS_VOUT );g_assert_true ((i2c_value &PB_STATUS_VOUT ) !=0 );g_assert_true ((i2c_byte &PB_STATUS_VOUT_OV_WARN ) !=0 ); -qmp_isl_pmbus_set (TEST_ID ,"vout[0]" ,4500 ); +qmp_isl_pmbus_vr_set (TEST_ID ,"vout[0]" ,4500 );i2c_set8 (i2cdev,PMBUS_CLEAR_FAULTS ,0 ); i2c_byte =i2c_get8 (i2cdev,PMBUS_STATUS_VOUT );g_assert_true ((i2c_byte &PB_STATUS_VOUT_OV_WARN ) ==0 ); -isl_pmbus_i2c_set16 (i2cdev,PMBUS_VOUT_UV_WARN_LIMIT ,4600 ); +isl_pmbus_vr_i2c_set16 (i2cdev,PMBUS_VOUT_UV_WARN_LIMIT ,4600 ); - i2c_value =isl_pmbus_i2c_get16 (i2cdev,PMBUS_STATUS_WORD ); + i2c_value =isl_pmbus_vr_i2c_get16 (i2cdev,PMBUS_STATUS_WORD ); i2c_byte =i2c_get8 (i2cdev,PMBUS_STATUS_VOUT );g_assert_true ((i2c_value &PB_STATUS_VOUT ) !=0 );g_assert_true ((i2c_byte &PB_STATUS_VOUT_UV_WARN ) !=0 ); } -static void isl_pmbus_register_nodes (void ) +static void isl_pmbus_vr_register_nodes (void ) {QOSGraphEdgeOptions opts = { .extra_device_opts ="id=" TEST_ID ",address=0x43" @@ -470,4 +471,4 @@ static void isl_pmbus_register_nodes(void)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_register_nodes); +libqos_init (isl_pmbus_vr_register_nodes);tests/qtest/meson.build +1
-2@@ -244,7 +244,7 @@ qos_test_ss.add( 'es1370-test.c', 'ipoctal232-test.c', 'lsm303dlhc-mag-test.c', - 'isl_pmbus-test.c', + 'isl_pmbus_vr-test.c', 'max34451-test.c', 'megasas-test.c', 'ne2000-test.c', --2.35.1.616.g0bdcbb4464-goog