[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/7] Activate uninorth AGP bridge
From: |
Alexander Graf |
Subject: |
[Qemu-devel] [PATCH 4/7] Activate uninorth AGP bridge |
Date: |
Thu, 5 Mar 2009 15:14:11 +0100 |
Linux tries to poke the AGP bridge port and is pretty sad when it can't,
so let's activate the old code again and throw out the bit modifications,
as we don't really do anything with the values anyways.
Signed-off-by: Alexander Graf <address@hidden>
---
hw/unin_pci.c | 27 ++++++++-------------------
1 files changed, 8 insertions(+), 19 deletions(-)
diff --git a/hw/unin_pci.c b/hw/unin_pci.c
index 949e63f..c734f1c 100644
--- a/hw/unin_pci.c
+++ b/hw/unin_pci.c
@@ -92,17 +92,12 @@ static CPUReadMemoryFunc *pci_unin_main_read[] = {
&pci_host_data_readl,
};
-#if 0
-
static void pci_unin_config_writel (void *opaque, target_phys_addr_t addr,
uint32_t val)
{
UNINState *s = opaque;
-#ifdef TARGET_WORDS_BIGENDIAN
- val = bswap32(val);
-#endif
- s->config_reg = 0x80000000 | (val & ~0x00000001);
+ s->config_reg = val;
}
static uint32_t pci_unin_config_readl (void *opaque,
@@ -111,12 +106,7 @@ static uint32_t pci_unin_config_readl (void *opaque,
UNINState *s = opaque;
uint32_t val;
- val = (s->config_reg | 0x00000001) & ~0x80000000;
-#ifdef TARGET_WORDS_BIGENDIAN
- val = bswap32(val);
-#endif
-
- return val;
+ return s->config_reg;
}
static CPUWriteMemoryFunc *pci_unin_config_write[] = {
@@ -131,6 +121,7 @@ static CPUReadMemoryFunc *pci_unin_config_read[] = {
&pci_unin_config_readl,
};
+#if 0
static CPUWriteMemoryFunc *pci_unin_write[] = {
&pci_host_pci_writeb,
&pci_host_pci_writew,
@@ -233,18 +224,17 @@ PCIBus *pci_pmac_init(qemu_irq *pic)
d->config[0x27] = 0x7F;
// d->config[0x34] = 0xdc // capabilities_pointer
#endif
-#if 0 // XXX: not needed for now
+
/* Uninorth AGP bus */
- s = &pci_bridge[1];
pci_mem_config = cpu_register_io_memory(0, pci_unin_config_read,
pci_unin_config_write, s);
- pci_mem_data = cpu_register_io_memory(0, pci_unin_read,
- pci_unin_write, s);
+ pci_mem_data = cpu_register_io_memory(0, pci_unin_main_read,
+ pci_unin_main_write, s);
cpu_register_physical_memory(0xf0800000, 0x1000, pci_mem_config);
cpu_register_physical_memory(0xf0c00000, 0x1000, pci_mem_data);
- d = pci_register_device("Uni-north AGP", sizeof(PCIDevice), 0, 11 << 3,
- NULL, NULL);
+ d = pci_register_device(s->bus, "Uni-north AGP", sizeof(PCIDevice),
+ 11 << 3, NULL, NULL);
pci_config_set_vendor_id(d->config, PCI_VENDOR_ID_APPLE);
pci_config_set_device_id(d->config, PCI_DEVICE_ID_APPLE_UNI_N_AGP);
d->config[0x08] = 0x00; // revision
@@ -253,7 +243,6 @@ PCIBus *pci_pmac_init(qemu_irq *pic)
d->config[0x0D] = 0x10; // latency_timer
d->config[0x0E] = 0x00; // header_type
// d->config[0x34] = 0x80; // capabilities_pointer
-#endif
#if 0 // XXX: not needed for now
/* Uninorth internal bus */
--
1.6.0.2
- [Qemu-devel] [PATCH 0/7] PPC64 Linux bringup patches v2, Alexander Graf, 2009/03/05
- [Qemu-devel] [PATCH 1/7] PPC64: Implement slbmte, Alexander Graf, 2009/03/05
- [Qemu-devel] [PATCH 2/7] PPC64: Implement large pages, Alexander Graf, 2009/03/05
- [Qemu-devel] [PATCH 3/7] PPC64: Implment tlbiel, Alexander Graf, 2009/03/05
- [Qemu-devel] [PATCH 4/7] Activate uninorth AGP bridge,
Alexander Graf <=
- [Qemu-devel] [PATCH 5/7] PPC64: Nop some SPRs on 970fx, Alexander Graf, 2009/03/05
- [Qemu-devel] [PATCH 6/7] PPC64: Enable 64bit mode on interrupts, Alexander Graf, 2009/03/05
- [Qemu-devel] [PATCH 7/7] PPC64: Don't fault at lwsync, Alexander Graf, 2009/03/05
- Re: [Qemu-devel] [PATCH 7/7] PPC64: Don't fault at lwsync, Paul Brook, 2009/03/05
- Re: [Qemu-devel] [PATCH 7/7] PPC64: Don't fault at lwsync, Alexander Graf, 2009/03/05
- Re: [Qemu-devel] [PATCH 7/7] PPC64: Don't fault at lwsync, Alexander Graf, 2009/03/05
- Re: [Qemu-devel] [PATCH 7/7] PPC64: Don't fault at lwsync, Paul Brook, 2009/03/05
- Re: [Qemu-devel] [PATCH 7/7] PPC64: Don't fault at lwsync, Paul Brook, 2009/03/05
- Re: [Qemu-devel] [PATCH 7/7] PPC64: Don't fault at lwsync, Daniel Jacobowitz, 2009/03/05
- Re: [Qemu-devel] [PATCH 7/7] PPC64: Don't fault at lwsync, Paul Brook, 2009/03/05