diff mbox series

[v2,3/3] hw/isa/piix4: Correct IRQRC[A:D] reset values

Message ID 20221027204720.33611-4-philmd@linaro.org (mailing list archive)
State New, archived
Headers show
Series hw/isa/piix4: Remove MIPS Malta specific bits | expand

Commit Message

Philippe Mathieu-Daudé Oct. 27, 2022, 8:47 p.m. UTC
IRQRC[A:D] registers reset value is 0x80. We were forcing
the MIPS Malta machine routing to be able to boot a Linux
kernel without any bootloader.
We now have these registers initialized in the Malta machine
write_bootloader(), so we can use the correct reset values.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
 hw/isa/piix4.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Bernhard Beschow Dec. 18, 2022, 4:49 p.m. UTC | #1
Am 27. Oktober 2022 20:47:20 UTC schrieb "Philippe Mathieu-Daudé" <philmd@linaro.org>:
>IRQRC[A:D] registers reset value is 0x80. We were forcing
>the MIPS Malta machine routing to be able to boot a Linux
>kernel without any bootloader.
>We now have these registers initialized in the Malta machine
>write_bootloader(), so we can use the correct reset values.
>
>Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
>---

Reviewed-by: Bernhard Beschow <shentey@gmail.com>

> hw/isa/piix4.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
>index 15f344dbb7..a2165c6a49 100644
>--- a/hw/isa/piix4.c
>+++ b/hw/isa/piix4.c
>@@ -115,10 +115,10 @@ static void piix4_isa_reset(DeviceState *dev)
>     pci_conf[0x4c] = 0x4d;
>     pci_conf[0x4e] = 0x03;
>     pci_conf[0x4f] = 0x00;
>-    pci_conf[0x60] = 0x0a; // PCI A -> IRQ 10
>-    pci_conf[0x61] = 0x0a; // PCI B -> IRQ 10
>-    pci_conf[0x62] = 0x0b; // PCI C -> IRQ 11
>-    pci_conf[0x63] = 0x0b; // PCI D -> IRQ 11
>+    pci_conf[0x60] = 0x80;
>+    pci_conf[0x61] = 0x80;
>+    pci_conf[0x62] = 0x80;
>+    pci_conf[0x63] = 0x80;
>     pci_conf[0x69] = 0x02;
>     pci_conf[0x70] = 0x80;
>     pci_conf[0x76] = 0x0c;
Bernhard Beschow Dec. 19, 2022, 12:20 p.m. UTC | #2
Am 27. Oktober 2022 20:47:20 UTC schrieb "Philippe Mathieu-Daudé" <philmd@linaro.org>:
>IRQRC[A:D] registers reset value is 0x80. We were forcing
>the MIPS Malta machine routing to be able to boot a Linux
>kernel without any bootloader.
>We now have these registers initialized in the Malta machine
>write_bootloader(), so we can use the correct reset values.
>
>Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>

https://lists.nongnu.org/archive/html/qemu-devel/2022-12/msg03048.html :

Reviewed-by: Igor Mammedov <imammedo@redhat.com>

>---
> hw/isa/piix4.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
>index 15f344dbb7..a2165c6a49 100644
>--- a/hw/isa/piix4.c
>+++ b/hw/isa/piix4.c
>@@ -115,10 +115,10 @@ static void piix4_isa_reset(DeviceState *dev)
>     pci_conf[0x4c] = 0x4d;
>     pci_conf[0x4e] = 0x03;
>     pci_conf[0x4f] = 0x00;
>-    pci_conf[0x60] = 0x0a; // PCI A -> IRQ 10
>-    pci_conf[0x61] = 0x0a; // PCI B -> IRQ 10
>-    pci_conf[0x62] = 0x0b; // PCI C -> IRQ 11
>-    pci_conf[0x63] = 0x0b; // PCI D -> IRQ 11
>+    pci_conf[0x60] = 0x80;
>+    pci_conf[0x61] = 0x80;
>+    pci_conf[0x62] = 0x80;
>+    pci_conf[0x63] = 0x80;
>     pci_conf[0x69] = 0x02;
>     pci_conf[0x70] = 0x80;
>     pci_conf[0x76] = 0x0c;
diff mbox series

Patch

diff --git a/hw/isa/piix4.c b/hw/isa/piix4.c
index 15f344dbb7..a2165c6a49 100644
--- a/hw/isa/piix4.c
+++ b/hw/isa/piix4.c
@@ -115,10 +115,10 @@  static void piix4_isa_reset(DeviceState *dev)
     pci_conf[0x4c] = 0x4d;
     pci_conf[0x4e] = 0x03;
     pci_conf[0x4f] = 0x00;
-    pci_conf[0x60] = 0x0a; // PCI A -> IRQ 10
-    pci_conf[0x61] = 0x0a; // PCI B -> IRQ 10
-    pci_conf[0x62] = 0x0b; // PCI C -> IRQ 11
-    pci_conf[0x63] = 0x0b; // PCI D -> IRQ 11
+    pci_conf[0x60] = 0x80;
+    pci_conf[0x61] = 0x80;
+    pci_conf[0x62] = 0x80;
+    pci_conf[0x63] = 0x80;
     pci_conf[0x69] = 0x02;
     pci_conf[0x70] = 0x80;
     pci_conf[0x76] = 0x0c;