Skip to contentSkip to conversation

hw/hppa/dino: mask out lower 2 bits of PCI config addr

PATCH In review Sven Schnelle 3 participants 4 messages Feb 18, 2019 – Feb 21, 2019

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 hw/hppa/dino: mask out lower 2 bits of PCI config addr

some versions of HP-UX 10.20 seems to rely on the fact that DINO strips out the lower 2 bits of the PCI configuration address. Also update the binary SeaBIOS distributed to the latest version from Helge's repository, which is required with that change.

---
 hw/hppa/dino.c            |  25 ++++++++++++++++++++++---
 pc-bios/hppa-firmware.img | Bin 215936 -> 760040 bytes
 2 files changed, 22 insertions(+), 3 deletions(-)
hw/hppa/dino.c +22 -3
index 360716de57..63441783c4 100644
@@ -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,25 @@ 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 & ~3U;
+}
+
+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,
+    .endianness = DEVICE_BIG_ENDIAN,
+};
+
 static AddressSpace *dino_pcihost_set_iommu(PCIBus *bus, void *opaque,
                                             int devfn)
 {
@@ -440,7 +459,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 binary +0 -0
index 4ec0dbfc4ae065c29004156ce2933e66b761adf2..86930974b9e12bec214fb464eee443a0d844e6ff 100644
GIT binary patch
Signature · 1 line
2.20.1
#1 lore raw
Quoted 46 lines · Sven Schnelle

some versions of HP-UX 10.20 seems to rely on the fact that DINO strips out the lower 2 bits of the PCI configuration address. Also update the binary SeaBIOS distributed to the latest version from Helge's repository, which is required with that change.

---
 hw/hppa/dino.c            |  25 ++++++++++++++++++++++---
 pc-bios/hppa-firmware.img | Bin 215936 -> 760040 bytes
 2 files changed, 22 insertions(+), 3 deletions(-)
hw/hppa/dino.c +11 -2
index 360716de57..63441783c4 100644
@@ -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,25 @@ 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 & ~3U;
+}
+
+static void dino_config_addr_write(void *opaque, hwaddr addr,
+                                   uint64_t val, unsigned len)
+{

hw/hppa/dino.c static const MemoryRegionOps dino_config_data_ops = { · line 381

Quoted 10 lines
hw/hppa/dino.c +10 -0
+    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,
+    .endianness = DEVICE_BIG_ENDIAN,
+};
+

Can you re-test with the following?

If the stores are all aligned, then the reads to not need to re-align. Also, partial writes to the config register don't make much sense. Over in hw/pci/pci_host.c, we check addr == 0 && len == 4, which is a very old fashioned way to do the .valid thing.

r~

hw/hppa/dino.c +3 -1
index 63441783c4..40f9e1a963 100644
@@ -363,7 +363,7 @@ static const MemoryRegionOps dino_config_data_ops = {
 static uint64_t dino_config_addr_read(void *opaque, hwaddr addr, unsigned len)
 {
     PCIHostState *s = opaque;
-    return s->config_reg & ~3U;
+    return s->config_reg;
 }
 
 static void dino_config_addr_write(void *opaque, hwaddr addr,
@@ -376,6 +376,8 @@ static void dino_config_addr_write(void *opaque, hwaddr addr,
 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,
 };
#2 lore raw

Hi Richard,

Quoted 6 lines · Richard Henderson

Can you re-test with the following?

If the stores are all aligned, then the reads to not need to re-align. Also, partial writes to the config register don't make much sense. Over in hw/pci/pci_host.c, we check addr == 0 && len == 4, which is a very old fashioned way to do the .valid thing.

With your proposed change it works as well - should i send a v2 or will you take care of updating the patch?

Thanks
Sven

#3 lore raw
Quoted 6 lines · Sven Schnelle

Hi Richard,

Quoted 2 lines · Richard Henderson

Can you re-test with the following?

Quoted 7 lines
Quoted 4 lines

If the stores are all aligned, then the reads to not need to re-align. Also, partial writes to the config register don't make much sense. Over in hw/pci/pci_host.c, we check addr == 0 && len == 4, which is a very old fashioned way to do the .valid thing.

With your proposed change it works as well - should i send a v2 or will you take care of updating the patch?

I can squash this change. Thanks for testing.

r~