Commit a6900601 authored by Anthony Liguori's avatar Anthony Liguori
Browse files

Merge remote-tracking branch 'mst/tags/for_anthony' into staging 



virtio,vhost,pci,e1000

Mostly bugfixes, but also some ICH work by Laszlo.

Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>

# gpg: Signature made Thu 28 Feb 2013 07:13:56 AM CST using RSA key ID D28D5469
# gpg: Can't check signature: public key not found

# By Michael S. Tsirkin (2) and others
# Via Michael S. Tsirkin
* mst/tags/for_anthony:
  Set virtio-serial device to have a default of 2 MSI vectors.
  ICH9 LPC: Reset Control Register, basic implementation
  Fix guest OS hang when 64bit PCI bar present
  e1000: unbreak the guest network migration to 1.3
  vhost: memory sync fixes
parents e482dedc 554f1997

hw/e1000.c

+25 −0
Original line number Diff line number Diff line
@@ -131,6 +131,11 @@ typedef struct E1000State_st { 
    } eecd_state;



    QEMUTimer *autoneg_timer;



/* Compatibility flags for migration to/from qemu 1.3.0 and older */

#define E1000_FLAG_AUTONEG_BIT 0

#define E1000_FLAG_AUTONEG (1 << E1000_FLAG_AUTONEG_BIT)

    uint32_t compat_flags;

} E1000State;



#define	defreg(x)	x = (E1000_##x>>2)
@@ -165,6 +170,14 @@ e1000_link_up(E1000State *s) 
static void

set_phy_ctrl(E1000State *s, int index, uint16_t val)

{

    /*

     * QEMU 1.3 does not support link auto-negotiation emulation, so if we

     * migrate during auto negotiation, after migration the link will be

     * down.

     */

    if (!(s->compat_flags & E1000_FLAG_AUTONEG)) {

        return;

    }

    if ((val & MII_CR_AUTO_NEG_EN) && (val & MII_CR_RESTART_AUTO_NEG)) {

        e1000_link_down(s);

        s->phy_reg[PHY_STATUS] &= ~MII_SR_AUTONEG_COMPLETE;
@@ -1120,6 +1133,11 @@ static void e1000_pre_save(void *opaque) 
{

    E1000State *s = opaque;

    NetClientState *nc = qemu_get_queue(s->nic);



    if (!(s->compat_flags & E1000_FLAG_AUTONEG)) {

        return;

    }



    /*

     * If link is down and auto-negotiation is ongoing, complete

     * auto-negotiation immediately.  This allows is to look at
@@ -1141,6 +1159,11 @@ static int e1000_post_load(void *opaque, int version_id) 
     * to link status bit in mac_reg[STATUS].

     * Alternatively, restart link negotiation if it was in progress. */

    nc->link_down = (s->mac_reg[STATUS] & E1000_STATUS_LU) == 0;



    if (!(s->compat_flags & E1000_FLAG_AUTONEG)) {

        return 0;

    }



    if (s->phy_reg[PHY_CTRL] & MII_CR_AUTO_NEG_EN &&

        s->phy_reg[PHY_CTRL] & MII_CR_RESTART_AUTO_NEG &&

        !(s->phy_reg[PHY_STATUS] & MII_SR_AUTONEG_COMPLETE)) {
@@ -1343,6 +1366,8 @@ static void qdev_e1000_reset(DeviceState *dev) 


static Property e1000_properties[] = {

    DEFINE_NIC_PROPERTIES(E1000State, conf),

    DEFINE_PROP_BIT("autonegotiation", E1000State,

                    compat_flags, E1000_FLAG_AUTONEG_BIT, true),

    DEFINE_PROP_END_OF_LIST(),

};

hw/ich9.h

+11 −0
Original line number Diff line number Diff line
@@ -49,6 +49,15 @@ typedef struct ICH9LPCState { 
    /* 10.1 Chipset Configuration registers(Memory Space)

     which is pointed by RCBA */

    uint8_t chip_config[ICH9_CC_SIZE];



    /*

     * 13.7.5 RST_CNT---Reset Control Register (LPC I/F---D31:F0)

     *

     * register contents and IO memory region

     */

    uint8_t rst_cnt;

    MemoryRegion rst_cnt_mem;



    /* isa bus */

    ISABus *isa_bus;

    MemoryRegion rbca_mem;
@@ -103,6 +112,8 @@ typedef struct ICH9LPCState { 


#define ICH9_D2P_A2_REVISION                    0x92



/* D31:F0 LPC Processor Interface */

#define ICH9_RST_CNT_IOPORT                     0xCF9



/* D31:F1 LPC controller */

#define ICH9_A2_LPC                             "ICH9 A2 LPC"

hw/lpc_ich9.c

+57 −0
Original line number Diff line number Diff line
@@ -466,6 +466,7 @@ static void ich9_lpc_reset(DeviceState *qdev) 
    ich9_lpc_rcba_update(lpc, rbca_old);



    lpc->sci_level = 0;

    lpc->rst_cnt = 0;

}



static const MemoryRegionOps rbca_mmio_ops = {
@@ -498,6 +499,32 @@ static void ich9_lpc_machine_ready(Notifier *n, void *opaque) 
    }

}



/* reset control */

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

                               unsigned len)

{

    ICH9LPCState *lpc = opaque;



    if (val & 4) {

        qemu_system_reset_request();

        return;

    }

    lpc->rst_cnt = val & 0xA; /* keep FULL_RST (bit 3) and SYS_RST (bit 1) */

}



static uint64_t ich9_rst_cnt_read(void *opaque, hwaddr addr, unsigned len)

{

    ICH9LPCState *lpc = opaque;



    return lpc->rst_cnt;

}



static const MemoryRegionOps ich9_rst_cnt_ops = {

    .read = ich9_rst_cnt_read,

    .write = ich9_rst_cnt_write,

    .endianness = DEVICE_LITTLE_ENDIAN

};



static int ich9_lpc_initfn(PCIDevice *d)

{

    ICH9LPCState *lpc = ICH9_LPC_DEVICE(d);
@@ -519,9 +546,32 @@ static int ich9_lpc_initfn(PCIDevice *d) 
    lpc->machine_ready.notify = ich9_lpc_machine_ready;

    qemu_add_machine_init_done_notifier(&lpc->machine_ready);



    memory_region_init_io(&lpc->rst_cnt_mem, &ich9_rst_cnt_ops, lpc,

                          "lpc-reset-control", 1);

    memory_region_add_subregion_overlap(pci_address_space_io(d),

                                        ICH9_RST_CNT_IOPORT, &lpc->rst_cnt_mem,

                                        1);



    return 0;

}



static bool ich9_rst_cnt_needed(void *opaque)

{

    ICH9LPCState *lpc = opaque;



    return (lpc->rst_cnt != 0);

}



static const VMStateDescription vmstate_ich9_rst_cnt = {

    .name = "ICH9LPC/rst_cnt",

    .version_id = 1,

    .minimum_version_id = 1,

    .fields = (VMStateField[]) {

        VMSTATE_UINT8(rst_cnt, ICH9LPCState),

        VMSTATE_END_OF_LIST()

    }

};



static const VMStateDescription vmstate_ich9_lpc = {

    .name = "ICH9LPC",

    .version_id = 1,
@@ -535,6 +585,13 @@ static const VMStateDescription vmstate_ich9_lpc = { 
        VMSTATE_UINT8_ARRAY(chip_config, ICH9LPCState, ICH9_CC_SIZE),

        VMSTATE_UINT32(sci_level, ICH9LPCState),

        VMSTATE_END_OF_LIST()

    },

    .subsections = (VMStateSubsection[]) {

        {

            .vmsd = &vmstate_ich9_rst_cnt,

            .needed = ich9_rst_cnt_needed

        },

        { 0 }

    }

};

hw/pc.h

+5 −0
Original line number Diff line number Diff line
@@ -216,6 +216,11 @@ int e820_add_entry(uint64_t, uint64_t, uint32_t); 
            .driver   = "virtio-blk-pci",\

            .property = "discard_granularity",\

            .value    = stringify(0),\

	},{\

            .driver   = "virtio-serial-pci",\

            .property = "vectors",\

            /* DEV_NVECTORS_UNSPECIFIED as a uint32_t string */\

            .value    = stringify(0xFFFFFFFF),\

	}



#endif

hw/pc_piix.c

+4 −0
Original line number Diff line number Diff line
@@ -330,6 +330,10 @@ static QEMUMachine pc_i440fx_machine_v1_4 = { 
            .driver   = "virtio-net-pci", \

            .property = "mq", \

            .value    = "off", \

        }, {\

            .driver   = "e1000",\

            .property = "autonegotiation",\

            .value    = "off",\

        }



static QEMUMachine pc_machine_v1_3 = {