Skip to contentSkip to conversation

Fix via-ide for fuloong2e

PATCH Superseded BALATON Zoltan via 3 participants 9 messages Dec 24, 2020 – Dec 27, 2020

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

cover Fix via-ide for fuloong2e

This implements the legacy-mode emulation option for via-ide which is needed for Linux on fuloong2e. I've tested that the Debian kernel now finds CD ROM and MorphOS on pegasos2 is not affected by this.

BALATON Zoltan (1):
ide: Make room for flags in PCIIDEState and add one for legacy mode

Guenter Roeck (1):
via-ide: Fix fuloong2e support

 hw/ide/cmd646.c      |  4 ++--
 hw/ide/via.c         | 19 +++++++++++++++++--
 hw/mips/fuloong2e.c  |  4 +++-
 hw/sparc64/sun4u.c   |  2 +-
 include/hw/ide/pci.h |  7 ++++++-
 5 files changed, 29 insertions(+), 7 deletions(-)
Signature · 1 line
2.21.3
#3 lore raw

PATCH 2/2 via-ide: Fix fuloong2e support

From: Guenter Roeck <[email protected]>

Fuloong2e needs to use legacy mode for IDE support to work with Linux. Add property to via-ide driver to make the mode configurable, and set legacy mode for Fuloong2e.

[balaton: Use bit in flags for property, add comment for missing BAR4]
---
 hw/ide/via.c        | 19 +++++++++++++++++--
 hw/mips/fuloong2e.c |  4 +++-
 2 files changed, 20 insertions(+), 3 deletions(-)
hw/ide/via.c +17 -2
index be09912b33..7d54d7e829 100644
@@ -26,6 +26,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "sysemu/dma.h"
@@ -185,12 +186,19 @@ static void via_ide_realize(PCIDevice *dev, Error **errp)
                           &d->bus[1], "via-ide1-cmd", 4);
     pci_register_bar(dev, 3, PCI_BASE_ADDRESS_SPACE_IO, &d->cmd_bar[1]);
 
-    bmdma_setup_bar(d);
-    pci_register_bar(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar);
+    if (!(d->flags & BIT(PCI_IDE_LEGACY_MODE))) {
+        /* Missing BAR4 will make Linux driver fall back to legacy PIO mode */
+        bmdma_setup_bar(d);
+        pci_register_bar(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar);
+    }
 
     qdev_init_gpio_in(ds, via_ide_set_irq, 2);
     for (i = 0; i < 2; i++) {
         ide_bus_new(&d->bus[i], sizeof(d->bus[i]), ds, i, 2);
+        if (d->flags & BIT(PCI_IDE_LEGACY_MODE)) {
+            ide_init_ioport(&d->bus[i], NULL, i ? 0x170 : 0x1f0,
+                            i ? 0x376 : 0x3f6);
+        }
         ide_init2(&d->bus[i], qdev_get_gpio_in(ds, i));
 
         bmdma_init(&d->bus[i], &d->bmdma[i], d);
@@ -210,6 +218,12 @@ static void via_ide_exitfn(PCIDevice *dev)
     }
 }
 
+static Property via_ide_properties[] = {
+    DEFINE_PROP_BIT("legacy_mode", PCIIDEState, flags, PCI_IDE_LEGACY_MODE,
+                    false),
+    DEFINE_PROP_END_OF_LIST(),
+};
+
 static void via_ide_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
@@ -223,6 +237,7 @@ static void via_ide_class_init(ObjectClass *klass, void *data)
     k->device_id = PCI_DEVICE_ID_VIA_IDE;
     k->revision = 0x06;
     k->class_id = PCI_CLASS_STORAGE_IDE;
+    device_class_set_props(dc, via_ide_properties);
     set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
 }
 
hw/mips/fuloong2e.c +3 -1
index 45c596f4fe..f0733e87b7 100644
@@ -253,7 +253,9 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq intc,
     /* Super I/O */
     isa_create_simple(isa_bus, TYPE_VT82C686B_SUPERIO);
 
-    dev = pci_create_simple(pci_bus, PCI_DEVFN(slot, 1), "via-ide");
+    dev = pci_new(PCI_DEVFN(slot, 1), "via-ide");
+    qdev_prop_set_bit(&dev->qdev, "legacy_mode", true);
+    pci_realize_and_unref(dev, pci_bus, &error_fatal);
     pci_ide_create_devs(dev);
 
     pci_create_simple(pci_bus, PCI_DEVFN(slot, 2), "vt82c686b-usb-uhci");
Signature · 1 line
2.21.3
#1 lore raw

PATCH 1/2 ide: Make room for flags in PCIIDEState and add one for legacy mode

In reply to BALATON Zoltan via

We'll need a flag for implementing some device specific behaviour in via-ide but we already have a currently CMD646 specific field that can be repurposed for this and leave room for furhter flags if needed in the future. This patch changes the "secondary" field to "flags" and change CMD646 and its users accordingly and define a new flag for forcing legacy mode that will be used by via-ide for now.

---
 hw/ide/cmd646.c      | 4 ++--
 hw/sparc64/sun4u.c   | 2 +-
 include/hw/ide/pci.h | 7 ++++++-
 3 files changed, 9 insertions(+), 4 deletions(-)
hw/ide/cmd646.c +2 -2
index c254631485..7a96016116 100644
@@ -256,7 +256,7 @@ static void pci_cmd646_ide_realize(PCIDevice *dev, Error **errp)
     pci_conf[PCI_CLASS_PROG] = 0x8f;
 
     pci_conf[CNTRL] = CNTRL_EN_CH0; // enable IDE0
-    if (d->secondary) {
+    if (d->flags & BIT(PCI_IDE_SECONDARY)) {
         /* XXX: if not enabled, really disable the seconday IDE controller */
         pci_conf[CNTRL] |= CNTRL_EN_CH1; /* enable IDE1 */
     }
@@ -314,7 +314,7 @@ static void pci_cmd646_ide_exitfn(PCIDevice *dev)
 }
 
 static Property cmd646_ide_properties[] = {
-    DEFINE_PROP_UINT32("secondary", PCIIDEState, secondary, 0),
+    DEFINE_PROP_BIT("secondary", PCIIDEState, flags, PCI_IDE_SECONDARY, false),
     DEFINE_PROP_END_OF_LIST(),
 };
 
hw/sparc64/sun4u.c +1 -1
index 0fa13a7330..c46baa9f48 100644
@@ -674,7 +674,7 @@ static void sun4uv_init(MemoryRegion *address_space_mem,
     }
 
     pci_dev = pci_new(PCI_DEVFN(3, 0), "cmd646-ide");
-    qdev_prop_set_uint32(&pci_dev->qdev, "secondary", 1);
+    qdev_prop_set_bit(&pci_dev->qdev, "secondary", true);
     pci_realize_and_unref(pci_dev, pci_busA, &error_fatal);
     pci_ide_create_devs(pci_dev);
 
include/hw/ide/pci.h +6 -1
index d8384e1c42..75d1a32f6d 100644
@@ -42,6 +42,11 @@ typedef struct BMDMAState {
 #define TYPE_PCI_IDE "pci-ide"
 OBJECT_DECLARE_SIMPLE_TYPE(PCIIDEState, PCI_IDE)
 
+enum {
+    PCI_IDE_SECONDARY, /* used only for cmd646 */
+    PCI_IDE_LEGACY_MODE
+};
+
 struct PCIIDEState {
     /*< private >*/
     PCIDevice parent_obj;
@@ -49,7 +54,7 @@ struct PCIIDEState {
 
     IDEBus bus[2];
     BMDMAState bmdma[2];
-    uint32_t secondary; /* used only for cmd646 */
+    uint32_t flags;
     MemoryRegion bmdma_bar;
     MemoryRegion cmd_bar[2];
     MemoryRegion data_bar[2];
Signature · 1 line
2.21.3
Reviewed-by on v1 1/2
#2 lore raw

Re: [PATCH 1/2] ide: Make room for flags in PCIIDEState and add one for legacy mode

Quoted 7 lines · BALATON Zoltan

We'll need a flag for implementing some device specific behaviour in via-ide but we already have a currently CMD646 specific field that can be repurposed for this and leave room for furhter flags if needed in the future. This patch changes the "secondary" field to "flags" and change CMD646 and its users accordingly and define a new flag for forcing legacy mode that will be used by via-ide for now.

Quoted 6 lines
---
 hw/ide/cmd646.c      | 4 ++--
 hw/sparc64/sun4u.c   | 2 +-
 include/hw/ide/pci.h | 7 ++++++-
 3 files changed, 9 insertions(+), 4 deletions(-)
Reviewed-by on v1 2/2
#4 lore raw

Re: [PATCH 2/2] via-ide: Fix fuloong2e support

In reply to BALATON Zoltan via
Quoted 6 lines · BALATON Zoltan

From: Guenter Roeck <[email protected]>

Fuloong2e needs to use legacy mode for IDE support to work with Linux. Add property to via-ide driver to make the mode configurable, and set legacy mode for Fuloong2e.

Fixes 4ea98d317eb ("ide/via: Implement and use native PCI IDE mode")?
Quoted 69 lines
[balaton: Use bit in flags for property, add comment for missing BAR4]
---
 hw/ide/via.c        | 19 +++++++++++++++++--
 hw/mips/fuloong2e.c |  4 +++-
 2 files changed, 20 insertions(+), 3 deletions(-)
hw/ide/via.c +17 -2
index be09912b33..7d54d7e829 100644
@@ -26,6 +26,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "sysemu/dma.h"
@@ -185,12 +186,19 @@ static void via_ide_realize(PCIDevice *dev, Error **errp)
                           &d->bus[1], "via-ide1-cmd", 4);
     pci_register_bar(dev, 3, PCI_BASE_ADDRESS_SPACE_IO, &d->cmd_bar[1]);
 
-    bmdma_setup_bar(d);
-    pci_register_bar(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar);
+    if (!(d->flags & BIT(PCI_IDE_LEGACY_MODE))) {
+        /* Missing BAR4 will make Linux driver fall back to legacy PIO mode */
+        bmdma_setup_bar(d);
+        pci_register_bar(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar);
+    }
 
     qdev_init_gpio_in(ds, via_ide_set_irq, 2);
     for (i = 0; i < 2; i++) {
         ide_bus_new(&d->bus[i], sizeof(d->bus[i]), ds, i, 2);
+        if (d->flags & BIT(PCI_IDE_LEGACY_MODE)) {
+            ide_init_ioport(&d->bus[i], NULL, i ? 0x170 : 0x1f0,
+                            i ? 0x376 : 0x3f6);
+        }
         ide_init2(&d->bus[i], qdev_get_gpio_in(ds, i));
 
         bmdma_init(&d->bus[i], &d->bmdma[i], d);
@@ -210,6 +218,12 @@ static void via_ide_exitfn(PCIDevice *dev)
     }
 }
 
+static Property via_ide_properties[] = {
+    DEFINE_PROP_BIT("legacy_mode", PCIIDEState, flags, PCI_IDE_LEGACY_MODE,
+                    false),
+    DEFINE_PROP_END_OF_LIST(),
+};
+
 static void via_ide_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
@@ -223,6 +237,7 @@ static void via_ide_class_init(ObjectClass *klass, void *data)
     k->device_id = PCI_DEVICE_ID_VIA_IDE;
     k->revision = 0x06;
     k->class_id = PCI_CLASS_STORAGE_IDE;
+    device_class_set_props(dc, via_ide_properties);
     set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
 }
 
hw/mips/fuloong2e.c +0 -0
index 45c596f4fe..f0733e87b7 100644

hw/mips/fuloong2e.c static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq intc, · line 261

Quoted 10 lines
hw/mips/fuloong2e.c +3 -1
@@ -253,7 +253,9 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq intc,
     /* Super I/O */
     isa_create_simple(isa_bus, TYPE_VT82C686B_SUPERIO);
 
-    dev = pci_create_simple(pci_bus, PCI_DEVFN(slot, 1), "via-ide");
+    dev = pci_new(PCI_DEVFN(slot, 1), "via-ide");
+    qdev_prop_set_bit(&dev->qdev, "legacy_mode", true);
+    pci_realize_and_unref(dev, pci_bus, &error_fatal);
     pci_ide_create_devs(dev);
 
     pci_create_simple(pci_bus, PCI_DEVFN(slot, 2), "vt82c686b-usb-uhci");
#5 lore raw

Re: [PATCH 2/2] via-ide: Fix fuloong2e support

Quoted 9 lines · Philippe Mathieu-Daudé
Quoted 6 lines · BALATON Zoltan

From: Guenter Roeck <[email protected]>

Fuloong2e needs to use legacy mode for IDE support to work with Linux. Add property to via-ide driver to make the mode configurable, and set legacy mode for Fuloong2e.

Fixes 4ea98d317eb ("ide/via: Implement and use native PCI IDE mode")?

Not really. That patch did what it said (only emulating (half) native mode instead of only emulating legacy mode) so it wasn't broken per se but it turned out that approach wasn't good enough for all use cases so this now takes a different turn (emulating either legacy or half-native mode based on option property). Therefore. I don't think Fixes: applies in this case. It fixes an issue with a guest but replaces previous patch with different approach. (Even though it reuses most of it.)

Regards,
BALATON Zoltan

Quoted 83 lines
Quoted 69 lines
[balaton: Use bit in flags for property, add comment for missing BAR4]
---
 hw/ide/via.c        | 19 +++++++++++++++++--
 hw/mips/fuloong2e.c |  4 +++-
 2 files changed, 20 insertions(+), 3 deletions(-)
hw/ide/via.c +17 -2
index be09912b33..7d54d7e829 100644
@@ -26,6 +26,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
+#include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "qemu/module.h"
 #include "sysemu/dma.h"
@@ -185,12 +186,19 @@ static void via_ide_realize(PCIDevice *dev, Error **errp)
                           &d->bus[1], "via-ide1-cmd", 4);
     pci_register_bar(dev, 3, PCI_BASE_ADDRESS_SPACE_IO, &d->cmd_bar[1]);
 
-    bmdma_setup_bar(d);
-    pci_register_bar(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar);
+    if (!(d->flags & BIT(PCI_IDE_LEGACY_MODE))) {
+        /* Missing BAR4 will make Linux driver fall back to legacy PIO mode */
+        bmdma_setup_bar(d);
+        pci_register_bar(dev, 4, PCI_BASE_ADDRESS_SPACE_IO, &d->bmdma_bar);
+    }
 
     qdev_init_gpio_in(ds, via_ide_set_irq, 2);
     for (i = 0; i < 2; i++) {
         ide_bus_new(&d->bus[i], sizeof(d->bus[i]), ds, i, 2);
+        if (d->flags & BIT(PCI_IDE_LEGACY_MODE)) {
+            ide_init_ioport(&d->bus[i], NULL, i ? 0x170 : 0x1f0,
+                            i ? 0x376 : 0x3f6);
+        }
         ide_init2(&d->bus[i], qdev_get_gpio_in(ds, i));
 
         bmdma_init(&d->bus[i], &d->bmdma[i], d);
@@ -210,6 +218,12 @@ static void via_ide_exitfn(PCIDevice *dev)
     }
 }
 
+static Property via_ide_properties[] = {
+    DEFINE_PROP_BIT("legacy_mode", PCIIDEState, flags, PCI_IDE_LEGACY_MODE,
+                    false),
+    DEFINE_PROP_END_OF_LIST(),
+};
+
 static void via_ide_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
@@ -223,6 +237,7 @@ static void via_ide_class_init(ObjectClass *klass, void *data)
     k->device_id = PCI_DEVICE_ID_VIA_IDE;
     k->revision = 0x06;
     k->class_id = PCI_CLASS_STORAGE_IDE;
+    device_class_set_props(dc, via_ide_properties);
     set_bit(DEVICE_CATEGORY_STORAGE, dc->categories);
 }
 
hw/mips/fuloong2e.c +0 -0
index 45c596f4fe..f0733e87b7 100644

hw/mips/fuloong2e.c static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq intc, · line 261

Quoted 10 lines
hw/mips/fuloong2e.c +3 -1
@@ -253,7 +253,9 @@ static void vt82c686b_southbridge_init(PCIBus *pci_bus, int slot, qemu_irq intc,
     /* Super I/O */
     isa_create_simple(isa_bus, TYPE_VT82C686B_SUPERIO);
 
-    dev = pci_create_simple(pci_bus, PCI_DEVFN(slot, 1), "via-ide");
+    dev = pci_new(PCI_DEVFN(slot, 1), "via-ide");
+    qdev_prop_set_bit(&dev->qdev, "legacy_mode", true);
+    pci_realize_and_unref(dev, pci_bus, &error_fatal);
     pci_ide_create_devs(dev);
 
     pci_create_simple(pci_bus, PCI_DEVFN(slot, 2), "vt82c686b-usb-uhci");
#6 lore raw

Re: [PATCH 2/2] via-ide: Fix fuloong2e support

Quoted 11 lines · BALATON Zoltan via
Quoted 9 lines · Philippe Mathieu-Daudé
Quoted 6 lines · BALATON Zoltan

From: Guenter Roeck <[email protected]>

Fuloong2e needs to use legacy mode for IDE support to work with Linux. Add property to via-ide driver to make the mode configurable, and set legacy mode for Fuloong2e.

Fixes 4ea98d317eb ("ide/via: Implement and use native PCI IDE mode")?
Quoted 7 lines

Not really. That patch did what it said (only emulating (half) native mode instead of only emulating legacy mode) so it wasn't broken per se but it turned out that approach wasn't good enough for all use cases so this now takes a different turn (emulating either legacy or half-native mode based on option property). Therefore. I don't think Fixes: applies in this case. It fixes an issue with a guest but replaces previous patch with different approach. (Even though it reuses most of it.)

Well, if Linux guest got broken by this commit, why not name it a "fix"? Anyway I don't mind how it is called. I find important to refer to the commit hash to help navigating between commits while reviewing history.

What about:

'''
The legacy mode for IDE support has been removed in commit 4ea98d317eb ("ide/via: Implement and use native PCI IDE mode"). When using a Linux guest, the Fuloong2e machine requires the legacy mode.
Add property to via-ide driver to make the mode configurable, and set legacy mode for Fuloong2e.
'''

Guenter, is that OK with you? (I can update when applying this series via the MIPS tree).

Thanks,

Phil.

Quoted 3 lines

Regards,
BALATON Zoltan

#7 lore raw

Re: [PATCH 2/2] via-ide: Fix fuloong2e support

Quoted 34 lines · Philippe Mathieu-Daudé
Quoted 11 lines · BALATON Zoltan via
Quoted 9 lines · Philippe Mathieu-Daudé
Quoted 6 lines · BALATON Zoltan

From: Guenter Roeck <[email protected]>

Fuloong2e needs to use legacy mode for IDE support to work with Linux. Add property to via-ide driver to make the mode configurable, and set legacy mode for Fuloong2e.

Fixes 4ea98d317eb ("ide/via: Implement and use native PCI IDE mode")?
Quoted 7 lines

Not really. That patch did what it said (only emulating (half) native mode instead of only emulating legacy mode) so it wasn't broken per se but it turned out that approach wasn't good enough for all use cases so this now takes a different turn (emulating either legacy or half-native mode based on option property). Therefore. I don't think Fixes: applies in this case. It fixes an issue with a guest but replaces previous patch with different approach. (Even though it reuses most of it.)

Well, if Linux guest got broken by this commit, why not name it a "fix"? Anyway I don't mind how it is called. I find important to refer to the commit hash to help navigating between commits while reviewing history.

What about:

'''
The legacy mode for IDE support has been removed in commit 4ea98d317eb ("ide/via: Implement and use native PCI IDE mode"). When using a Linux guest, the Fuloong2e machine requires the legacy mode.
Add property to via-ide driver to make the mode configurable, and set legacy mode for Fuloong2e.
'''

Quoted 3 lines

Guenter, is that OK with you? (I can update when applying this series via the MIPS tree).

Sure, I don't really care about the commit message as long as the problem is fixed.

Guenter

#8 lore raw

Re: [PATCH 2/2] via-ide: Fix fuloong2e support

In reply to Philippe Mathieu-Daudé
Quoted 20 lines · Philippe Mathieu-Daudé
Quoted 11 lines · BALATON Zoltan via
Quoted 9 lines · Philippe Mathieu-Daudé
Quoted 6 lines · BALATON Zoltan

From: Guenter Roeck <[email protected]>

Fuloong2e needs to use legacy mode for IDE support to work with Linux. Add property to via-ide driver to make the mode configurable, and set legacy mode for Fuloong2e.

Fixes 4ea98d317eb ("ide/via: Implement and use native PCI IDE mode")?
Quoted 7 lines

Not really. That patch did what it said (only emulating (half) native mode instead of only emulating legacy mode) so it wasn't broken per se but it turned out that approach wasn't good enough for all use cases so this now takes a different turn (emulating either legacy or half-native mode based on option property). Therefore. I don't think Fixes: applies in this case. It fixes an issue with a guest but replaces previous patch with different approach. (Even though it reuses most of it.)

Quoted 1 line

Well, if Linux guest got broken by this commit, why not name it a "fix"?

We do call it a fix in the patch title. I just thought Fixes: tag was more for either security fixes or cases when original commit had a bug that's fixed up by this patch which is not exactly the case here.

Quoted 13 lines

Anyway I don't mind how it is called. I find important to refer to the commit hash to help navigating between commits while reviewing history.

What about:

'''
The legacy mode for IDE support has been removed in commit 4ea98d317eb ("ide/via: Implement and use native PCI IDE mode"). When using a Linux guest, the Fuloong2e machine requires the legacy mode.
Add property to via-ide driver to make the mode configurable, and set legacy mode for Fuloong2e.
'''

Quoted 2 lines

Guenter, is that OK with you? (I can update when applying this series via the MIPS tree).

I've submitted v2 with this commit message (slightly edited) mentioning the original commit for tracking.

Regards,
BALATON Zoltan