[Qemu-devel] [PATCH 1/2] prep: Remove bogus BIOS size check

[Qemu-devel] [PATCH 1/2] prep: Remove bogus BIOS size check

[Hervé Poussineau]

From: Andreas Färber <andreas.faerber@web.de>

r3480 added this check to account for the entry vector 0xfff00100 to be
available for CPUs that need it. Today however, the NIP is not yet
initialized at this point (zero), so the check always triggers.

Moreover, BIOS size check is already done previously, so this part can
be removed too.

Cc: Alexander Graf <agraf@suse.de>
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
 hw/ppc_prep.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index 1492266..6b22122 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -600,9 +600,6 @@ static void ppc_prep_init (ram_addr_t ram_size,
     if (filename) {
         qemu_free(filename);
     }
-    if (env->nip < 0xFFF80000 && bios_size < 0x00100000) {
-        hw_error("PowerPC 601 / 620 / 970 need a 1MB BIOS\n");
-    }
 
     if (linux_boot) {
         kernel_base = KERNEL_LOAD_ADDR;
-- 
1.7.2.3

[Qemu-devel] [PATCH 2/2] prep: Disable second IDE channel, as long as ISA IDE emulation doesn't support same irq for both channels

[Hervé Poussineau]

Cc: Andreas Färber <andreas.faerber@web.de>
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
 hw/ppc_prep.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
index 6b22122..6c1499a 100644
--- a/hw/ppc_prep.c
+++ b/hw/ppc_prep.c
@@ -690,7 +690,7 @@ static void ppc_prep_init (ram_addr_t ram_size,
         hd[i] = drive_get(IF_IDE, i / MAX_IDE_DEVS, i % MAX_IDE_DEVS);
     }
 
-    for(i = 0; i < MAX_IDE_BUS; i++) {
+    for(i = 0; i < 1/*MAX_IDE_BUS*/; i++) {
         isa_ide_init(ide_iobase[i], ide_iobase2[i], ide_irq[i],
                      hd[2 * i],
 		     hd[2 * i + 1]);
-- 
1.7.2.3

Re: [Qemu-devel] [PATCH 2/2] prep: Disable second IDE channel, as long as ISA IDE emulation doesn't support same irq for both channels

[Aurelien Jarno]

On Tue, Jan 18, 2011 at 10:43:56PM +0100, Hervé Poussineau wrote:
> Cc: Andreas Färber <andreas.faerber@web.de>
> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
> ---
>  hw/ppc_prep.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)

Thanks, applied.

> diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
> index 6b22122..6c1499a 100644
> --- a/hw/ppc_prep.c
> +++ b/hw/ppc_prep.c
> @@ -690,7 +690,7 @@ static void ppc_prep_init (ram_addr_t ram_size,
>          hd[i] = drive_get(IF_IDE, i / MAX_IDE_DEVS, i % MAX_IDE_DEVS);
>      }
>  
> -    for(i = 0; i < MAX_IDE_BUS; i++) {
> +    for(i = 0; i < 1/*MAX_IDE_BUS*/; i++) {
>          isa_ide_init(ide_iobase[i], ide_iobase2[i], ide_irq[i],
>                       hd[2 * i],
>  		     hd[2 * i + 1]);
> -- 
> 1.7.2.3
> 
> 
> 

-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net

[Qemu-devel] Re: [PATCH 1/2] prep: Remove bogus BIOS size check

[Andreas Färber]

Am 18.01.2011 um 22:43 schrieb Hervé Poussineau:

> From: Andreas Färber <andreas.faerber@web.de>
>
> r3480 added this check to account for the entry vector 0xfff00100 to  
> be
> available for CPUs that need it. Today however, the NIP is not yet
> initialized at this point (zero), so the check always triggers.
>
> Moreover, BIOS size check is already done previously, so this part can
> be removed too.
>
> Cc: Alexander Graf <agraf@suse.de>
> Signed-off-by: Andreas Färber <andreas.faerber@web.de>
> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
> ---
> hw/ppc_prep.c |    3 ---
> 1 files changed, 0 insertions(+), 3 deletions(-)
>
> diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
> index 1492266..6b22122 100644
> --- a/hw/ppc_prep.c
> +++ b/hw/ppc_prep.c
> @@ -600,9 +600,6 @@ static void ppc_prep_init (ram_addr_t ram_size,
>     if (filename) {
>         qemu_free(filename);
>     }
> -    if (env->nip < 0xFFF80000 && bios_size < 0x00100000) {
> -        hw_error("PowerPC 601 / 620 / 970 need a 1MB BIOS\n");
> -    }

I've been thinking if we could replace this with a check for env- 
 >excep_prefix + env->hreset_vector or similar but haven't found the  
time to try it out yet.

Andreas

>
>     if (linux_boot) {
>         kernel_base = KERNEL_LOAD_ADDR;
> -- 
> 1.7.2.3
>

Re: [Qemu-devel] [PATCH 1/2] prep: Remove bogus BIOS size check

[Aurelien Jarno]

On Tue, Jan 18, 2011 at 10:43:55PM +0100, Hervé Poussineau wrote:
> From: Andreas Färber <andreas.faerber@web.de>
> 
> r3480 added this check to account for the entry vector 0xfff00100 to be
> available for CPUs that need it. Today however, the NIP is not yet
> initialized at this point (zero), so the check always triggers.
> 
> Moreover, BIOS size check is already done previously, so this part can
> be removed too.
> 
> Cc: Alexander Graf <agraf@suse.de>
> Signed-off-by: Andreas Färber <andreas.faerber@web.de>
> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
> ---
>  hw/ppc_prep.c |    3 ---
>  1 files changed, 0 insertions(+), 3 deletions(-)

Thanks, applied.

> diff --git a/hw/ppc_prep.c b/hw/ppc_prep.c
> index 1492266..6b22122 100644
> --- a/hw/ppc_prep.c
> +++ b/hw/ppc_prep.c
> @@ -600,9 +600,6 @@ static void ppc_prep_init (ram_addr_t ram_size,
>      if (filename) {
>          qemu_free(filename);
>      }
> -    if (env->nip < 0xFFF80000 && bios_size < 0x00100000) {
> -        hw_error("PowerPC 601 / 620 / 970 need a 1MB BIOS\n");
> -    }
>  
>      if (linux_boot) {
>          kernel_base = KERNEL_LOAD_ADDR;
> -- 
> 1.7.2.3
> 
> 
> 

-- 
Aurelien Jarno                          GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net