hw/sensor: enable setting adm1272 temperature with qmp
PATCH 1/1 hw/sensor: enable setting adm1272 temperature with qmp
From: Titus Rwantare <[email protected]>
--- hw/sensor/adm1272.c | 27 ++++++++++++++++++++++++++- tests/qtest/adm1272-test.c | 28 +++++++++++++++++++++++++++- 2 files changed, 53 insertions(+), 2 deletions(-)
hw/sensor/adm1272.c +26 -1
@@ -66,6 +66,7 @@#define ADM1272_VOLTAGE_COEFF_DEFAULT 1#define ADM1272_CURRENT_COEFF_DEFAULT 3#define ADM1272_PWR_COEFF_DEFAULT 7 +#define ADM1272_TEMP_COEFF_DEFAULT 8#define ADM1272_IOUT_OFFSET 0x5000#define ADM1272_IOUT_OFFSET 0x5000
@@ -186,6 +187,22 @@ static uint32_t adm1272_direct_to_watts(uint16_t value)return pmbus_direct_mode2data (c, value); } +static uint16_t adm1272_millidegrees_to_direct (uint32_t value) +{ +PMBusCoefficients c = adm1272_coefficients[ADM1272_TEMP_COEFF_DEFAULT ]; + c.b = c.b *1000 ; + c.R = c.R -3 ; +return pmbus_data2direct_mode (c, value); +} + +static uint32_t adm1272_direct_to_millidegrees (uint16_t value) +{ +PMBusCoefficients c = adm1272_coefficients[ADM1272_TEMP_COEFF_DEFAULT ]; + c.b = c.b *1000 ; + c.R = c.R -3 ; +return pmbus_direct_mode2data (c, value); +} +static void adm1272_exit_reset (Object *obj) {ADM1272State *s =ADM1272 (obj);
@@ -220,7 +237,7 @@ static void adm1272_exit_reset(Object *obj) = adm1272_millivolts_to_direct(ADM1272_VOLT_DEFAULT); pmdev->pages[0 ].read_iout =adm1272_milliamps_to_direct (ADM1272_IOUT_DEFAULT ); - pmdev->pages[0 ].read_temperature_1 =0 ; + pmdev->pages[0 ].read_temperature_1 =adm1272_millidegrees_to_direct (30000 ); pmdev->pages[0 ].read_pin =adm1272_watts_to_direct (ADM1272_PWR_DEFAULT ); pmdev->pages[0 ].revision =ADM1272_PMBUS_REVISION_DEFAULT ; pmdev->pages[0 ].mfr_id =ADM1272_MFR_ID_DEFAULT ;
@@ -423,6 +440,8 @@ static void adm1272_get(Object *obj, Visitor *v, const char *name, void *opaque, value =adm1272_direct_to_milliamps (*(uint16_t *)opaque); }else if (strcmp (name,"pin" ) ==0 ) { value =adm1272_direct_to_watts (*(uint16_t *)opaque); + }else if (strcmp (name,"temperature" ) ==0 ) { + value =adm1272_direct_to_millidegrees (*(uint16_t *)opaque); }else { value = *(uint16_t *)opaque; }
@@ -447,6 +466,8 @@ static void adm1272_set(Object *obj, Visitor *v, const char *name, void *opaque, *internal =adm1272_milliamps_to_direct (value); }else if (strcmp (name,"pin" ) ==0 ) { *internal =adm1272_watts_to_direct (value); + }else if (strcmp (name,"temperature" ) ==0 ) { + *internal =adm1272_millidegrees_to_direct (value); }else { *internal = value; }
@@ -510,6 +531,10 @@ static void adm1272_init(Object *obj) adm1272_get, adm1272_set, NULL, &pmdev->pages[0].read_pin); +object_property_add (obj,"temperature" ,"uint16" , + adm1272_get, + adm1272_set,NULL , &pmdev->pages[0 ].read_temperature_1); + }static void adm1272_class_init (ObjectClass *klass,void *data)
tests/qtest/adm1272-test.c +27 -1
@@ -65,6 +65,7 @@#define ADM1272_VOLTAGE_COEFF_DEFAULT 1#define ADM1272_CURRENT_COEFF_DEFAULT 3#define ADM1272_PWR_COEFF_DEFAULT 7 +#define ADM1272_TEMP_COEFF_DEFAULT 8#define ADM1272_IOUT_OFFSET 0x5000#define ADM1272_IOUT_OFFSET 0x5000
@@ -144,6 +145,22 @@ static uint32_t adm1272_direct_to_watts(uint16_t value)return pmbus_direct_mode2data (c, value); } +static uint16_t adm1272_millidegrees_to_direct (uint32_t value) +{ +PMBusCoefficients c = adm1272_coefficients[ADM1272_TEMP_COEFF_DEFAULT ]; + c.b = c.b *1000 ; + c.R = c.R -3 ; +return pmbus_data2direct_mode (c, value); +} + +static uint32_t adm1272_direct_to_millidegrees (uint16_t value) +{ +PMBusCoefficients c = adm1272_coefficients[ADM1272_TEMP_COEFF_DEFAULT ]; + c.b = c.b *1000 ; + c.R = c.R -3 ; +return pmbus_direct_mode2data (c, value); +} +static uint16_t qmp_adm1272_get (const char *id,const char *property) {QDict *response;
@@ -248,7 +265,7 @@ static void test_defaults(void *obj, void *data, QGuestAllocator *alloc)/* test qmp access */ static void test_tx_rx (void *obj,void *data,QGuestAllocator *alloc) { -uint16_t i2c_value, value, i2c_voltage, i2c_pwr, lossy_value; +uint16_t i2c_value, value, i2c_voltage, i2c_pwr, i2c_temp, lossy_value;QI2CDevice *i2cdev = (QI2CDevice *)obj;/* converting to direct mode is lossy - we generate the same loss here */
@@ -287,6 +304,15 @@ static void test_tx_rx(void *obj, void *data, QGuestAllocator *alloc) i2c_pwr =adm1272_direct_to_watts (i2c_value); g_assert_cmphex(value, ==, i2c_pwr); g_assert_cmphex(i2c_pwr, ==, lossy_value); + + lossy_value = +adm1272_direct_to_millidegrees (adm1272_millidegrees_to_direct (25000 )); +qmp_adm1272_set (TEST_ID ,"temperature" ,25000 ); + value =qmp_adm1272_get (TEST_ID ,"temperature" ); + i2c_value =adm1272_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_1 ); + i2c_temp =adm1272_direct_to_millidegrees (i2c_value); + g_assert_cmphex(value, ==, i2c_temp); + g_assert_cmphex(i2c_temp, ==, lossy_value); }/* test r/w registers */
Signature · 1 line
2.34.1.448.ga2b2bfdf31-goog
Quoted 160 lines · Thomas Huth
hw/sensor/adm1272.c static uint32_t adm1272_direct_to_watts(uint16_t
Quoted 24 lines · Patrick Venture
From: Titus Rwantare <[email protected]>
Reviewed-by Patrick Venture <[email protected]>Reviewed-by Chris Rauer <[email protected]>Reviewed-by Hao Wu <[email protected]>Signed-off-by Titus Rwantare <[email protected]>--- hw/sensor/adm1272.c | 27 ++++++++++++++++++++++++++- tests/qtest/adm1272-test.c | 28 +++++++++++++++++++++++++++- 2 files changed, 53 insertions(+), 2 deletions(-)hw/sensor/adm1272.c +1
-0@@ -66,6 +66,7 @@#define ADM1272_VOLTAGE_COEFF_DEFAULT 1#define ADM1272_CURRENT_COEFF_DEFAULT 3#define ADM1272_PWR_COEFF_DEFAULT 7 +#define ADM1272_TEMP_COEFF_DEFAULT 8#define ADM1272_IOUT_OFFSET 0x5000#define ADM1272_IOUT_OFFSET 0x5000@@ -186,6 +187,22 @@ static uint32_t adm1272_direct_to_watts(uint16_tvalue)
hw/sensor/adm1272.c static uint32_t adm1272_direct_to_watts(uint16_t value)
Quoted 6 lines
hw/sensor/adm1272.c +3
-0return pmbus_direct_mode2data (c, value); } +static uint16_t adm1272_millidegrees_to_direct (uint32_t value) +{ + PMBusCoefficients c =adm1272_coefficients[ADM1272_TEMP_COEFF_DEFAULT];
hw/sensor/adm1272.c static uint32_t adm1272_direct_to_watts(uint16_t value)
Quoted 8 lines
hw/sensor/adm1272.c +8
-0+ c.b = c.b *1000 ; + c.R = c.R -3 ; +return pmbus_data2direct_mode (c, value); +} + +static uint32_t adm1272_direct_to_millidegrees (uint16_t value) +{ + PMBusCoefficients c =adm1272_coefficients[ADM1272_TEMP_COEFF_DEFAULT];
Quoted 9 lines
hw/sensor/adm1272.c +5
-0+ c.b = c.b *1000 ; + c.R = c.R -3 ; +return pmbus_direct_mode2data (c, value); +} +static void adm1272_exit_reset (Object *obj) {ADM1272State *s =ADM1272 (obj);hw/sensor/adm1272.c static void adm1272_exit_reset(Object *obj) · line 240
Quoted 5 lines
hw/sensor/adm1272.c +1
-1@@ -220,7 +237,7 @@ static void adm1272_exit_reset(Object *obj) = adm1272_millivolts_to_direct(ADM1272_VOLT_DEFAULT); pmdev->pages[0 ].read_iout =adm1272_milliamps_to_direct (ADM1272_IOUT_DEFAULT ); - pmdev->pages[0 ].read_temperature_1 =0 ; + pmdev->pages[0].read_temperature_1 =
adm1272_millidegrees_to_direct(30000);hw/sensor/adm1272.c static void adm1272_exit_reset(Object *obj) · line 241
Quoted 1 line
hw/sensor/adm1272.c +0
-0pmdev->pages[0].read_pin =
adm1272_watts_to_direct(ADM1272_PWR_DEFAULT);hw/sensor/adm1272.c static void adm1272_get(Object *obj, Visitor *v,
Quoted 3 lines
hw/sensor/adm1272.c +0
-0pmdev->pages[0 ].revision =ADM1272_PMBUS_REVISION_DEFAULT ; pmdev->pages[0 ].mfr_id =ADM1272_MFR_ID_DEFAULT ;@@ -423,6 +440,8 @@ static void adm1272_get(Object *obj, Visitor *v,const char *name, void *opaque,
hw/sensor/adm1272.c static void adm1272_set(Object *obj, Visitor *v,
Quoted 9 lines
hw/sensor/adm1272.c +2
-0value =adm1272_direct_to_milliamps (*(uint16_t *)opaque); }else if (strcmp (name,"pin" ) ==0 ) { value =adm1272_direct_to_watts (*(uint16_t *)opaque); + }else if (strcmp (name,"temperature" ) ==0 ) { + value =adm1272_direct_to_millidegrees (*(uint16_t *)opaque); }else { value = *(uint16_t *)opaque; }@@ -447,6 +466,8 @@ static void adm1272_set(Object *obj, Visitor *v,const char *name, void *opaque,
Quoted 9 lines
hw/sensor/adm1272.c +2
-0*internal =adm1272_milliamps_to_direct (value); }else if (strcmp (name,"pin" ) ==0 ) { *internal =adm1272_watts_to_direct (value); + }else if (strcmp (name,"temperature" ) ==0 ) { + *internal =adm1272_millidegrees_to_direct (value); }else { *internal = value; }hw/sensor/adm1272.c static void adm1272_init(Object *obj) · line 536
Quoted 6 lines
hw/sensor/adm1272.c +3
-0@@ -510,6 +531,10 @@ static void adm1272_init(Object *obj) adm1272_get, adm1272_set, NULL, &pmdev->pages[0].read_pin); + object_property_add(obj, "temperature", "uint16", + adm1272_get, + adm1272_set, NULL,&pmdev->pages[0].read_temperature_1);
tests/qtest/adm1272-test.c static uint32_t adm1272_direct_to_watts(uint16_t
Quoted 17 lines
hw/sensor/adm1272.c +1
-0+ }static void adm1272_class_init (ObjectClass *klass,void *data)tests/qtest/adm1272-test.c +1
-0@@ -65,6 +65,7 @@#define ADM1272_VOLTAGE_COEFF_DEFAULT 1#define ADM1272_CURRENT_COEFF_DEFAULT 3#define ADM1272_PWR_COEFF_DEFAULT 7 +#define ADM1272_TEMP_COEFF_DEFAULT 8#define ADM1272_IOUT_OFFSET 0x5000#define ADM1272_IOUT_OFFSET 0x5000@@ -144,6 +145,22 @@ static uint32_t adm1272_direct_to_watts(uint16_tvalue)
tests/qtest/adm1272-test.c static uint32_t adm1272_direct_to_watts(uint16_t · line 150
Quoted 6 lines
tests/qtest/adm1272-test.c +3
-0return pmbus_direct_mode2data (c, value); } +static uint16_t adm1272_millidegrees_to_direct (uint32_t value) +{ + PMBusCoefficients c =adm1272_coefficients[ADM1272_TEMP_COEFF_DEFAULT];
tests/qtest/adm1272-test.c static uint32_t adm1272_direct_to_watts(uint16_t · line 158
Quoted 8 lines
tests/qtest/adm1272-test.c +8
-0+ c.b = c.b *1000 ; + c.R = c.R -3 ; +return pmbus_data2direct_mode (c, value); +} + +static uint32_t adm1272_direct_to_millidegrees (uint16_t value) +{ + PMBusCoefficients c =adm1272_coefficients[ADM1272_TEMP_COEFF_DEFAULT];
tests/qtest/adm1272-test.c static void test_defaults(void *obj, void *data,
Quoted 9 lines
tests/qtest/adm1272-test.c +5
-0+ c.b = c.b *1000 ; + c.R = c.R -3 ; +return pmbus_direct_mode2data (c, value); +} +static uint16_t qmp_adm1272_get (const char *id,const char *property) {QDict *response;@@ -248,7 +265,7 @@ static void test_defaults(void *obj, void *data,QGuestAllocator *alloc)
tests/qtest/adm1272-test.c static void test_defaults(void *obj, void *data, QGuestAllocator *alloc)
Quoted 5 lines
tests/qtest/adm1272-test.c +1
-1/* test qmp access */ static void test_tx_rx (void *obj,void *data,QGuestAllocator *alloc) { -uint16_t i2c_value, value, i2c_voltage, i2c_pwr, lossy_value; + uint16_t i2c_value, value, i2c_voltage, i2c_pwr, i2c_temp,
lossy_value;tests/qtest/adm1272-test.c static void test_defaults(void *obj, void *data, QGuestAllocator *alloc)
Quoted 3 lines
tests/qtest/adm1272-test.c +0
-0QI2CDevice *i2cdev = (QI2CDevice *)obj;/* converting to direct mode is lossy - we generate the same loss here */
tests/qtest/adm1272-test.c static void test_tx_rx(void *obj, void *data,
Quoted 1 line
tests/qtest/adm1272-test.c +0
-0@@ -287,6 +304,15 @@ static void test_tx_rx(void *obj, void *data,QGuestAllocator *alloc)
tests/qtest/adm1272-test.c static void test_tx_rx(void *obj, void *data, QGuestAllocator *alloc)
Quoted 6 lines
tests/qtest/adm1272-test.c +3
-0i2c_pwr =adm1272_direct_to_watts (i2c_value); g_assert_cmphex(value, ==, i2c_pwr); g_assert_cmphex(i2c_pwr, ==, lossy_value); + + lossy_value = +adm1272_direct_to_millidegrees(adm1272_millidegrees_to_direct(25000));
Quoted 8 lines
tests/qtest/adm1272-test.c +6
-0+qmp_adm1272_set (TEST_ID ,"temperature" ,25000 ); + value =qmp_adm1272_get (TEST_ID ,"temperature" ); + i2c_value =adm1272_i2c_get16 (i2cdev,PMBUS_READ_TEMPERATURE_1 ); + i2c_temp =adm1272_direct_to_millidegrees (i2c_value); + g_assert_cmphex(value, ==, i2c_temp); + g_assert_cmphex(i2c_temp, ==, lossy_value); }
Quoted 5 lines
tests/qtest/adm1272-test.c static void test_tx_rx(void *obj, void *data, QGuestAllocator *alloc) · line 318
Quoted 1 line
tests/qtest/adm1272-test.c +0
-0/* test r/w registers */ qtest part:
Acked-by Thomas Huth <[email protected]>
Adding your Ack to the mailing list version.
Philippe Mathieu-Daudé
AppliedQuoted 10 lines · Patrick Venture
From: Titus Rwantare <[email protected]>
Reviewed-by Patrick Venture <[email protected]>Reviewed-by Chris Rauer <[email protected]>Reviewed-by Hao Wu <[email protected]>Signed-off-by Titus Rwantare <[email protected]>--- hw/sensor/adm1272.c | 27 ++++++++++++++++++++++++++- tests/qtest/adm1272-test.c | 28 +++++++++++++++++++++++++++- 2 files changed, 53 insertions(+), 2 deletions(-)
Queued to i2c-next.