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

Merge remote-tracking branch 'remotes/rth/tags/pull-hppa-20190221' into staging 



Fix dino pci config access.

# gpg: Signature made Thu 21 Feb 2019 19:03:26 GMT
# gpg:                using RSA key 64DF38E8AF7E215F
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>" [full]
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A  05C0 64DF 38E8 AF7E 215F

* remotes/rth/tags/pull-hppa-20190221:
  hw/hppa/dino: mask out lower 2 bits of PCI config addr

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 7817ea16 368bec88

hw/hppa/dino.c

+24 −3
Original line number Diff line number Diff line
@@ -178,7 +178,7 @@ static MemTxResult dino_chip_read_with_attrs(void *opaque, hwaddr addr, 
    case DINO_PCI_IO_DATA ... DINO_PCI_IO_DATA + 3:

        /* Read from PCI IO space. */

        io = &address_space_io;

        ioaddr = s->parent_obj.config_reg;

        ioaddr = s->parent_obj.config_reg + (addr & 3);

        switch (size) {

        case 1:

            val = address_space_ldub(io, ioaddr, attrs, &ret);
@@ -250,7 +250,7 @@ static MemTxResult dino_chip_write_with_attrs(void *opaque, hwaddr addr, 
    case DINO_IO_DATA ... DINO_PCI_IO_DATA + 3:

        /* Write into PCI IO space.  */

        io = &address_space_io;

        ioaddr = s->parent_obj.config_reg;

        ioaddr = s->parent_obj.config_reg + (addr & 3);

        switch (size) {

        case 1:

            address_space_stb(io, ioaddr, val, attrs, &ret);
@@ -360,6 +360,27 @@ static const MemoryRegionOps dino_config_data_ops = { 
    .endianness = DEVICE_LITTLE_ENDIAN,

};



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

{

    PCIHostState *s = opaque;

    return s->config_reg;

}



static void dino_config_addr_write(void *opaque, hwaddr addr,

                                   uint64_t val, unsigned len)

{

    PCIHostState *s = opaque;

    s->config_reg = val & ~3U;

}



static const MemoryRegionOps dino_config_addr_ops = {

    .read = dino_config_addr_read,

    .write = dino_config_addr_write,

    .valid.min_access_size = 4,

    .valid.max_access_size = 4,

    .endianness = DEVICE_BIG_ENDIAN,

};



static AddressSpace *dino_pcihost_set_iommu(PCIBus *bus, void *opaque,

                                            int devfn)

{
@@ -440,7 +461,7 @@ PCIBus *dino_init(MemoryRegion *addr_space, 


    /* Dino PCI config. */

    memory_region_init_io(&s->parent_obj.conf_mem, OBJECT(&s->parent_obj),

                          &pci_host_conf_be_ops, dev, "pci-conf-idx", 4);

                          &dino_config_addr_ops, dev, "pci-conf-idx", 4);

    memory_region_init_io(&s->parent_obj.data_mem, OBJECT(&s->parent_obj),

                          &dino_config_data_ops, dev, "pci-conf-data", 4);

    memory_region_add_subregion(&s->this_mem, DINO_PCI_CONFIG_ADDR,

pc-bios/hppa-firmware.img

+531 KiB (742 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file