[Qemu-commits] [qemu/qemu] 246f53: adc: Move the zynq-xadc file to the a

qemu-commits
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-commits] [qemu/qemu] 246f53: adc: Move the zynq-xadc file to the a

From:	Peter Maydell
Subject:	[Qemu-commits] [qemu/qemu] 246f53: adc: Move the zynq-xadc file to the adc directories
Date:	Tue, 06 Jul 2021 13:36:46 -0700
  Branch: refs/heads/staging
  Home:   https://github.com/qemu/qemu
  Commit: 246f530cdb5a93b5da6db2c2fb00549b4081d943
      
https://github.com/qemu/qemu/commit/246f530cdb5a93b5da6db2c2fb00549b4081d943
  Author: Corey Minyard <cminyard@mvista.com>
  Date:   2021-06-17 (Thu, 17 Jun 2021)

  Changed paths:
    M MAINTAINERS
    M hw/adc/meson.build
    A hw/adc/zynq-xadc.c
    M hw/arm/xilinx_zynq.c
    M hw/misc/meson.build
    R hw/misc/zynq-xadc.c
    A include/hw/adc/zynq-xadc.h
    R include/hw/misc/zynq-xadc.h

  Log Message:
  -----------
  adc: Move the zynq-xadc file to the adc directories

It's an ADC, put it where it belongs.

Cc: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Cc: Alistair Francis <alistair@alistair23.me>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>


  Commit: 58f3e3fe69a66a5c27675faf3e7afa52e027e621
      
https://github.com/qemu/qemu/commit/58f3e3fe69a66a5c27675faf3e7afa52e027e621
  Author: Corey Minyard <cminyard@mvista.com>
  Date:   2021-06-17 (Thu, 17 Jun 2021)

  Changed paths:
    M MAINTAINERS
    M hw/adc/Kconfig
    A hw/adc/max111x.c
    M hw/adc/meson.build
    M hw/arm/spitz.c
    M hw/misc/Kconfig
    R hw/misc/max111x.c
    M hw/misc/meson.build
    A include/hw/adc/max111x.h
    R include/hw/misc/max111x.h

  Log Message:
  -----------
  adc: Move the max111x driver to the adc directory

It's an adc, put it where it belongs.

Cc: Andrzej Zaborowski <balrogg@gmail.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: qemu-arm@nongnu.org
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


  Commit: 5e9ae4b1a31a17a72487372067a78b6afa68b68d
      
https://github.com/qemu/qemu/commit/5e9ae4b1a31a17a72487372067a78b6afa68b68d
  Author: Corey Minyard <cminyard@mvista.com>
  Date:   2021-06-17 (Thu, 17 Jun 2021)

  Changed paths:
    M hw/Kconfig
    M hw/arm/aspeed.c
    M hw/arm/nseries.c
    M hw/meson.build
    M hw/misc/Kconfig
    R hw/misc/emc141x.c
    M hw/misc/meson.build
    R hw/misc/tmp105.c
    R hw/misc/tmp105.h
    R hw/misc/tmp421.c
    A hw/sensor/Kconfig
    A hw/sensor/emc141x.c
    A hw/sensor/meson.build
    A hw/sensor/tmp105.c
    A hw/sensor/tmp421.c
    R include/hw/misc/emc141x_regs.h
    R include/hw/misc/tmp105_regs.h
    A include/hw/sensor/emc141x_regs.h
    A include/hw/sensor/tmp105.h
    A include/hw/sensor/tmp105_regs.h
    M tests/qtest/emc141x-test.c
    M tests/qtest/npcm7xx_smbus-test.c
    M tests/qtest/tmp105-test.c

  Log Message:
  -----------
  sensor: Move hardware sensors from misc to a sensor directory

Lots of this are expected to be coming in, create a directory for them.

Also move the tmp105.h file into the include directory where it
should be.

Cc: Cédric Le Goater <clg@kaod.org>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Andrew Jeffery <andrew@aj.id.au>
Cc: Joel Stanley <joel@jms.id.au>
Cc: Andrzej Zaborowski <balrogg@gmail.com>
Cc: qemu-arm@nongnu.org
Signed-off-by: Corey Minyard <cminyard@mvista.com>
Acked-by: Cédric Le Goater <clg@kaod.org>


  Commit: 0c95ddedceca6a34701fa13e0c5f359e14a1f78e
      
https://github.com/qemu/qemu/commit/0c95ddedceca6a34701fa13e0c5f359e14a1f78e
  Author: Titus Rwantare <titusr@google.com>
  Date:   2021-06-17 (Thu, 17 Jun 2021)

  Changed paths:
    M hw/arm/Kconfig
    M hw/i2c/Kconfig
    M hw/i2c/meson.build
    A hw/i2c/pmbus_device.c
    A include/hw/i2c/pmbus_device.h

  Log Message:
  -----------
  hw/i2c: add support for PMBus

QEMU has support for SMBus devices, and PMBus is a more specific
implementation of SMBus. The additions made in this commit makes it easier to
add new PMBus devices to QEMU.

https://pmbus.org/specification-archives/

Reviewed-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Hao Wu <wuhaotsh@google.com>
Signed-off-by: Titus Rwantare <titusr@google.com>
Message-Id: <20210519165002.1195745-2-titusr@google.com>
Signed-off-by: Corey Minyard <cminyard@mvista.com>


  Commit: 066e49a52da0940f991fda18e261e986f925dd11
      
https://github.com/qemu/qemu/commit/066e49a52da0940f991fda18e261e986f925dd11
  Author: Titus Rwantare <titusr@google.com>
  Date:   2021-06-17 (Thu, 17 Jun 2021)

  Changed paths:
    M hw/arm/Kconfig
    M hw/sensor/Kconfig
    A hw/sensor/adm1272.c
    M hw/sensor/meson.build

  Log Message:
  -----------
  hw/sensor: add ADM1272 device

The ADM1272 is a PMBus compliant Hot Swap Controller and Digital Power
Monitor by Analog Devices.

This commit adds support for interfacing with it, and support for
setting and monitoring sensor limits.

Datasheet: 
https://www.analog.com/media/en/technical-documentation/data-sheets/ADM1272.pdf

Reviewed-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Hao Wu <wuhaotsh@google.com>
Signed-off-by: Titus Rwantare <titusr@google.com>
Message-Id: <20210519165002.1195745-3-titusr@google.com>
[Moved the file to the sensor directory]
[Remove the trace.h include, it wasn't necessary and broke the compile.]
Signed-off-by: Corey Minyard <cminyard@mvista.com>


  Commit: a3988376cc647e799ed50abd4116f4179f930687
      
https://github.com/qemu/qemu/commit/a3988376cc647e799ed50abd4116f4179f930687
  Author: Titus Rwantare <titusr@google.com>
  Date:   2021-06-17 (Thu, 17 Jun 2021)

  Changed paths:
    A tests/qtest/adm1272-test.c
    M tests/qtest/meson.build

  Log Message:
  -----------
  tests/qtest: add tests for ADM1272 device model

Signed-off-by: Titus Rwantare <titusr@google.com>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Message-Id: <20210519165002.1195745-4-titusr@google.com>
Signed-off-by: Corey Minyard <cminyard@mvista.com>


  Commit: 0c3999da3ce0238cb7e8739c5b980dd6b4cf52bd
      
https://github.com/qemu/qemu/commit/0c3999da3ce0238cb7e8739c5b980dd6b4cf52bd
  Author: Titus Rwantare <titusr@google.com>
  Date:   2021-06-17 (Thu, 17 Jun 2021)

  Changed paths:
    M hw/arm/Kconfig
    M hw/sensor/Kconfig
    A hw/sensor/max34451.c
    M hw/sensor/meson.build

  Log Message:
  -----------
  hw/sensor: add MAX34451 device

The MAX34451 is a Maxim power-supply system manager that can monitor up to 16 
voltage rails or currents. It also contains a temperature sensor and supports 
up to four external temperature sensors.

This commit adds support for interfacing with it, and setting limits on the 
supported sensors.

Reviewed-by: Joel Stanley <joel@jms.id.au>
Reviewed-by: Hao Wu <wuhaotsh@google.com>
Signed-off-by: Titus Rwantare <titusr@google.com>
[Moved the file to the sensor directory]
Signed-off-by: Corey Minyard <cminyard@mvista.com>


  Commit: e3830ebbef35175891511349f44884487b93e235
      
https://github.com/qemu/qemu/commit/e3830ebbef35175891511349f44884487b93e235
  Author: Titus Rwantare <titusr@google.com>
  Date:   2021-06-17 (Thu, 17 Jun 2021)

  Changed paths:
    A tests/qtest/max34451-test.c
    M tests/qtest/meson.build

  Log Message:
  -----------
  tests/qtest: add tests for MAX34451 device model

Signed-off-by: Titus Rwantare <titusr@google.com>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Corey Minyard <cminyard@mvista.com>


  Commit: 9de5a5ff495df93d506c58e443f5c11ae90313de
      
https://github.com/qemu/qemu/commit/9de5a5ff495df93d506c58e443f5c11ae90313de
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-06-17 (Thu, 17 Jun 2021)

  Changed paths:
    M MAINTAINERS
    M hw/arm/nseries.c
    M hw/input/lm832x.c
    M include/hw/i2c/i2c.h
    A include/hw/input/lm832x.h

  Log Message:
  -----------
  hw/input/lm832x: Move lm832x_key_event() declaration to "lm832x.h"

lm832x_key_event() is specific go LM832x devices, not to the
I2C bus API. Move it out of "i2c.h" to a new header.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Corey Minyard <cminyard@mvista.com>


  Commit: a16d0054a781243dba37e3e92a0c98977b2dc5ee
      
https://github.com/qemu/qemu/commit/a16d0054a781243dba37e3e92a0c98977b2dc5ee
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-06-17 (Thu, 17 Jun 2021)

  Changed paths:
    M hw/arm/nseries.c
    M hw/input/lm832x.c
    M include/hw/input/lm832x.h

  Log Message:
  -----------
  hw/input/lm832x: Define TYPE_LM8323 in public header

Define TYPE_LM8323 in the public "hw/input/lm832x.h"
header and use it in hw/arm/nseries.c.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Corey Minyard <cminyard@mvista.com>


  Commit: 0cb608076f1ec04836e012596e93076ec802fb0a
      
https://github.com/qemu/qemu/commit/0cb608076f1ec04836e012596e93076ec802fb0a
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-06-17 (Thu, 17 Jun 2021)

  Changed paths:
    M hw/display/sm501.c

  Log Message:
  -----------
  hw/display/sm501: Simplify sm501_i2c_write() logic

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Corey Minyard <cminyard@mvista.com>
Reviewed-by: BALATON Zoltan <balaton@eik.bme.hu>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Corey Minyard <cminyard@mvista.com>


  Commit: 64b1bae231f087223d1766c606faf93fd4615d71
      
https://github.com/qemu/qemu/commit/64b1bae231f087223d1766c606faf93fd4615d71
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-06-17 (Thu, 17 Jun 2021)

  Changed paths:
    M hw/display/sm501.c

  Log Message:
  -----------
  hw/display/sm501: Replace i2c_send_recv() by i2c_recv() & i2c_send()

Instead of using the confuse i2c_send_recv(), rewrite to directly
call i2c_recv() & i2c_send(), resulting in code easier to review.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Corey Minyard <cminyard@mvista.com>


  Commit: 9d25b3c1a719b9b91de1fcf39e4cc417f1297d28
      
https://github.com/qemu/qemu/commit/9d25b3c1a719b9b91de1fcf39e4cc417f1297d28
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-06-17 (Thu, 17 Jun 2021)

  Changed paths:
    M hw/i2c/ppc4xx_i2c.c

  Log Message:
  -----------
  hw/i2c/ppc4xx_i2c: Add reference to datasheet

It took me a while to find this model datasheet, since it is
an OCR scan. Add a reference to save other developers time.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Corey Minyard <cminyard@mvista.com>


  Commit: c79976fe03ab5dd9d174bff513e4826383a247e2
      
https://github.com/qemu/qemu/commit/c79976fe03ab5dd9d174bff513e4826383a247e2
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-06-17 (Thu, 17 Jun 2021)

  Changed paths:
    M hw/i2c/ppc4xx_i2c.c

  Log Message:
  -----------
  hw/i2c/ppc4xx_i2c: Replace i2c_send_recv() by i2c_recv() & i2c_send()

Instead of using the confuse i2c_send_recv(), rewrite to directly
call i2c_recv() & i2c_send(), resulting in code easier to review.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Corey Minyard <cminyard@mvista.com>


  Commit: 068335f2141b9bb4d6259db158b3a61261771fc7
      
https://github.com/qemu/qemu/commit/068335f2141b9bb4d6259db158b3a61261771fc7
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-06-17 (Thu, 17 Jun 2021)

  Changed paths:
    M hw/misc/auxbus.c

  Log Message:
  -----------
  hw/misc/auxbus: Fix MOT/classic I2C mode

Since its introduction in commit 6fc7f77fd2 i2c_start_transfer()
uses incorrectly the direction of the transfer (the last argument
is called 'is_recv'). Fix by inverting the argument, we now have
is_recv = !is_write.

Fixes: 6fc7f77fd2 ("introduce aux-bus")
Reported-by: BALATON Zoltan <balaton@eik.bme.hu>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Corey Minyard <cminyard@mvista.com>


  Commit: ab9f59f05751a5193b88bc2674fd757b214715dc
      
https://github.com/qemu/qemu/commit/ab9f59f05751a5193b88bc2674fd757b214715dc
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-06-17 (Thu, 17 Jun 2021)

  Changed paths:
    M hw/misc/auxbus.c

  Log Message:
  -----------
  hw/misc/auxbus: Explode READ_I2C / WRITE_I2C_MOT cases

To allow further simplifications in the following commits,
start copying WRITE_I2C code to the READ_I2C, and READ_I2C_MOT
to WRITE_I2C_MOT. No logical change.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Corey Minyard <cminyard@mvista.com>


  Commit: b557df1468d21c6a6d084461c487ee0d028ecd80
      
https://github.com/qemu/qemu/commit/b557df1468d21c6a6d084461c487ee0d028ecd80
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-06-17 (Thu, 17 Jun 2021)

  Changed paths:
    M hw/misc/auxbus.c

  Log Message:
  -----------
  hw/misc/auxbus: Replace 'is_write' boolean by its value

Remove the 'is_write' boolean by directly using its value in place.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Corey Minyard <cminyard@mvista.com>


  Commit: 286d9ab18e835ed3e3ba3070f23ab9afdc68a4f9
      
https://github.com/qemu/qemu/commit/286d9ab18e835ed3e3ba3070f23ab9afdc68a4f9
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-06-17 (Thu, 17 Jun 2021)

  Changed paths:
    M hw/misc/auxbus.c

  Log Message:
  -----------
  hw/misc/auxbus: Replace i2c_send_recv() by i2c_recv() & i2c_send()

Instead of using the confuse i2c_send_recv(), replace
  i2c_send_recv(send = true) by i2c_send() and
  i2c_send_recv(send = false) by i2c_recv().
During the replacement we also change a while() statement by for().
The resulting code is easier to review.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Corey Minyard <cminyard@mvista.com>


  Commit: 5e5c671abbc48ff19bcfee89ac3c4b626e230264
      
https://github.com/qemu/qemu/commit/5e5c671abbc48ff19bcfee89ac3c4b626e230264
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-06-17 (Thu, 17 Jun 2021)

  Changed paths:
    M hw/i2c/core.c
    M include/hw/i2c/i2c.h

  Log Message:
  -----------
  hw/i2c: Remove confusing i2c_send_recv()

We replaced all the i2c_send_recv() calls by the clearer i2c_recv()
and i2c_send(), so we can remove this confusing API.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Corey Minyard <cminyard@mvista.com>


  Commit: ee268e42bd1dcfe2150da040a603cd3bc3a7dbba
      
https://github.com/qemu/qemu/commit/ee268e42bd1dcfe2150da040a603cd3bc3a7dbba
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-06-17 (Thu, 17 Jun 2021)

  Changed paths:
    M hw/arm/pxa2xx.c
    M hw/arm/spitz.c
    M hw/display/ati.c
    M hw/display/sm501.c
    M hw/display/xlnx_dp.c
    M hw/i2c/core.c
    M hw/i2c/imx_i2c.c
    M include/hw/i2c/i2c.h

  Log Message:
  -----------
  hw/i2c: Rename i2c_set_slave_address() -> i2c_slave_set_address()

Other functions from I2C slave API are named "i2c_slave_XXX()".
Follow that pattern with set_address(). Add docstring along.
No logical change.

Patch created mechanically using:

  $ sed -i s/i2c_set_slave_address/i2c_slave_set_address/ \
    $(git grep -l i2c_set_slave_address)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Corey Minyard <cminyard@mvista.com>


  Commit: ca8201fa67a85862a73ad6180f8abd8de1b8b71a
      
https://github.com/qemu/qemu/commit/ca8201fa67a85862a73ad6180f8abd8de1b8b71a
  Author: BALATON Zoltan <balaton@eik.bme.hu>
  Date:   2021-06-17 (Thu, 17 Jun 2021)

  Changed paths:
    M hw/i2c/core.c
    M include/hw/i2c/i2c.h

  Log Message:
  -----------
  hw/i2c: Make i2c_start_transfer() direction argument a boolean

Make the argument representing the direction of the transfer a
boolean type.
Rename the boolean argument as 'is_recv' to match i2c_recv_send().
Document the function prototype.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Message-Id: <20200621145235.9E241745712@zero.eik.bme.hu>
[PMD: Split patch, added docstring]
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Acked-by: Corey Minyard <cminyard@mvista.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Corey Minyard <cminyard@mvista.com>


  Commit: d5c3939676e5a73a007b3187e5bafdda2628a7d1
      
https://github.com/qemu/qemu/commit/d5c3939676e5a73a007b3187e5bafdda2628a7d1
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-06-17 (Thu, 17 Jun 2021)

  Changed paths:
    M hw/i2c/core.c

  Log Message:
  -----------
  hw/i2c: Extract i2c_do_start_transfer() from i2c_start_transfer()

To allow further simplications, extract i2c_do_start_transfer()
from i2c_start_transfer(). This is mostly the same function,
but the former is static and takes an enum argument.

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Corey Minyard <cminyard@mvista.com>


  Commit: 71b94465192fd4df6c8ab83c901839220cd7c8d4
      
https://github.com/qemu/qemu/commit/71b94465192fd4df6c8ab83c901839220cd7c8d4
  Author: Philippe Mathieu-Daudé <f4bug@amsat.org>
  Date:   2021-06-17 (Thu, 17 Jun 2021)

  Changed paths:
    M hw/i2c/core.c
    M hw/i2c/pm_smbus.c
    M hw/i2c/smbus_master.c
    M hw/misc/auxbus.c
    M include/hw/i2c/i2c.h

  Log Message:
  -----------
  hw/i2c: Introduce i2c_start_recv() and i2c_start_send()

To ease reviewing code using the I2C bus API, introduce the
i2c_start_recv() and i2c_start_send() helpers which don't
take the confusing 'is_recv' boolean argument.

Use these new helpers in the SMBus / AUX bus models.

Suggested-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Corey Minyard <cminyard@mvista.com>


  Commit: 7051d605e6b03259e0185dd574f760b93d15fa10
      
https://github.com/qemu/qemu/commit/7051d605e6b03259e0185dd574f760b93d15fa10
  Author: Jinhua Cao <caojinhua1@huawei.com>
  Date:   2021-06-25 (Fri, 25 Jun 2021)

  Changed paths:
    M hw/ipmi/ipmi_bmc_sim.c

  Log Message:
  -----------
  ipmi/sim: fix watchdog_expired data type error in IPMIBmcSim struct

1) watchdog_expired is set bool which value could only be 0 or 1,
but watchdog_expired every bit mean different Timer Use.

2) Use the command  -ipmitool mc get watchdog-  to query
ipmi-watchdog status in guest.
...
[root@localhost ~]# ipmitool mc watchdog get
Watchdog Timer Use:     SMS/OS (0x44)
Watchdog Timer Is:      Started/Running
Watchdog Timer Actions: Hard Reset (0x01)
Pre-timeout interval:   0 seconds
Timer Expiration Flags: 0x00
Initial Countdown:      60 sec
Present Countdown:      57 sec
...
bool for watchdog_expired results -Timer Expiration Flags- always
be 0x00 or 0x01, but the -Timer Expiration Flags- indicts the Timer Use
after timeout. So change watchdog_expired data type from bool to uint8_t
to fix this problem.

Signed-off-by: Jinhua Cao <caojinhua1@huawei.com>
Message-Id: <20210625021232.73614-1-caojinhua1@huawei.com>
[I checked, a bool and uint8 are the same size for the vmstate transfer,
 so this should be fine.]
Signed-off-by: Corey Minyard <cminyard@mvista.com>


  Commit: 067b1a46d16b8cfcec1dcf9146b192ff02337387
      
https://github.com/qemu/qemu/commit/067b1a46d16b8cfcec1dcf9146b192ff02337387
  Author: Peter Maydell <peter.maydell@linaro.org>
  Date:   2021-07-06 (Tue, 06 Jul 2021)

  Changed paths:
    M MAINTAINERS
    M hw/Kconfig
    M hw/adc/Kconfig
    A hw/adc/max111x.c
    M hw/adc/meson.build
    A hw/adc/zynq-xadc.c
    M hw/arm/Kconfig
    M hw/arm/aspeed.c
    M hw/arm/nseries.c
    M hw/arm/pxa2xx.c
    M hw/arm/spitz.c
    M hw/arm/xilinx_zynq.c
    M hw/display/ati.c
    M hw/display/sm501.c
    M hw/display/xlnx_dp.c
    M hw/i2c/Kconfig
    M hw/i2c/core.c
    M hw/i2c/imx_i2c.c
    M hw/i2c/meson.build
    M hw/i2c/pm_smbus.c
    A hw/i2c/pmbus_device.c
    M hw/i2c/ppc4xx_i2c.c
    M hw/i2c/smbus_master.c
    M hw/input/lm832x.c
    M hw/ipmi/ipmi_bmc_sim.c
    M hw/meson.build
    M hw/misc/Kconfig
    M hw/misc/auxbus.c
    R hw/misc/emc141x.c
    R hw/misc/max111x.c
    M hw/misc/meson.build
    R hw/misc/tmp105.c
    R hw/misc/tmp105.h
    R hw/misc/tmp421.c
    R hw/misc/zynq-xadc.c
    A hw/sensor/Kconfig
    A hw/sensor/adm1272.c
    A hw/sensor/emc141x.c
    A hw/sensor/max34451.c
    A hw/sensor/meson.build
    A hw/sensor/tmp105.c
    A hw/sensor/tmp421.c
    A include/hw/adc/max111x.h
    A include/hw/adc/zynq-xadc.h
    M include/hw/i2c/i2c.h
    A include/hw/i2c/pmbus_device.h
    A include/hw/input/lm832x.h
    R include/hw/misc/emc141x_regs.h
    R include/hw/misc/max111x.h
    R include/hw/misc/tmp105_regs.h
    R include/hw/misc/zynq-xadc.h
    A include/hw/sensor/emc141x_regs.h
    A include/hw/sensor/tmp105.h
    A include/hw/sensor/tmp105_regs.h
    A tests/qtest/adm1272-test.c
    M tests/qtest/emc141x-test.c
    A tests/qtest/max34451-test.c
    M tests/qtest/meson.build
    M tests/qtest/npcm7xx_smbus-test.c
    M tests/qtest/tmp105-test.c

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/cminyard/tags/for-qemu-6.1-1' into 
staging

Some qemu updates for IPMI and I2C

Move some ADC file to where they belong and move some sensors to a
sensor directory, since with new BMCs coming in lots of different
sensors should be coming in.  Keep from cluttering things up.

Add support for I2C PMBus devices.

Replace the confusing and error-prone i2c_send_recv and i2c_transfer with
specific send and receive functions.  Several errors have already been
made with these, avoid any new errors.

Fix the watchdog_expired field in the IPMI watchdog, it's not a bool,
it's a u8.  After a vmstate transfer, the new value could be wrong.

# gpg: Signature made Tue 06 Jul 2021 21:05:02 BST
# gpg:                using RSA key FD0D5CE67CE0F59A6688268661F38C90919BFF81
# gpg: Good signature from "Corey Minyard <cminyard@mvista.com>" [unknown]
# gpg:                 aka "Corey Minyard <minyard@acm.org>" [unknown]
# gpg:                 aka "Corey Minyard <corey@minyard.net>" [unknown]
# gpg:                 aka "Corey Minyard <minyard@mvista.com>" [unknown]
# 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: FD0D 5CE6 7CE0 F59A 6688  2686 61F3 8C90 919B FF81

* remotes/cminyard/tags/for-qemu-6.1-1: (24 commits)
  ipmi/sim: fix watchdog_expired data type error in IPMIBmcSim struct
  hw/i2c: Introduce i2c_start_recv() and i2c_start_send()
  hw/i2c: Extract i2c_do_start_transfer() from i2c_start_transfer()
  hw/i2c: Make i2c_start_transfer() direction argument a boolean
  hw/i2c: Rename i2c_set_slave_address() -> i2c_slave_set_address()
  hw/i2c: Remove confusing i2c_send_recv()
  hw/misc/auxbus: Replace i2c_send_recv() by i2c_recv() & i2c_send()
  hw/misc/auxbus: Replace 'is_write' boolean by its value
  hw/misc/auxbus: Explode READ_I2C / WRITE_I2C_MOT cases
  hw/misc/auxbus: Fix MOT/classic I2C mode
  hw/i2c/ppc4xx_i2c: Replace i2c_send_recv() by i2c_recv() & i2c_send()
  hw/i2c/ppc4xx_i2c: Add reference to datasheet
  hw/display/sm501: Replace i2c_send_recv() by i2c_recv() & i2c_send()
  hw/display/sm501: Simplify sm501_i2c_write() logic
  hw/input/lm832x: Define TYPE_LM8323 in public header
  hw/input/lm832x: Move lm832x_key_event() declaration to "lm832x.h"
  tests/qtest: add tests for MAX34451 device model
  hw/sensor: add MAX34451 device
  tests/qtest: add tests for ADM1272 device model
  hw/sensor: add ADM1272 device
  ...

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Compare: https://github.com/qemu/qemu/compare/9aef0954195c...067b1a46d16b
[Prev in Thread]
Current Thread
[Next in Thread]
[Qemu-commits] [qemu/qemu] 246f53: adc: Move the zynq-xadc file to the adc directories, Peter Maydell <=
- [Qemu-commits] [qemu/qemu] 246f53: adc: Move the zynq-xadc file to the adc directories, Peter Maydell, 2021/07/11
- [Qemu-commits] [qemu/qemu] 246f53: adc: Move the zynq-xadc file to the adc directories, Peter Maydell, 2021/07/11
Prev by Date: [Qemu-commits] [qemu/qemu] bc0543: Makefile: Remove /usr/bin/env wrapper from the SHE...
Next by Date: [Qemu-commits] [qemu/qemu] 3909c0: virtio: disable ioeventfd for record/replay
Previous by thread: [Qemu-commits] [qemu/qemu] bc0543: Makefile: Remove /usr/bin/env wrapper from the SHE...
Next by thread: [Qemu-commits] [qemu/qemu] 246f53: adc: Move the zynq-xadc file to the adc directories
Index(es):
- Date
- Thread