* [PATCH v3 1/2] hw/misc: add an EMC141{3,4} device model
@ 2020-10-25 13:14 John Wang
2020-10-25 13:14 ` [PATCH v3 2/2] aspeed: Add support for the g220a-bmc board John Wang
2020-10-25 21:08 ` [PATCH v3 1/2] hw/misc: add an EMC141{3,4} device model Philippe Mathieu-Daudé
0 siblings, 2 replies; 4+ messages in thread
From: John Wang @ 2020-10-25 13:14 UTC (permalink / raw)
To: clg, xuxiaohan, yulei.sh, joel, f4bug
Cc: Peter Maydell, open list:ARM TCG CPUs, open list:All patches CC here
Largely inspired by the TMP421 temperature sensor, here is a model for
the EMC1413/EMC1414 temperature sensors.
Specs can be found here :
http://ww1.microchip.com/downloads/en/DeviceDoc/20005274A.pdf
Signed-off-by: John Wang <wangzhiqiang.bj@bytedance.com>
---
v3:
- update the link to the spec
- Rename emc1413.c to emc141x.c
- Add sensors_count in EMC141XClass
- Make emc1413_read/write easier to review :)
v2:
- Remove DeviceInfo
- commit message: TMP423 -> TMP421
---
hw/arm/Kconfig | 1 +
hw/misc/Kconfig | 4 +
hw/misc/emc141x.c | 347 ++++++++++++++++++++++++++++++++++++++++++++
hw/misc/meson.build | 1 +
4 files changed, 353 insertions(+)
create mode 100644 hw/misc/emc141x.c
diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
index 7d040827af..3dd651a236 100644
--- a/hw/arm/Kconfig
+++ b/hw/arm/Kconfig
@@ -403,6 +403,7 @@ config ASPEED_SOC
select SSI_M25P80
select TMP105
select TMP421
+ select EMC141X
select UNIMP
config MPS2
diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig
index 3185456110..169d087d3d 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 0000000000..a2bce74719
--- /dev/null
+++ b/hw/misc/emc141x.c
@@ -0,0 +1,347 @@
+/*
+ * 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"
+
+#define EMC1413_DEVICE_ID 0x21
+#define EMC1414_DEVICE_ID 0x25
+#define MANUFACTURER_ID 0x5d
+#define REVISION 0x04
+
+#define SENSORS_COUNT_MAX 4
+
+struct EMC141XState {
+ I2CSlave i2c;
+ uint8_t temperature[SENSORS_COUNT_MAX];
+ uint8_t min[SENSORS_COUNT_MAX];
+ uint8_t max[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)
+
+
+/* the EMC141X registers */
+#define EMC141X_TEMP_HIGH0 0x00
+#define EMC141X_TEMP_HIGH1 0x01
+#define EMC141X_TEMP_HIGH2 0x23
+#define EMC141X_TEMP_HIGH3 0x2a
+#define EMC141X_TEMP_MAX_HIGH0 0x05
+#define EMC141X_TEMP_MIN_HIGH0 0x06
+#define EMC141X_TEMP_MAX_HIGH1 0x07
+#define EMC141X_TEMP_MIN_HIGH1 0x08
+#define EMC141X_TEMP_MAX_HIGH2 0x15
+#define EMC141X_TEMP_MIN_HIGH2 0x16
+#define EMC141X_TEMP_MAX_HIGH3 0x2c
+#define EMC141X_TEMP_MIN_HIGH3 0x2d
+#define EMC141X_DEVICE_ID 0xfd
+#define EMC141X_MANUFACTURER_ID 0xfe
+#define EMC141X_REVISION 0xff
+
+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;
+ int tempid;
+
+ if (sscanf(name, "temperature%d", &tempid) != 1) {
+ error_setg(errp, "error reading %s: %s", name, g_strerror(errno));
+ return;
+ }
+
+ if (tempid >= sc->sensors_count || tempid < 0) {
+ error_setg(errp, "error reading %s", name);
+ return;
+ }
+
+ value = s->temperature[tempid] * 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;
+ int tempid;
+
+ if (!visit_type_int(v, name, &temp, errp)) {
+ return;
+ }
+
+ if (sscanf(name, "temperature%d", &tempid) != 1) {
+ error_setg(errp, "error reading %s: %s", name, g_strerror(errno));
+ return;
+ }
+
+ if (tempid >= sc->sensors_count || tempid < 0) {
+ error_setg(errp, "error reading %s", name);
+ return;
+ }
+
+ s->temperature[tempid] = 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->temperature[0];
+ break;
+ case EMC141X_TEMP_HIGH1:
+ s->data = s->temperature[1];
+ break;
+ case EMC141X_TEMP_HIGH2:
+ s->data = s->temperature[2];
+ break;
+ case EMC141X_TEMP_HIGH3:
+ s->data = s->temperature[3];
+ break;
+ case EMC141X_TEMP_MAX_HIGH0:
+ s->data = s->max[0];
+ break;
+ case EMC141X_TEMP_MAX_HIGH1:
+ s->data = s->max[1];
+ break;
+ case EMC141X_TEMP_MAX_HIGH2:
+ s->data = s->max[2];
+ break;
+ case EMC141X_TEMP_MAX_HIGH3:
+ s->data = s->max[3];
+ break;
+ case EMC141X_TEMP_MIN_HIGH0:
+ s->data = s->min[0];
+ break;
+ case EMC141X_TEMP_MIN_HIGH1:
+ s->data = s->min[1];
+ break;
+ case EMC141X_TEMP_MIN_HIGH2:
+ s->data = s->min[2];
+ break;
+ case EMC141X_TEMP_MIN_HIGH3:
+ s->data = s->min[3];
+ break;
+ default:
+ s->data = 0;
+ }
+}
+
+static void emc141x_write(EMC141XState *s)
+{
+ switch (s->pointer) {
+ case EMC141X_TEMP_MAX_HIGH0:
+ s->max[0] = s->data;
+ break;
+ case EMC141X_TEMP_MAX_HIGH1:
+ s->max[1] = s->data;
+ break;
+ case EMC141X_TEMP_MAX_HIGH2:
+ s->max[2] = s->data;
+ break;
+ case EMC141X_TEMP_MAX_HIGH3:
+ s->max[3] = s->data;
+ break;
+ case EMC141X_TEMP_MIN_HIGH0:
+ s->min[0] = s->data;
+ break;
+ case EMC141X_TEMP_MIN_HIGH1:
+ s->min[1] = s->data;
+ break;
+ case EMC141X_TEMP_MIN_HIGH2:
+ s->min[2] = s->data;
+ break;
+ case EMC141X_TEMP_MIN_HIGH3:
+ s->min[3] = 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_UINT8_ARRAY(temperature, EMC141XState, SENSORS_COUNT_MAX),
+ VMSTATE_UINT8_ARRAY(min, EMC141XState, SENSORS_COUNT_MAX),
+ VMSTATE_UINT8_ARRAY(max, EMC141XState, SENSORS_COUNT_MAX),
+ VMSTATE_I2C_SLAVE(i2c, EMC141XState),
+ VMSTATE_END_OF_LIST()
+ }
+};
+
+static void emc141x_reset(DeviceState *dev)
+{
+ EMC141XState *s = EMC141X(dev);
+
+ memset(s->min, 0, sizeof(s->min));
+ memset(s->max, 0x55, sizeof(s->max));
+ 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 793d45b1dc..b18693c9af 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'))
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v3 2/2] aspeed: Add support for the g220a-bmc board
2020-10-25 13:14 [PATCH v3 1/2] hw/misc: add an EMC141{3,4} device model John Wang
@ 2020-10-25 13:14 ` John Wang
2020-10-25 21:08 ` [PATCH v3 1/2] hw/misc: add an EMC141{3,4} device model Philippe Mathieu-Daudé
1 sibling, 0 replies; 4+ messages in thread
From: John Wang @ 2020-10-25 13:14 UTC (permalink / raw)
To: clg, xuxiaohan, yulei.sh, joel, f4bug
Cc: Andrew Jeffery, Peter Maydell, open list:ASPEED BMCs,
open list:All patches CC here
G220A is a 2 socket x86 motherboard supported by OpenBMC.
Strapping configuration was obtained from hardware.
Signed-off-by: John Wang <wangzhiqiang.bj@bytedance.com>
Reviewed-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Joel Stanley <joel@jms.id.au>
---
v3:
- No changes
v2:
- No changes
---
hw/arm/aspeed.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 60 insertions(+)
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index bdb981d2f8..04c8ad2bcd 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -120,6 +120,20 @@ struct AspeedMachineState {
SCU_AST2500_HW_STRAP_ACPI_ENABLE | \
SCU_HW_STRAP_SPI_MODE(SCU_HW_STRAP_SPI_MASTER))
+#define G220A_BMC_HW_STRAP1 ( \
+ SCU_AST2500_HW_STRAP_SPI_AUTOFETCH_ENABLE | \
+ SCU_AST2500_HW_STRAP_GPIO_STRAP_ENABLE | \
+ SCU_AST2500_HW_STRAP_UART_DEBUG | \
+ SCU_AST2500_HW_STRAP_RESERVED28 | \
+ SCU_AST2500_HW_STRAP_DDR4_ENABLE | \
+ SCU_HW_STRAP_2ND_BOOT_WDT | \
+ SCU_HW_STRAP_VGA_CLASS_CODE | \
+ SCU_HW_STRAP_LPC_RESET_PIN | \
+ SCU_HW_STRAP_SPI_MODE(SCU_HW_STRAP_SPI_MASTER) | \
+ SCU_AST2500_HW_STRAP_SET_AXI_AHB_RATIO(AXI_AHB_RATIO_2_1) | \
+ SCU_HW_STRAP_VGA_SIZE_SET(VGA_64M_DRAM) | \
+ SCU_AST2500_HW_STRAP_RESERVED1)
+
/* Witherspoon hardware value: 0xF10AD216 (but use romulus definition) */
#define WITHERSPOON_BMC_HW_STRAP1 ROMULUS_BMC_HW_STRAP1
@@ -559,6 +573,30 @@ static void witherspoon_bmc_i2c_init(AspeedMachineState *bmc)
/* Bus 11: TODO ucd90160@64 */
}
+static void g220a_bmc_i2c_init(AspeedMachineState *bmc)
+{
+ AspeedSoCState *soc = &bmc->soc;
+ DeviceState *dev;
+
+ dev = DEVICE(i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 3),
+ "emc1413", 0x4c));
+ object_property_set_int(OBJECT(dev), "temperature0", 31000, &error_abort);
+ object_property_set_int(OBJECT(dev), "temperature1", 28000, &error_abort);
+ object_property_set_int(OBJECT(dev), "temperature2", 20000, &error_abort);
+
+ dev = DEVICE(i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 12),
+ "emc1413", 0x4c));
+ object_property_set_int(OBJECT(dev), "temperature0", 31000, &error_abort);
+ object_property_set_int(OBJECT(dev), "temperature1", 28000, &error_abort);
+ object_property_set_int(OBJECT(dev), "temperature2", 20000, &error_abort);
+
+ dev = DEVICE(i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 13),
+ "emc1413", 0x4c));
+ object_property_set_int(OBJECT(dev), "temperature0", 31000, &error_abort);
+ object_property_set_int(OBJECT(dev), "temperature1", 28000, &error_abort);
+ object_property_set_int(OBJECT(dev), "temperature2", 20000, &error_abort);
+}
+
static bool aspeed_get_mmio_exec(Object *obj, Error **errp)
{
return ASPEED_MACHINE(obj)->mmio_exec;
@@ -798,6 +836,24 @@ static void aspeed_machine_tacoma_class_init(ObjectClass *oc, void *data)
aspeed_soc_num_cpus(amc->soc_name);
};
+static void aspeed_machine_g220a_class_init(ObjectClass *oc, void *data)
+{
+ MachineClass *mc = MACHINE_CLASS(oc);
+ AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
+
+ mc->desc = "Bytedance G220A BMC (ARM1176)";
+ amc->soc_name = "ast2500-a1";
+ amc->hw_strap1 = G220A_BMC_HW_STRAP1;
+ amc->fmc_model = "n25q512a";
+ amc->spi_model = "mx25l25635e";
+ amc->num_cs = 2;
+ amc->macs_mask = ASPEED_MAC1_ON | ASPEED_MAC2_ON;
+ amc->i2c_init = g220a_bmc_i2c_init;
+ mc->default_ram_size = 1024 * MiB;
+ mc->default_cpus = mc->min_cpus = mc->max_cpus =
+ aspeed_soc_num_cpus(amc->soc_name);
+};
+
static const TypeInfo aspeed_machine_types[] = {
{
.name = MACHINE_TYPE_NAME("palmetto-bmc"),
@@ -835,6 +891,10 @@ static const TypeInfo aspeed_machine_types[] = {
.name = MACHINE_TYPE_NAME("tacoma-bmc"),
.parent = TYPE_ASPEED_MACHINE,
.class_init = aspeed_machine_tacoma_class_init,
+ }, {
+ .name = MACHINE_TYPE_NAME("g220a-bmc"),
+ .parent = TYPE_ASPEED_MACHINE,
+ .class_init = aspeed_machine_g220a_class_init,
}, {
.name = TYPE_ASPEED_MACHINE,
.parent = TYPE_MACHINE,
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v3 1/2] hw/misc: add an EMC141{3,4} device model
2020-10-25 13:14 [PATCH v3 1/2] hw/misc: add an EMC141{3,4} device model John Wang
2020-10-25 13:14 ` [PATCH v3 2/2] aspeed: Add support for the g220a-bmc board John Wang
@ 2020-10-25 21:08 ` Philippe Mathieu-Daudé
2020-11-22 10:33 ` [Phishing Risk] [External] " John Wang
1 sibling, 1 reply; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2020-10-25 21:08 UTC (permalink / raw)
To: John Wang, clg, xuxiaohan, yulei.sh, joel
Cc: Peter Maydell, open list:ARM TCG CPUs, open list:All patches CC here
On 10/25/20 2:14 PM, John Wang wrote:
> Largely inspired by the TMP421 temperature sensor, here is a model for
> the EMC1413/EMC1414 temperature sensors.
>
> Specs can be found here :
> http://ww1.microchip.com/downloads/en/DeviceDoc/20005274A.pdf
>
> Signed-off-by: John Wang <wangzhiqiang.bj@bytedance.com>
> ---
> v3:
> - update the link to the spec
> - Rename emc1413.c to emc141x.c
> - Add sensors_count in EMC141XClass
> - Make emc1413_read/write easier to review :)
Thanks for the update.
> v2:
> - Remove DeviceInfo
> - commit message: TMP423 -> TMP421
> ---
> hw/arm/Kconfig | 1 +
> hw/misc/Kconfig | 4 +
> hw/misc/emc141x.c | 347 ++++++++++++++++++++++++++++++++++++++++++++
> hw/misc/meson.build | 1 +
> 4 files changed, 353 insertions(+)
> create mode 100644 hw/misc/emc141x.c
>
> diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> index 7d040827af..3dd651a236 100644
> --- a/hw/arm/Kconfig
> +++ b/hw/arm/Kconfig
> @@ -403,6 +403,7 @@ config ASPEED_SOC
> select SSI_M25P80
> select TMP105
> select TMP421
> + select EMC141X
> select UNIMP
>
> config MPS2
> diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig
> index 3185456110..169d087d3d 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 0000000000..a2bce74719
> --- /dev/null
> +++ b/hw/misc/emc141x.c
> @@ -0,0 +1,347 @@
> +/*
> + * 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"
> +
> +#define EMC1413_DEVICE_ID 0x21
> +#define EMC1414_DEVICE_ID 0x25
> +#define MANUFACTURER_ID 0x5d
> +#define REVISION 0x04
> +
> +#define SENSORS_COUNT_MAX 4
> +
> +struct EMC141XState {
> + I2CSlave i2c;
The QOM style name is 'parent_obj':
I2CSlave parent_obj;
> + uint8_t temperature[SENSORS_COUNT_MAX];
What is the unit?
> + uint8_t min[SENSORS_COUNT_MAX];
> + uint8_t max[SENSORS_COUNT_MAX];
min/max what? Temperature?
What about (if the unit is milli Celsius):
struct {
uint8_t temp_min_mC;
uint8_t temp_current_mC;
uint8_t temp_max_mC;
} sensor[SENSORS_COUNT_MAX];
Looking at the datasheet chapter 6.8 "Temperature Measurement
Results and Data", it isn't in milli Celsius. See below in
emc141x_get_temperature().
So maybe:
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)
> +
> +
> +/* the EMC141X registers */
> +#define EMC141X_TEMP_HIGH0 0x00
> +#define EMC141X_TEMP_HIGH1 0x01
> +#define EMC141X_TEMP_HIGH2 0x23
> +#define EMC141X_TEMP_HIGH3 0x2a
> +#define EMC141X_TEMP_MAX_HIGH0 0x05
> +#define EMC141X_TEMP_MIN_HIGH0 0x06
> +#define EMC141X_TEMP_MAX_HIGH1 0x07
> +#define EMC141X_TEMP_MIN_HIGH1 0x08
> +#define EMC141X_TEMP_MAX_HIGH2 0x15
> +#define EMC141X_TEMP_MIN_HIGH2 0x16
> +#define EMC141X_TEMP_MAX_HIGH3 0x2c
> +#define EMC141X_TEMP_MIN_HIGH3 0x2d
> +#define EMC141X_DEVICE_ID 0xfd
> +#define EMC141X_MANUFACTURER_ID 0xfe
> +#define EMC141X_REVISION 0xff
> +
> +static void emc141x_get_temperature(Object *obj, Visitor *v, const char *name,
> + void *opaque, Error **errp)
Nitpicking, align is off ;)
> +{
> + EMC141XState *s = EMC141X(obj);
> + EMC141XClass *sc = EMC141X_GET_CLASS(s);
> + int64_t value;
> + int tempid;
Shouldn't it be unsigned?
> +
> + if (sscanf(name, "temperature%d", &tempid) != 1) {
Format doesn't match. Using 'unsigned' is probably easier (%u).
> + error_setg(errp, "error reading %s: %s", name, g_strerror(errno));
> + return;
> + }
> +
> + if (tempid >= sc->sensors_count || tempid < 0) {
> + error_setg(errp, "error reading %s", name);
> + return;
> + }
> +
> + value = s->temperature[tempid] * 1000;
This is not what is described in "Table 6.2: Temperature Data Format",
there is an offset and a step multiplier. Which makes me wonder how
are you testing this?
We have very simple tests for the TMP105, see tests/qtest/tmp105-test.c,
please add a similar test.
> +
> + visit_type_int(v, name, &value, errp);
> +}
> +
...
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Phishing Risk] [External] Re: [PATCH v3 1/2] hw/misc: add an EMC141{3,4} device model
2020-10-25 21:08 ` [PATCH v3 1/2] hw/misc: add an EMC141{3,4} device model Philippe Mathieu-Daudé
@ 2020-11-22 10:33 ` John Wang
0 siblings, 0 replies; 4+ messages in thread
From: John Wang @ 2020-11-22 10:33 UTC (permalink / raw)
To: Philippe Mathieu-Daudé
Cc: Peter Maydell, 郁雷,
open list:All patches CC here, open list:ARM TCG CPUs,
Cédric Le Goater, Lotus Xu, Joel Stanley
On Mon, Oct 26, 2020 at 5:08 AM Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
>
> On 10/25/20 2:14 PM, John Wang wrote:
> > Largely inspired by the TMP421 temperature sensor, here is a model for
> > the EMC1413/EMC1414 temperature sensors.
> >
> > Specs can be found here :
> > http://ww1.microchip.com/downloads/en/DeviceDoc/20005274A.pdf
> >
> > Signed-off-by: John Wang <wangzhiqiang.bj@bytedance.com>
> > ---
> > v3:
> > - update the link to the spec
> > - Rename emc1413.c to emc141x.c
> > - Add sensors_count in EMC141XClass
> > - Make emc1413_read/write easier to review :)
>
> Thanks for the update.
>
> > v2:
> > - Remove DeviceInfo
> > - commit message: TMP423 -> TMP421
> > ---
> > hw/arm/Kconfig | 1 +
> > hw/misc/Kconfig | 4 +
> > hw/misc/emc141x.c | 347 ++++++++++++++++++++++++++++++++++++++++++++
> > hw/misc/meson.build | 1 +
> > 4 files changed, 353 insertions(+)
> > create mode 100644 hw/misc/emc141x.c
> >
> > diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig
> > index 7d040827af..3dd651a236 100644
> > --- a/hw/arm/Kconfig
> > +++ b/hw/arm/Kconfig
> > @@ -403,6 +403,7 @@ config ASPEED_SOC
> > select SSI_M25P80
> > select TMP105
> > select TMP421
> > + select EMC141X
> > select UNIMP
> >
> > config MPS2
> > diff --git a/hw/misc/Kconfig b/hw/misc/Kconfig
> > index 3185456110..169d087d3d 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 0000000000..a2bce74719
> > --- /dev/null
> > +++ b/hw/misc/emc141x.c
> > @@ -0,0 +1,347 @@
> > +/*
> > + * 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"
> > +
> > +#define EMC1413_DEVICE_ID 0x21
> > +#define EMC1414_DEVICE_ID 0x25
> > +#define MANUFACTURER_ID 0x5d
> > +#define REVISION 0x04
> > +
> > +#define SENSORS_COUNT_MAX 4
> > +
> > +struct EMC141XState {
> > + I2CSlave i2c;
>
> The QOM style name is 'parent_obj':
>
> I2CSlave parent_obj;
will fix
>
> > + uint8_t temperature[SENSORS_COUNT_MAX];
>
> What is the unit?
>
> > + uint8_t min[SENSORS_COUNT_MAX];
> > + uint8_t max[SENSORS_COUNT_MAX];
>
> min/max what? Temperature?
>
> What about (if the unit is milli Celsius):
>
> struct {
> uint8_t temp_min_mC;
> uint8_t temp_current_mC;
> uint8_t temp_max_mC;
> } sensor[SENSORS_COUNT_MAX];
>
> Looking at the datasheet chapter 6.8 "Temperature Measurement
> Results and Data", it isn't in milli Celsius. See below in
> emc141x_get_temperature().
>
> So maybe:
>
> struct {
> uint8_t raw_temp_min;
> uint8_t raw_temp_current;
> uint8_t raw_temp_max;
> } sensor[SENSORS_COUNT_MAX];
will fix
>
> > + 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)
> > +
> > +
> > +/* the EMC141X registers */
> > +#define EMC141X_TEMP_HIGH0 0x00
> > +#define EMC141X_TEMP_HIGH1 0x01
> > +#define EMC141X_TEMP_HIGH2 0x23
> > +#define EMC141X_TEMP_HIGH3 0x2a
> > +#define EMC141X_TEMP_MAX_HIGH0 0x05
> > +#define EMC141X_TEMP_MIN_HIGH0 0x06
> > +#define EMC141X_TEMP_MAX_HIGH1 0x07
> > +#define EMC141X_TEMP_MIN_HIGH1 0x08
> > +#define EMC141X_TEMP_MAX_HIGH2 0x15
> > +#define EMC141X_TEMP_MIN_HIGH2 0x16
> > +#define EMC141X_TEMP_MAX_HIGH3 0x2c
> > +#define EMC141X_TEMP_MIN_HIGH3 0x2d
> > +#define EMC141X_DEVICE_ID 0xfd
> > +#define EMC141X_MANUFACTURER_ID 0xfe
> > +#define EMC141X_REVISION 0xff
> > +
> > +static void emc141x_get_temperature(Object *obj, Visitor *v, const char *name,
> > + void *opaque, Error **errp)
>
> Nitpicking, align is off ;)
will fix ;)
>
> > +{
> > + EMC141XState *s = EMC141X(obj);
> > + EMC141XClass *sc = EMC141X_GET_CLASS(s);
> > + int64_t value;
> > + int tempid;
>
> Shouldn't it be unsigned?
yep， changed it to unsigned
>
> > +
> > + if (sscanf(name, "temperature%d", &tempid) != 1) {
>
> Format doesn't match. Using 'unsigned' is probably easier (%u).
>
> > + error_setg(errp, "error reading %s: %s", name, g_strerror(errno));
> > + return;
> > + }
> > +
> > + if (tempid >= sc->sensors_count || tempid < 0) {
> > + error_setg(errp, "error reading %s", name);
> > + return;
> > + }
> > +
> > + value = s->temperature[tempid] * 1000;
>
> This is not what is described in "Table 6.2: Temperature Data Format",
> there is an offset and a step multiplier.
The EMC1413/1414 has two selectable temperature ranges. we use the
default one 0 - 127.
as described in Table 7.2
Reg 00(TEMP_HIGH0) represents 0-127
Reg 29(TEMP_LOW0) represents 0 - 7/8(0.875)
I think we could care less about low-bit registers, and linux drivers
don't care either.
https://github.com/openbmc/linux/blob/dev-5.8/drivers/hwmon/emc1403.c#L43-L46
> Which makes me wonder how are you testing this?
I tested it under openbmc/linux.
1. with "aspeed: Add support for the g220a-bmc board" ，build the qemu
2. cd /sys/class/hwmon/hwmon2
3 cat temp1_input cat temp1_max cat temp2_input .... saw that all
values are expected.
> We have very simple tests for the TMP105, see tests/qtest/tmp105-test.c,
> please add a similar test.
will add the UT.
>
> > +
> > + visit_type_int(v, name, &value, errp);
> > +}
> > +
> ...
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-11-22 10:34 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-10-25 13:14 [PATCH v3 1/2] hw/misc: add an EMC141{3,4} device model John Wang
2020-10-25 13:14 ` [PATCH v3 2/2] aspeed: Add support for the g220a-bmc board John Wang
2020-10-25 21:08 ` [PATCH v3 1/2] hw/misc: add an EMC141{3,4} device model Philippe Mathieu-Daudé
2020-11-22 10:33 ` [Phishing Risk] [External] " John Wang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.