Re: [Qemu-devel] [PATCH 03/30] ppc: remove ppc440 bamboo board support
On Mon, 2012-01-02 at 18:51 -0600, Anthony Liguori wrote:
This board never worked with TCG. It hasn't been updated since 0.13.0. I'm
fairly sure hardware doesn't exist anymore that you can run the KVM support
with.
It does exist, I have one :-)
So let's remove it. It can always be restored later if there is interest
again.
Cheers,
Ben.
Signed-off-by: Anthony Liguori aligu...@us.ibm.com
---
Makefile.target|3 +-
hw/ppc440.c| 106 ---
hw/ppc440.h| 21 ---
hw/ppc440_bamboo.c | 215 -
hw/ppc4xx_pci.c| 381
hw/virtex_ml507.c |1 -
6 files changed, 1 insertions(+), 726 deletions(-)
delete mode 100644 hw/ppc440.c
delete mode 100644 hw/ppc440.h
delete mode 100644 hw/ppc440_bamboo.c
delete mode 100644 hw/ppc4xx_pci.c
diff --git a/Makefile.target b/Makefile.target
index 3261383..b8ccf07 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -246,8 +246,7 @@ obj-ppc-$(CONFIG_PSERIES) += spapr.o spapr_hcall.o
spapr_rtas.o spapr_vio.o
obj-ppc-$(CONFIG_PSERIES) += xics.o spapr_vty.o spapr_llan.o spapr_vscsi.o
obj-ppc-$(CONFIG_PSERIES) += spapr_pci.o device-hotplug.o pci-hotplug.o
# PowerPC 4xx boards
-obj-ppc-y += ppc4xx_devs.o ppc4xx_pci.o ppc405_uc.o ppc405_boards.o
-obj-ppc-y += ppc440.o ppc440_bamboo.o
+obj-ppc-y += ppc4xx_devs.o ppc405_uc.o ppc405_boards.o
# PowerPC E500 boards
obj-ppc-y += ppce500_mpc8544ds.o mpc8544_guts.o ppce500_spin.o
# PowerPC 440 Xilinx ML507 reference board.
diff --git a/hw/ppc440.c b/hw/ppc440.c
deleted file mode 100644
index cd8a95d..000
--- a/hw/ppc440.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Qemu PowerPC 440 chip emulation
- *
- * Copyright 2007 IBM Corporation.
- * Authors:
- * Jerone Young jyou...@us.ibm.com
- * Christian Ehrhardt ehrha...@linux.vnet.ibm.com
- * Hollis Blanchard holl...@us.ibm.com
- *
- * This work is licensed under the GNU GPL license version 2 or later.
- *
- */
-
-#include hw.h
-#include pc.h
-#include isa.h
-#include ppc.h
-#include ppc4xx.h
-#include ppc440.h
-#include ppc405.h
-#include sysemu.h
-#include kvm.h
-
-#define PPC440EP_PCI_CONFIG 0xeec0
-#define PPC440EP_PCI_INTACK 0xeed0
-#define PPC440EP_PCI_SPECIAL0xeed0
-#define PPC440EP_PCI_REGS 0xef40
-#define PPC440EP_PCI_IO 0xe800
-#define PPC440EP_PCI_IOLEN 0x0001
-
-#define PPC440EP_SDRAM_NR_BANKS 4
-
-static const unsigned int ppc440ep_sdram_bank_sizes[] = {
-25620, 12820, 6420, 3220, 1620, 820, 0
-};
-
-CPUState *ppc440ep_init(MemoryRegion *address_space_mem, ram_addr_t
*ram_size,
-PCIBus **pcip, const unsigned int pci_irq_nrs[4],
-int do_init, const char *cpu_model)
-{
-MemoryRegion *ram_memories
-= g_malloc(PPC440EP_SDRAM_NR_BANKS * sizeof(*ram_memories));
-target_phys_addr_t ram_bases[PPC440EP_SDRAM_NR_BANKS];
-target_phys_addr_t ram_sizes[PPC440EP_SDRAM_NR_BANKS];
-CPUState *env;
-qemu_irq *pic;
-qemu_irq *irqs;
-qemu_irq *pci_irqs;
-
-if (cpu_model == NULL) {
-cpu_model = 440-Xilinx; // XXX: should be 440EP
-}
-env = cpu_init(cpu_model);
-if (!env) {
-fprintf(stderr, Unable to initialize CPU!\n);
-exit(1);
-}
-
-ppc_dcr_init(env, NULL, NULL);
-
-/* interrupt controller */
-irqs = g_malloc0(sizeof(qemu_irq) * PPCUIC_OUTPUT_NB);
-irqs[PPCUIC_OUTPUT_INT] = ((qemu_irq
*)env-irq_inputs)[PPC40x_INPUT_INT];
-irqs[PPCUIC_OUTPUT_CINT] = ((qemu_irq
*)env-irq_inputs)[PPC40x_INPUT_CINT];
-pic = ppcuic_init(env, irqs, 0x0C0, 0, 1);
-
-/* SDRAM controller */
-memset(ram_bases, 0, sizeof(ram_bases));
-memset(ram_sizes, 0, sizeof(ram_sizes));
-*ram_size = ppc4xx_sdram_adjust(*ram_size, PPC440EP_SDRAM_NR_BANKS,
-ram_memories,
-ram_bases, ram_sizes,
-ppc440ep_sdram_bank_sizes);
-/* XXX 440EP's ECC interrupts are on UIC1, but we've only created UIC0.
*/
-ppc4xx_sdram_init(env, pic[14], PPC440EP_SDRAM_NR_BANKS, ram_memories,
- ram_bases, ram_sizes, do_init);
-
-/* PCI */
-pci_irqs = g_malloc(sizeof(qemu_irq) * 4);
-pci_irqs[0] = pic[pci_irq_nrs[0]];
-pci_irqs[1] = pic[pci_irq_nrs[1]];
-pci_irqs[2] = pic[pci_irq_nrs[2]];
-pci_irqs[3] = pic[pci_irq_nrs[3]];
-*pcip = ppc4xx_pci_init(env, pci_irqs,
-PPC440EP_PCI_CONFIG,
-PPC440EP_PCI_INTACK,
-PPC440EP_PCI_SPECIAL,
-PPC440EP_PCI_REGS);
-if (!*pcip)
-printf(couldn't create PCI controller!\n);
-
-isa_mmio_init(PPC440EP_PCI_IO, PPC440EP_PCI_IOLEN);
-
-if
Re: [Qemu-devel] [PATCH 03/30] ppc: remove ppc440 bamboo board support
Am 13.01.2012 11:59, schrieb Benjamin Herrenschmidt: On Mon, 2012-01-02 at 18:51 -0600, Anthony Liguori wrote: This board never worked with TCG. It hasn't been updated since 0.13.0. I'm fairly sure hardware doesn't exist anymore that you can run the KVM support with. It does exist, I have one :-) Alex has already posted series to not only qdev'ify it but to also add TCG support so other people can test it. Review and testing would probably be appreciated. :) Andreas -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
Re: [Qemu-devel] [PATCH 03/30] ppc: remove ppc440 bamboo board support
On 01/13/2012 12:04 PM, Andreas Färber wrote: This board never worked with TCG. It hasn't been updated since 0.13.0. I'm fairly sure hardware doesn't exist anymore that you can run the KVM support with. It does exist, I have one:-) Alex has already posted series to not only qdev'ify it but to also add TCG support so other people can test it. Review and testing would probably be appreciated.:) The work that you guys are putting in modernizing the PPC boards is really cool. Please, let's start working on the 1.1 changelog now so that it doesn't get lost! Paolo
Re: [Qemu-devel] [PATCH 03/30] ppc: remove ppc440 bamboo board support
On 13.01.2012, at 12:45, Paolo Bonzini wrote: On 01/13/2012 12:04 PM, Andreas Färber wrote: This board never worked with TCG. It hasn't been updated since 0.13.0. I'm fairly sure hardware doesn't exist anymore that you can run the KVM support with. It does exist, I have one:-) Alex has already posted series to not only qdev'ify it but to also add TCG support so other people can test it. Review and testing would probably be appreciated.:) The work that you guys are putting in modernizing the PPC boards is really cool. Please, let's start working on the 1.1 changelog now so that it doesn't get lost! Good point :). I'm not sure how useful something like Qdev'ified board xxx really is in a changelog though. It's mostly invisible to users. Alex
Re: [Qemu-devel] [PATCH 03/30] ppc: remove ppc440 bamboo board support
Am 13.01.2012 13:30, schrieb Alexander Graf: On 13.01.2012, at 12:45, Paolo Bonzini wrote: On 01/13/2012 12:04 PM, Andreas Färber wrote: This board never worked with TCG. It hasn't been updated since 0.13.0. I'm fairly sure hardware doesn't exist anymore that you can run the KVM support with. It does exist, I have one:-) Alex has already posted series to not only qdev'ify it but to also add TCG support so other people can test it. Review and testing would probably be appreciated.:) The work that you guys are putting in modernizing the PPC boards is really cool. Please, let's start working on the 1.1 changelog now so that it doesn't get lost! Good point :). I'm not sure how useful something like Qdev'ified board xxx really is in a changelog though. It's mostly invisible to users. This is inviting a flame war on whether users read Change Logs and whether a Change Log needs to be useful to them. ;) I concur with Paolo that TCG support for Bamboo is worth mentioning (user-visible feature) and so would a new, real PReP machine if we manage in time. The conversions could be summarized under a QOM heading. But since neither has been applied to master yet, we should wait with the Change Log update. But thanks for the reminder, good idea! Andreas http://wiki.qemu.org/ChangeLog/1.1 -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
Re: [Qemu-devel] [PATCH 03/30] ppc: remove ppc440 bamboo board support
On 13.01.2012, at 15:24, Andreas Färber wrote: Am 13.01.2012 13:30, schrieb Alexander Graf: On 13.01.2012, at 12:45, Paolo Bonzini wrote: On 01/13/2012 12:04 PM, Andreas Färber wrote: This board never worked with TCG. It hasn't been updated since 0.13.0. I'm fairly sure hardware doesn't exist anymore that you can run the KVM support with. It does exist, I have one:-) Alex has already posted series to not only qdev'ify it but to also add TCG support so other people can test it. Review and testing would probably be appreciated.:) The work that you guys are putting in modernizing the PPC boards is really cool. Please, let's start working on the 1.1 changelog now so that it doesn't get lost! Good point :). I'm not sure how useful something like Qdev'ified board xxx really is in a changelog though. It's mostly invisible to users. This is inviting a flame war on whether users read Change Logs and whether a Change Log needs to be useful to them. ;) Users read changelogs. Packagers read changelogs. QEMU Developers read mailing lists. Libvirt developers might read changelogs. Qdev is a QEMU developer visible feature, so it doesn't belong into the changelog. Unless you want to argue that it makes stuff available through -device at which point it's management tool visible. Oh well. I probably just don't want to bloat it too much :). I concur with Paolo that TCG support for Bamboo is worth mentioning (user-visible feature) and so would a new, real PReP machine if we manage in time. Yes, both definitely should show up! The conversions could be summarized under a QOM heading. But since neither has been applied to master yet, we should wait with the Change Log update. But thanks for the reminder, good idea! If it's been posted on the ML, nobody complained on it and it's in the maintainer's queue, it's fine to update the changelog imho :). Alex Andreas http://wiki.qemu.org/ChangeLog/1.1 -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg
Re: [Qemu-devel] [PATCH 03/30] ppc: remove ppc440 bamboo board support
Le -10/01/-28163 20:59, Anthony Liguori a écrit : This board never worked with TCG. It hasn't been updated since 0.13.0. I'm fairly sure hardware doesn't exist anymore that you can run the KVM support with. So let's remove it. It can always be restored later if there is interest again. I'd like to have a ppc440 board around still... I once pondered adding the sam440, but don't have the time. Anyone looking into it ? It'd be quite wow to have the latest Amiga X-1000 too but it has a very custom chipset. François.
[Qemu-devel] [PATCH 03/30] ppc: remove ppc440 bamboo board support
This board never worked with TCG. It hasn't been updated since 0.13.0. I'm
fairly sure hardware doesn't exist anymore that you can run the KVM support
with.
So let's remove it. It can always be restored later if there is interest again.
Signed-off-by: Anthony Liguori aligu...@us.ibm.com
---
Makefile.target|3 +-
hw/ppc440.c| 106 ---
hw/ppc440.h| 21 ---
hw/ppc440_bamboo.c | 215 -
hw/ppc4xx_pci.c| 381
hw/virtex_ml507.c |1 -
6 files changed, 1 insertions(+), 726 deletions(-)
delete mode 100644 hw/ppc440.c
delete mode 100644 hw/ppc440.h
delete mode 100644 hw/ppc440_bamboo.c
delete mode 100644 hw/ppc4xx_pci.c
diff --git a/Makefile.target b/Makefile.target
index 3261383..b8ccf07 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -246,8 +246,7 @@ obj-ppc-$(CONFIG_PSERIES) += spapr.o spapr_hcall.o
spapr_rtas.o spapr_vio.o
obj-ppc-$(CONFIG_PSERIES) += xics.o spapr_vty.o spapr_llan.o spapr_vscsi.o
obj-ppc-$(CONFIG_PSERIES) += spapr_pci.o device-hotplug.o pci-hotplug.o
# PowerPC 4xx boards
-obj-ppc-y += ppc4xx_devs.o ppc4xx_pci.o ppc405_uc.o ppc405_boards.o
-obj-ppc-y += ppc440.o ppc440_bamboo.o
+obj-ppc-y += ppc4xx_devs.o ppc405_uc.o ppc405_boards.o
# PowerPC E500 boards
obj-ppc-y += ppce500_mpc8544ds.o mpc8544_guts.o ppce500_spin.o
# PowerPC 440 Xilinx ML507 reference board.
diff --git a/hw/ppc440.c b/hw/ppc440.c
deleted file mode 100644
index cd8a95d..000
--- a/hw/ppc440.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Qemu PowerPC 440 chip emulation
- *
- * Copyright 2007 IBM Corporation.
- * Authors:
- * Jerone Young jyou...@us.ibm.com
- * Christian Ehrhardt ehrha...@linux.vnet.ibm.com
- * Hollis Blanchard holl...@us.ibm.com
- *
- * This work is licensed under the GNU GPL license version 2 or later.
- *
- */
-
-#include hw.h
-#include pc.h
-#include isa.h
-#include ppc.h
-#include ppc4xx.h
-#include ppc440.h
-#include ppc405.h
-#include sysemu.h
-#include kvm.h
-
-#define PPC440EP_PCI_CONFIG 0xeec0
-#define PPC440EP_PCI_INTACK 0xeed0
-#define PPC440EP_PCI_SPECIAL0xeed0
-#define PPC440EP_PCI_REGS 0xef40
-#define PPC440EP_PCI_IO 0xe800
-#define PPC440EP_PCI_IOLEN 0x0001
-
-#define PPC440EP_SDRAM_NR_BANKS 4
-
-static const unsigned int ppc440ep_sdram_bank_sizes[] = {
-25620, 12820, 6420, 3220, 1620, 820, 0
-};
-
-CPUState *ppc440ep_init(MemoryRegion *address_space_mem, ram_addr_t *ram_size,
-PCIBus **pcip, const unsigned int pci_irq_nrs[4],
-int do_init, const char *cpu_model)
-{
-MemoryRegion *ram_memories
-= g_malloc(PPC440EP_SDRAM_NR_BANKS * sizeof(*ram_memories));
-target_phys_addr_t ram_bases[PPC440EP_SDRAM_NR_BANKS];
-target_phys_addr_t ram_sizes[PPC440EP_SDRAM_NR_BANKS];
-CPUState *env;
-qemu_irq *pic;
-qemu_irq *irqs;
-qemu_irq *pci_irqs;
-
-if (cpu_model == NULL) {
-cpu_model = 440-Xilinx; // XXX: should be 440EP
-}
-env = cpu_init(cpu_model);
-if (!env) {
-fprintf(stderr, Unable to initialize CPU!\n);
-exit(1);
-}
-
-ppc_dcr_init(env, NULL, NULL);
-
-/* interrupt controller */
-irqs = g_malloc0(sizeof(qemu_irq) * PPCUIC_OUTPUT_NB);
-irqs[PPCUIC_OUTPUT_INT] = ((qemu_irq *)env-irq_inputs)[PPC40x_INPUT_INT];
-irqs[PPCUIC_OUTPUT_CINT] = ((qemu_irq
*)env-irq_inputs)[PPC40x_INPUT_CINT];
-pic = ppcuic_init(env, irqs, 0x0C0, 0, 1);
-
-/* SDRAM controller */
-memset(ram_bases, 0, sizeof(ram_bases));
-memset(ram_sizes, 0, sizeof(ram_sizes));
-*ram_size = ppc4xx_sdram_adjust(*ram_size, PPC440EP_SDRAM_NR_BANKS,
-ram_memories,
-ram_bases, ram_sizes,
-ppc440ep_sdram_bank_sizes);
-/* XXX 440EP's ECC interrupts are on UIC1, but we've only created UIC0. */
-ppc4xx_sdram_init(env, pic[14], PPC440EP_SDRAM_NR_BANKS, ram_memories,
- ram_bases, ram_sizes, do_init);
-
-/* PCI */
-pci_irqs = g_malloc(sizeof(qemu_irq) * 4);
-pci_irqs[0] = pic[pci_irq_nrs[0]];
-pci_irqs[1] = pic[pci_irq_nrs[1]];
-pci_irqs[2] = pic[pci_irq_nrs[2]];
-pci_irqs[3] = pic[pci_irq_nrs[3]];
-*pcip = ppc4xx_pci_init(env, pci_irqs,
-PPC440EP_PCI_CONFIG,
-PPC440EP_PCI_INTACK,
-PPC440EP_PCI_SPECIAL,
-PPC440EP_PCI_REGS);
-if (!*pcip)
-printf(couldn't create PCI controller!\n);
-
-isa_mmio_init(PPC440EP_PCI_IO, PPC440EP_PCI_IOLEN);
-
-if (serial_hds[0] != NULL) {
-serial_mm_init(address_space_mem, 0xef600300, 0, pic[0],
- PPC_SERIAL_MM_BAUDBASE, serial_hds[0],
- DEVICE_BIG_ENDIAN);
-}
-if (serial_hds[1] != NULL) {
-
