Commit e499ff07 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/queue/misc-pull-request' into staging 



# gpg: Signature made Fri 23 Jun 2017 13:48:04 BST
# gpg:                using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/queue/misc-pull-request:
  applesmc: fix port i/o access width
  applesmc: implement error status port
  applesmc: cosmetic whitespace and indentation cleanup

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents e47ec1a9 1b8274d4

hw/misc/applesmc.c

+151 −60
Original line number Diff line number Diff line
@@ -39,16 +39,38 @@ 
/* #define DEBUG_SMC */



#define APPLESMC_DEFAULT_IOBASE        0x300

/* data port used by Apple SMC */

#define APPLESMC_DATA_PORT             0x0

/* command/status port used by Apple SMC */

#define APPLESMC_CMD_PORT              0x4

#define APPLESMC_NR_PORTS              32



#define APPLESMC_READ_CMD              0x10

#define APPLESMC_WRITE_CMD             0x11

#define APPLESMC_GET_KEY_BY_INDEX_CMD  0x12

#define APPLESMC_GET_KEY_TYPE_CMD      0x13

enum {

    APPLESMC_DATA_PORT               = 0x00,

    APPLESMC_CMD_PORT                = 0x04,

    APPLESMC_ERR_PORT                = 0x1e,

    APPLESMC_NUM_PORTS               = 0x20,

};



enum {

    APPLESMC_READ_CMD                = 0x10,

    APPLESMC_WRITE_CMD               = 0x11,

    APPLESMC_GET_KEY_BY_INDEX_CMD    = 0x12,

    APPLESMC_GET_KEY_TYPE_CMD        = 0x13,

};



enum {

    APPLESMC_ST_CMD_DONE             = 0x00,

    APPLESMC_ST_DATA_READY           = 0x01,

    APPLESMC_ST_BUSY                 = 0x02,

    APPLESMC_ST_ACK                  = 0x04,

    APPLESMC_ST_NEW_CMD              = 0x08,

};



enum {

    APPLESMC_ST_1E_CMD_INTRUPTED     = 0x80,

    APPLESMC_ST_1E_STILL_BAD_CMD     = 0x81,

    APPLESMC_ST_1E_BAD_CMD           = 0x82,

    APPLESMC_ST_1E_NOEXIST           = 0x84,

    APPLESMC_ST_1E_WRITEONLY         = 0x85,

    APPLESMC_ST_1E_READONLY          = 0x86,

    APPLESMC_ST_1E_BAD_INDEX         = 0xb8,

};



#ifdef DEBUG_SMC

#define smc_debug(...) fprintf(stderr, "AppleSMC: " __VA_ARGS__)
@@ -74,15 +96,17 @@ struct AppleSMCState { 


    MemoryRegion io_data;

    MemoryRegion io_cmd;

    MemoryRegion io_err;

    uint32_t iobase;

    uint8_t cmd;

    uint8_t status;

    uint8_t key[4];

    uint8_t status_1e;

    uint8_t last_ret;

    char key[4];

    uint8_t read_pos;

    uint8_t data_len;

    uint8_t data_pos;

    uint8_t data[255];

    uint8_t charactic[4];

    char *osk;

    QLIST_HEAD(, AppleSMCData) data_def;

};
@@ -91,89 +115,138 @@ static void applesmc_io_cmd_write(void *opaque, hwaddr addr, uint64_t val, 
                                  unsigned size)

{

    AppleSMCState *s = opaque;

    uint8_t status = s->status & 0x0f;



    smc_debug("CMD Write B: %#x = %#x\n", addr, val);

    smc_debug("CMD received: 0x%02x\n", (uint8_t)val);

    switch (val) {

    case APPLESMC_READ_CMD:

            s->status = 0x0c;

        /* did last command run through OK? */

        if (status == APPLESMC_ST_CMD_DONE || status == APPLESMC_ST_NEW_CMD) {

            s->cmd = val;

            s->status = APPLESMC_ST_NEW_CMD | APPLESMC_ST_ACK;

        } else {

            smc_debug("ERROR: previous command interrupted!\n");

            s->status = APPLESMC_ST_NEW_CMD;

            s->status_1e = APPLESMC_ST_1E_CMD_INTRUPTED;

        }

        break;

    default:

        smc_debug("UNEXPECTED CMD 0x%02x\n", (uint8_t)val);

        s->status = APPLESMC_ST_NEW_CMD;

        s->status_1e = APPLESMC_ST_1E_BAD_CMD;

    }

    s->cmd = val;

    s->read_pos = 0;

    s->data_pos = 0;

}



static void applesmc_fill_data(AppleSMCState *s)

static struct AppleSMCData *applesmc_find_key(AppleSMCState *s)

{

    struct AppleSMCData *d;



    QLIST_FOREACH(d, &s->data_def, node) {

        if (!memcmp(d->key, s->key, 4)) {

            smc_debug("Key matched (%s Len=%d Data=%s)\n", d->key,

                      d->len, d->data);

            memcpy(s->data, d->data, d->len);

            return;

            return d;

        }

    }

    return NULL;

}



static void applesmc_io_data_write(void *opaque, hwaddr addr, uint64_t val,

                                   unsigned size)

{

    AppleSMCState *s = opaque;

    struct AppleSMCData *d;



    smc_debug("DATA Write B: %#x = %#x\n", addr, val);

    smc_debug("DATA received: 0x%02x\n", (uint8_t)val);

    switch (s->cmd) {

    case APPLESMC_READ_CMD:

        if ((s->status & 0x0f) == APPLESMC_ST_CMD_DONE) {

            break;

        }

        if (s->read_pos < 4) {

            s->key[s->read_pos] = val;

                s->status = 0x04;

            s->status = APPLESMC_ST_ACK;

        } else if (s->read_pos == 4) {

                s->data_len = val;

                s->status = 0x05;

            d = applesmc_find_key(s);

            if (d != NULL) {

                memcpy(s->data, d->data, d->len);

                s->data_len = d->len;

                s->data_pos = 0;

                smc_debug("Key = %c%c%c%c Len = %d\n", s->key[0],

                          s->key[1], s->key[2], s->key[3], val);

                applesmc_fill_data(s);

                s->status = APPLESMC_ST_ACK | APPLESMC_ST_DATA_READY;

                s->status_1e = APPLESMC_ST_CMD_DONE;  /* clear on valid key */

            } else {

                smc_debug("READ_CMD: key '%c%c%c%c' not found!\n",

                          s->key[0], s->key[1], s->key[2], s->key[3]);

                s->status = APPLESMC_ST_CMD_DONE;

                s->status_1e = APPLESMC_ST_1E_NOEXIST;

            }

        }

        s->read_pos++;

        break;

    default:

        s->status = APPLESMC_ST_CMD_DONE;

        s->status_1e = APPLESMC_ST_1E_STILL_BAD_CMD;

    }

}



static uint64_t applesmc_io_data_read(void *opaque, hwaddr addr1,

static void applesmc_io_err_write(void *opaque, hwaddr addr, uint64_t val,

                                  unsigned size)

{

    smc_debug("ERR_CODE received: 0x%02x, ignoring!\n", (uint8_t)val);

    /* NOTE: writing to the error port not supported! */

}



static uint64_t applesmc_io_data_read(void *opaque, hwaddr addr, unsigned size)

{

    AppleSMCState *s = opaque;

    uint8_t retval = 0;



    switch (s->cmd) {

    case APPLESMC_READ_CMD:

        if (!(s->status & APPLESMC_ST_DATA_READY)) {

            break;

        }

        if (s->data_pos < s->data_len) {

                retval = s->data[s->data_pos];

                smc_debug("READ_DATA[%d] = %#hhx\n", s->data_pos,

                          retval);

            s->last_ret = s->data[s->data_pos];

            smc_debug("READ '%c%c%c%c'[%d] = %02x\n",

                      s->key[0], s->key[1], s->key[2], s->key[3],

                      s->data_pos, s->last_ret);

            s->data_pos++;

            if (s->data_pos == s->data_len) {

                    s->status = 0x00;

                    smc_debug("EOF\n");

                } else

                    s->status = 0x05;

                s->status = APPLESMC_ST_CMD_DONE;

                smc_debug("READ '%c%c%c%c' Len=%d complete!\n",

                          s->key[0], s->key[1], s->key[2], s->key[3],

                          s->data_len);

            } else {

                s->status = APPLESMC_ST_ACK | APPLESMC_ST_DATA_READY;

            }

        }

    smc_debug("DATA Read b: %#x = %#x\n", addr1, retval);

        break;

    default:

        s->status = APPLESMC_ST_CMD_DONE;

        s->status_1e = APPLESMC_ST_1E_STILL_BAD_CMD;

    }

    smc_debug("DATA sent: 0x%02x\n", s->last_ret);



    return retval;

    return s->last_ret;

}



static uint64_t applesmc_io_cmd_read(void *opaque, hwaddr addr1, unsigned size)

static uint64_t applesmc_io_cmd_read(void *opaque, hwaddr addr, unsigned size)

{

    AppleSMCState *s = opaque;



    smc_debug("CMD Read B: %#x\n", addr1);

    smc_debug("CMD sent: 0x%02x\n", s->status);

    return s->status;

}



static uint64_t applesmc_io_err_read(void *opaque, hwaddr addr, unsigned size)

{

    AppleSMCState *s = opaque;



    /* NOTE: read does not clear the 1e status */

    smc_debug("ERR_CODE sent: 0x%02x\n", s->status_1e);

    return s->status_1e;

}



static void applesmc_add_key(AppleSMCState *s, const char *key,

                             int len, const char *data)

{
@@ -196,6 +269,9 @@ static void qdev_applesmc_isa_reset(DeviceState *dev) 
    QLIST_FOREACH_SAFE(d, &s->data_def, node, next) {

        QLIST_REMOVE(d, node);

    }

    s->status = 0x00;

    s->status_1e = 0x00;

    s->last_ret = 0x00;



    applesmc_add_key(s, "REV ", 6, "\x01\x13\x0f\x00\x00\x03");

    applesmc_add_key(s, "OSK0", 32, s->osk);
@@ -225,20 +301,35 @@ static const MemoryRegionOps applesmc_cmd_io_ops = { 
    },

};



static const MemoryRegionOps applesmc_err_io_ops = {

    .write = applesmc_io_err_write,

    .read = applesmc_io_err_read,

    .endianness = DEVICE_NATIVE_ENDIAN,

    .impl = {

        .min_access_size = 1,

        .max_access_size = 1,

    },

};



static void applesmc_isa_realize(DeviceState *dev, Error **errp)

{

    AppleSMCState *s = APPLE_SMC(dev);



    memory_region_init_io(&s->io_data, OBJECT(s), &applesmc_data_io_ops, s,

                          "applesmc-data", 4);

                          "applesmc-data", 1);

    isa_register_ioport(&s->parent_obj, &s->io_data,

                        s->iobase + APPLESMC_DATA_PORT);



    memory_region_init_io(&s->io_cmd, OBJECT(s), &applesmc_cmd_io_ops, s,

                          "applesmc-cmd", 4);

                          "applesmc-cmd", 1);

    isa_register_ioport(&s->parent_obj, &s->io_cmd,

                        s->iobase + APPLESMC_CMD_PORT);



    memory_region_init_io(&s->io_err, OBJECT(s), &applesmc_err_io_ops, s,

                          "applesmc-err", 1);

    isa_register_ioport(&s->parent_obj, &s->io_err,

                        s->iobase + APPLESMC_ERR_PORT);



    if (!s->osk || (strlen(s->osk) != 64)) {

        fprintf(stderr, "WARNING: Using AppleSMC with invalid key\n");

        s->osk = default_osk;