Patchwork [1/1] PPC: Drop initial ESCC mapping

login
register
mail settings
Submitter Alexander Graf
Date Sept. 30, 2011, 1:29 p.m.
Message ID <1317389352-7163-1-git-send-email-agraf@suse.de>
Download mbox | patch
Permalink /patch/117139/
State New
Headers show

Comments

Alexander Graf - Sept. 30, 2011, 1:29 p.m.
We are mapping ESCC to a static (incorrect) address on machine init. This
overlaps with our vram, rendering the screen barely usable.

Since openBIOS is clever enough to map ESCC to where it needs to be, we can
just drop that invalid map and everyone's happy.

Signed-off-by: Alexander Graf <agraf@suse.de>
---
 hw/ppc_newworld.c |    2 +-
 hw/ppc_oldworld.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Blue Swirl - Oct. 1, 2011, 12:06 p.m.
Thanks, applied.

On Fri, Sep 30, 2011 at 1:29 PM, Alexander Graf <agraf@suse.de> wrote:
> We are mapping ESCC to a static (incorrect) address on machine init. This
> overlaps with our vram, rendering the screen barely usable.
>
> Since openBIOS is clever enough to map ESCC to where it needs to be, we can
> just drop that invalid map and everyone's happy.
>
> Signed-off-by: Alexander Graf <agraf@suse.de>
> ---
>  hw/ppc_newworld.c |    2 +-
>  hw/ppc_oldworld.c |    2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
> index bcdc0a3..b9a50db 100644
> --- a/hw/ppc_newworld.c
> +++ b/hw/ppc_newworld.c
> @@ -326,7 +326,7 @@ static void ppc_core99_init (ram_addr_t ram_size,
>     /* init basic PC hardware */
>     pci_vga_init(pci_bus);
>
> -    escc_mem = escc_init(0x80013000, pic[0x25], pic[0x24],
> +    escc_mem = escc_init(0, pic[0x25], pic[0x24],
>                          serial_hds[0], serial_hds[1], ESCC_CLOCK, 4);
>     memory_region_init_alias(escc_bar, "escc-bar",
>                              escc_mem, 0, memory_region_size(escc_mem));
> diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
> index 5c17944..ebcaafa 100644
> --- a/hw/ppc_oldworld.c
> +++ b/hw/ppc_oldworld.c
> @@ -238,7 +238,7 @@ static void ppc_heathrow_init (ram_addr_t ram_size,
>                                get_system_io());
>     pci_vga_init(pci_bus);
>
> -    escc_mem = escc_init(0x80013000, pic[0x0f], pic[0x10], serial_hds[0],
> +    escc_mem = escc_init(0, pic[0x0f], pic[0x10], serial_hds[0],
>                                serial_hds[1], ESCC_CLOCK, 4);
>     memory_region_init_alias(escc_bar, "escc-bar",
>                              escc_mem, 0, memory_region_size(escc_mem));
> --
> 1.6.0.2
>
>

Patch

diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c
index bcdc0a3..b9a50db 100644
--- a/hw/ppc_newworld.c
+++ b/hw/ppc_newworld.c
@@ -326,7 +326,7 @@  static void ppc_core99_init (ram_addr_t ram_size,
     /* init basic PC hardware */
     pci_vga_init(pci_bus);
 
-    escc_mem = escc_init(0x80013000, pic[0x25], pic[0x24],
+    escc_mem = escc_init(0, pic[0x25], pic[0x24],
                          serial_hds[0], serial_hds[1], ESCC_CLOCK, 4);
     memory_region_init_alias(escc_bar, "escc-bar",
                              escc_mem, 0, memory_region_size(escc_mem));
diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c
index 5c17944..ebcaafa 100644
--- a/hw/ppc_oldworld.c
+++ b/hw/ppc_oldworld.c
@@ -238,7 +238,7 @@  static void ppc_heathrow_init (ram_addr_t ram_size,
                                get_system_io());
     pci_vga_init(pci_bus);
 
-    escc_mem = escc_init(0x80013000, pic[0x0f], pic[0x10], serial_hds[0],
+    escc_mem = escc_init(0, pic[0x0f], pic[0x10], serial_hds[0],
                                serial_hds[1], ESCC_CLOCK, 4);
     memory_region_init_alias(escc_bar, "escc-bar",
                              escc_mem, 0, memory_region_size(escc_mem));