Commit 20b084c4 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/cminyard/tags/i2c-for-release-20190228' into staging 



This has been out there long enough, I need to get this in.

This was changed a little bit since my post on Feb 20 (to which
there were no comments) due to changes I had to work around:

Change b296b664 "smbus: Add a helper to generate SPD EEPROM
data" added a function to include/hw/i2c/smbus.h, which I had to move to
include/hw/smbus_eeprom.h.

There were some changes to hw/i2c/Makefile.objs that I had to fix up.

Beyond that, no changes.

Thanks,

-corey

# gpg: Signature made Thu 28 Feb 2019 18:05:49 GMT
# 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/i2c-for-release-20190228:
  i2c: Verify that the count passed in to smbus_eeprom_init() is valid
  i2c:smbus_eeprom: Add a reset function to smbus_eeprom
  i2c:smbus_eeprom: Add vmstate handling to the smbus eeprom
  i2c:smbus_eeprom: Add a size constant for the smbus_eeprom size
  i2c:smbus_eeprom: Add normal type name and cast to smbus_eeprom.c
  i2c:smbus_slave: Add an SMBus vmstate structure
  i2c:pm_smbus: Fix state transfer
  migration: Add a VMSTATE_BOOL_TEST() macro
  i2c:pm_smbus: Fix pm_smbus handling of I2C block read
  boards.h: Ignore migration for SMBus devices on older machines
  i2c:smbus: Make white space in switch statements consistent
  i2c:smbus_eeprom: Get rid of the quick command
  i2c:smbus: Simplify read handling
  i2c:smbus: Simplify write operation
  i2c:smbus: Correct the working of quick commands
  i2c: Don't check return value from i2c_recv()
  arm:i2c: Don't mask return from i2c_recv()
  i2c: have I2C receive operation return uint8_t
  i2c: Split smbus into parts

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents f0ce2e17 c203d451

MAINTAINERS

+12 −0
Original line number Diff line number Diff line
@@ -2192,6 +2192,18 @@ M: Viktor Prutyanov <viktor.prutyanov@phystech.edu> 
S: Maintained

F: contrib/elf2dmp/



I2C and SMBus

M: Corey Minyard <cminyard@mvista.com>

S: Maintained

F: hw/i2c/core.c

F: hw/i2c/smbus_slave.c

F: hw/i2c/smbus_master.c

F: hw/i2c/smbus_eeprom.c

F: include/hw/i2c/i2c.h

F: include/hw/i2c/smbus_master.h

F: include/hw/i2c/smbus_slave.h

F: include/hw/i2c/smbus_eeprom.h



Usermode Emulation

------------------

Overall

hw/acpi/piix4.c

+7 −0
Original line number Diff line number Diff line
@@ -302,6 +302,11 @@ static const VMStateDescription vmstate_cpuhp_state = { 
    }

};



static bool piix4_vmstate_need_smbus(void *opaque, int version_id)

{

    return pm_smbus_vmstate_needed();

}



/* qemu-kvm 1.2 uses version 3 but advertised as 2

 * To support incoming qemu-kvm 1.2 migration, change version_id

 * and minimum_version_id to 2 below (which breaks migration from
@@ -321,6 +326,8 @@ static const VMStateDescription vmstate_acpi = { 
        VMSTATE_UINT16(ar.pm1.evt.en, PIIX4PMState),

        VMSTATE_UINT16(ar.pm1.cnt.cnt, PIIX4PMState),

        VMSTATE_STRUCT(apm, PIIX4PMState, 0, vmstate_apm, APMState),

        VMSTATE_STRUCT_TEST(smb, PIIX4PMState, piix4_vmstate_need_smbus, 3,

                            pmsmb_vmstate, PMSMBus),

        VMSTATE_TIMER_PTR(ar.tmr.timer, PIIX4PMState),

        VMSTATE_INT64(ar.tmr.overflow_time, PIIX4PMState),

        VMSTATE_STRUCT(ar.gpe, PIIX4PMState, 2, vmstate_gpe, ACPIGPE),

hw/arm/aspeed.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include "hw/arm/aspeed.h"

#include "hw/arm/aspeed_soc.h"

#include "hw/boards.h"

#include "hw/i2c/smbus.h"

#include "hw/i2c/smbus_eeprom.h"

#include "qemu/log.h"

#include "sysemu/block-backend.h"

#include "hw/loader.h"

hw/arm/pxa2xx.c

+1 −1
Original line number Diff line number Diff line
@@ -1286,7 +1286,7 @@ static int pxa2xx_i2c_event(I2CSlave *i2c, enum i2c_event event) 
    return 0;

}



static int pxa2xx_i2c_rx(I2CSlave *i2c)

static uint8_t pxa2xx_i2c_rx(I2CSlave *i2c)

{

    PXA2xxI2CSlaveState *slave = PXA2XX_I2C_SLAVE(i2c);

    PXA2xxI2CState *s = slave->host;

hw/arm/stellaris.c

+1 −1
Original line number Diff line number Diff line
@@ -811,7 +811,7 @@ static void stellaris_i2c_write(void *opaque, hwaddr offset, 
            /* TODO: Handle errors.  */

            if (s->msa & 1) {

                /* Recv */

                s->mdr = i2c_recv(s->bus) & 0xff;

                s->mdr = i2c_recv(s->bus);

            } else {

                /* Send */

                i2c_send(s->bus, s->mdr);