diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2020-12-10 14:26:35 +0000 |
---|---|---|
committer | Peter Maydell <peter.maydell@linaro.org> | 2020-12-10 14:26:35 +0000 |
commit | 379e9eaed497a2e09b5985e1e15967d7bfea8296 (patch) | |
tree | 45cb9eff91601d0de760d40097829b0b565f934f /hw/misc | |
parent | 00ef48ff0de9c3e5834e7e3f6691bbc80d08c114 (diff) | |
parent | 6f5f6507e49df4820207a94f3aeaaeab08092d32 (diff) | |
download | qemu-379e9eaed497a2e09b5985e1e15967d7bfea8296.zip qemu-379e9eaed497a2e09b5985e1e15967d7bfea8296.tar.gz qemu-379e9eaed497a2e09b5985e1e15967d7bfea8296.tar.bz2 |
Merge remote-tracking branch 'remotes/legoater/tags/pull-aspeed-20201210' into staging
Aspeed patches :
* New device model for EMC1413/EMC1414 temperature sensors (I2C)
* New g220a-bmc Aspeed machine
* couple of Aspeed cleanups
# gpg: Signature made Thu 10 Dec 2020 11:58:10 GMT
# gpg: using RSA key A0F66548F04895EBFE6B0B6051A343C7CFFBECA1
# gpg: Good signature from "Cédric Le Goater <clg@kaod.org>" [undefined]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg: There is no indication that the signature belongs to the owner.
# Primary key fingerprint: A0F6 6548 F048 95EB FE6B 0B60 51A3 43C7 CFFB ECA1
* remotes/legoater/tags/pull-aspeed-20201210:
aspeed: g220a-bmc: Add an FRU
aspeed/smc: Add support for address lane disablement
ast2600: SRAM is 89KB
aspeed: Add support for the g220a-bmc board
hw/misc: add an EMC141{3,4} device model
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw/misc')
-rw-r--r-- | hw/misc/Kconfig | 4 | ||||
-rw-r--r-- | hw/misc/emc141x.c | 326 | ||||
-rw-r--r-- | hw/misc/meson.build | 1 |
3 files changed, 331 insertions, 0 deletions
diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig index dc44dc1..cf18ac0 100644 --- a/hw/misc/Kconfig +++ b/hw/misc/Kconfig @@ -13,6 +13,10 @@ config TMP421 bool depends on I2C +config EMC141X + bool + depends on I2C + config ISA_DEBUG bool depends on ISA_BUS diff --git a/hw/misc/emc141x.c b/hw/misc/emc141x.c new file mode 100644 index 0000000..f7c53d4 --- /dev/null +++ b/hw/misc/emc141x.c @@ -0,0 +1,326 @@ +/* + * SMSC EMC141X temperature sensor. + * + * Copyright (c) 2020 Bytedance Corporation + * Written by John Wang <wangzhiqiang.bj@bytedance.com> + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 or + * (at your option) version 3 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, see <http://www.gnu.org/licenses/>. + */ + +#include "qemu/osdep.h" +#include "hw/i2c/i2c.h" +#include "migration/vmstate.h" +#include "qapi/error.h" +#include "qapi/visitor.h" +#include "qemu/module.h" +#include "qom/object.h" +#include "hw/misc/emc141x_regs.h" + +#define SENSORS_COUNT_MAX 4 + +struct EMC141XState { + I2CSlave parent_obj; + struct { + uint8_t raw_temp_min; + uint8_t raw_temp_current; + uint8_t raw_temp_max; + } sensor[SENSORS_COUNT_MAX]; + uint8_t len; + uint8_t data; + uint8_t pointer; +}; + +struct EMC141XClass { + I2CSlaveClass parent_class; + uint8_t model; + unsigned sensors_count; +}; + +#define TYPE_EMC141X "emc141x" +OBJECT_DECLARE_TYPE(EMC141XState, EMC141XClass, EMC141X) + +static void emc141x_get_temperature(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + EMC141XState *s = EMC141X(obj); + EMC141XClass *sc = EMC141X_GET_CLASS(s); + int64_t value; + unsigned tempid; + + if (sscanf(name, "temperature%u", &tempid) != 1) { + error_setg(errp, "error reading %s: %s", name, g_strerror(errno)); + return; + } + + if (tempid >= sc->sensors_count) { + error_setg(errp, "error reading %s", name); + return; + } + + value = s->sensor[tempid].raw_temp_current * 1000; + + visit_type_int(v, name, &value, errp); +} + +static void emc141x_set_temperature(Object *obj, Visitor *v, const char *name, + void *opaque, Error **errp) +{ + EMC141XState *s = EMC141X(obj); + EMC141XClass *sc = EMC141X_GET_CLASS(s); + int64_t temp; + unsigned tempid; + + if (!visit_type_int(v, name, &temp, errp)) { + return; + } + + if (sscanf(name, "temperature%u", &tempid) != 1) { + error_setg(errp, "error reading %s: %s", name, g_strerror(errno)); + return; + } + + if (tempid >= sc->sensors_count) { + error_setg(errp, "error reading %s", name); + return; + } + + s->sensor[tempid].raw_temp_current = temp / 1000; +} + +static void emc141x_read(EMC141XState *s) +{ + EMC141XClass *sc = EMC141X_GET_CLASS(s); + switch (s->pointer) { + case EMC141X_DEVICE_ID: + s->data = sc->model; + break; + case EMC141X_MANUFACTURER_ID: + s->data = MANUFACTURER_ID; + break; + case EMC141X_REVISION: + s->data = REVISION; + break; + case EMC141X_TEMP_HIGH0: + s->data = s->sensor[0].raw_temp_current; + break; + case EMC141X_TEMP_HIGH1: + s->data = s->sensor[1].raw_temp_current; + break; + case EMC141X_TEMP_HIGH2: + s->data = s->sensor[2].raw_temp_current; + break; + case EMC141X_TEMP_HIGH3: + s->data = s->sensor[3].raw_temp_current; + break; + case EMC141X_TEMP_MAX_HIGH0: + s->data = s->sensor[0].raw_temp_max; + break; + case EMC141X_TEMP_MAX_HIGH1: + s->data = s->sensor[1].raw_temp_max; + break; + case EMC141X_TEMP_MAX_HIGH2: + s->data = s->sensor[2].raw_temp_max; + break; + case EMC141X_TEMP_MAX_HIGH3: + s->data = s->sensor[3].raw_temp_max; + break; + case EMC141X_TEMP_MIN_HIGH0: + s->data = s->sensor[0].raw_temp_min; + break; + case EMC141X_TEMP_MIN_HIGH1: + s->data = s->sensor[1].raw_temp_min; + break; + case EMC141X_TEMP_MIN_HIGH2: + s->data = s->sensor[2].raw_temp_min; + break; + case EMC141X_TEMP_MIN_HIGH3: + s->data = s->sensor[3].raw_temp_min; + break; + default: + s->data = 0; + } +} + +static void emc141x_write(EMC141XState *s) +{ + switch (s->pointer) { + case EMC141X_TEMP_MAX_HIGH0: + s->sensor[0].raw_temp_max = s->data; + break; + case EMC141X_TEMP_MAX_HIGH1: + s->sensor[1].raw_temp_max = s->data; + break; + case EMC141X_TEMP_MAX_HIGH2: + s->sensor[2].raw_temp_max = s->data; + break; + case EMC141X_TEMP_MAX_HIGH3: + s->sensor[3].raw_temp_max = s->data; + break; + case EMC141X_TEMP_MIN_HIGH0: + s->sensor[0].raw_temp_min = s->data; + break; + case EMC141X_TEMP_MIN_HIGH1: + s->sensor[1].raw_temp_min = s->data; + break; + case EMC141X_TEMP_MIN_HIGH2: + s->sensor[2].raw_temp_min = s->data; + break; + case EMC141X_TEMP_MIN_HIGH3: + s->sensor[3].raw_temp_min = s->data; + break; + default: + s->data = 0; + } +} + +static uint8_t emc141x_rx(I2CSlave *i2c) +{ + EMC141XState *s = EMC141X(i2c); + + if (s->len == 0) { + s->len++; + return s->data; + } else { + return 0xff; + } +} + +static int emc141x_tx(I2CSlave *i2c, uint8_t data) +{ + EMC141XState *s = EMC141X(i2c); + + if (s->len == 0) { + /* first byte is the reg pointer */ + s->pointer = data; + s->len++; + } else if (s->len == 1) { + s->data = data; + emc141x_write(s); + } + + return 0; +} + +static int emc141x_event(I2CSlave *i2c, enum i2c_event event) +{ + EMC141XState *s = EMC141X(i2c); + + if (event == I2C_START_RECV) { + emc141x_read(s); + } + + s->len = 0; + return 0; +} + +static const VMStateDescription vmstate_emc141x = { + .name = "EMC141X", + .version_id = 0, + .minimum_version_id = 0, + .fields = (VMStateField[]) { + VMSTATE_UINT8(len, EMC141XState), + VMSTATE_UINT8(data, EMC141XState), + VMSTATE_UINT8(pointer, EMC141XState), + VMSTATE_I2C_SLAVE(parent_obj, EMC141XState), + VMSTATE_END_OF_LIST() + } +}; + +static void emc141x_reset(DeviceState *dev) +{ + EMC141XState *s = EMC141X(dev); + int i; + + for (i = 0; i < SENSORS_COUNT_MAX; i++) { + s->sensor[i].raw_temp_max = 0x55; + } + s->pointer = 0; + s->len = 0; +} + +static void emc141x_initfn(Object *obj) +{ + object_property_add(obj, "temperature0", "int", + emc141x_get_temperature, + emc141x_set_temperature, NULL, NULL); + object_property_add(obj, "temperature1", "int", + emc141x_get_temperature, + emc141x_set_temperature, NULL, NULL); + object_property_add(obj, "temperature2", "int", + emc141x_get_temperature, + emc141x_set_temperature, NULL, NULL); + object_property_add(obj, "temperature3", "int", + emc141x_get_temperature, + emc141x_set_temperature, NULL, NULL); +} + +static void emc141x_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + I2CSlaveClass *k = I2C_SLAVE_CLASS(klass); + + dc->reset = emc141x_reset; + k->event = emc141x_event; + k->recv = emc141x_rx; + k->send = emc141x_tx; + dc->vmsd = &vmstate_emc141x; +} + +static void emc1413_class_init(ObjectClass *klass, void *data) +{ + EMC141XClass *ec = EMC141X_CLASS(klass); + + emc141x_class_init(klass, data); + ec->model = EMC1413_DEVICE_ID; + ec->sensors_count = 3; +} + +static void emc1414_class_init(ObjectClass *klass, void *data) +{ + EMC141XClass *ec = EMC141X_CLASS(klass); + + emc141x_class_init(klass, data); + ec->model = EMC1414_DEVICE_ID; + ec->sensors_count = 4; +} + +static const TypeInfo emc141x_info = { + .name = TYPE_EMC141X, + .parent = TYPE_I2C_SLAVE, + .instance_size = sizeof(EMC141XState), + .class_size = sizeof(EMC141XClass), + .instance_init = emc141x_initfn, + .abstract = true, +}; + +static const TypeInfo emc1413_info = { + .name = "emc1413", + .parent = TYPE_EMC141X, + .class_init = emc1413_class_init, +}; + +static const TypeInfo emc1414_info = { + .name = "emc1414", + .parent = TYPE_EMC141X, + .class_init = emc1414_class_init, +}; + +static void emc141x_register_types(void) +{ + type_register_static(&emc141x_info); + type_register_static(&emc1413_info); + type_register_static(&emc1414_info); +} + +type_init(emc141x_register_types) diff --git a/hw/misc/meson.build b/hw/misc/meson.build index 1cd48e8..ce15ffc 100644 --- a/hw/misc/meson.build +++ b/hw/misc/meson.build @@ -9,6 +9,7 @@ softmmu_ss.add(when: 'CONFIG_PCI_TESTDEV', if_true: files('pci-testdev.c')) softmmu_ss.add(when: 'CONFIG_SGA', if_true: files('sga.c')) softmmu_ss.add(when: 'CONFIG_TMP105', if_true: files('tmp105.c')) softmmu_ss.add(when: 'CONFIG_TMP421', if_true: files('tmp421.c')) +softmmu_ss.add(when: 'CONFIG_EMC141X', if_true: files('emc141x.c')) softmmu_ss.add(when: 'CONFIG_UNIMP', if_true: files('unimp.c')) softmmu_ss.add(when: 'CONFIG_EMPTY_SLOT', if_true: files('empty_slot.c')) softmmu_ss.add(when: 'CONFIG_LED', if_true: files('led.c')) |