* [Qemu-devel] [patch 02/02] sparc32 use empty_slot for missing RAM
@ 2010-04-16 23:14 Artyom Tarasenko
2010-04-17 6:57 ` [Qemu-devel] " Blue Swirl
0 siblings, 1 reply; 2+ messages in thread
From: Artyom Tarasenko @ 2010-04-16 23:14 UTC (permalink / raw)
To: qemu-devel; +Cc: blauwirbel, Artyom Tarasenko
use empty_slot device for the RAM which is not installed
Models without ECC don't trap when missing ram is accessed.
Signed-off-by: Artyom Tarasenko <atar4qemu@gmail.com>
---
Makefile.target | 2 +-
hw/sun4m.c | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index 95c9d23..6362927 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -248,7 +248,7 @@ obj-sparc-y += cirrus_vga.o
else
obj-sparc-y = sun4m.o lance.o tcx.o sun4m_iommu.o slavio_intctl.o
obj-sparc-y += slavio_timer.o slavio_misc.o sparc32_dma.o
-obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o
+obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o empty_slot.o
endif
obj-arm-y = integratorcp.o versatilepb.o arm_pic.o arm_timer.o
diff --git a/hw/sun4m.c b/hw/sun4m.c
index 90e661d..fb49af5 100644
--- a/hw/sun4m.c
+++ b/hw/sun4m.c
@@ -36,6 +36,7 @@
#include "isa.h"
#include "fw_cfg.h"
#include "escc.h"
+#include "empty_slot.h"
#include "qdev-addr.h"
#include "loader.h"
#include "elf.h"
@@ -820,7 +821,11 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size,
/* set up devices */
ram_init(0, RAM_size, hwdef->max_mem);
-
+ /* models without ECC don't trap when missing ram is accessed */
+ if(!hwdef->ecc_base) {
+ empty_slot_init(RAM_size, hwdef->max_mem - RAM_size);
+ }
+
prom_init(hwdef->slavio_base, bios_name);
slavio_intctl = slavio_intctl_init(hwdef->intctl_base,
--
1.6.6.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Qemu-devel] Re: [patch 02/02] sparc32 use empty_slot for missing RAM
2010-04-16 23:14 [Qemu-devel] [patch 02/02] sparc32 use empty_slot for missing RAM Artyom Tarasenko
@ 2010-04-17 6:57 ` Blue Swirl
0 siblings, 0 replies; 2+ messages in thread
From: Blue Swirl @ 2010-04-17 6:57 UTC (permalink / raw)
To: Artyom Tarasenko; +Cc: qemu-devel, Artyom Tarasenko
On 4/17/10, Artyom Tarasenko <atar4qemu@googlemail.com> wrote:
> use empty_slot device for the RAM which is not installed
>
> Models without ECC don't trap when missing ram is accessed.
>
> Signed-off-by: Artyom Tarasenko <atar4qemu@gmail.com>
> ---
> Makefile.target | 2 +-
> hw/sun4m.c | 7 ++++++-
> 2 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile.target b/Makefile.target
> index 95c9d23..6362927 100644
> --- a/Makefile.target
> +++ b/Makefile.target
> @@ -248,7 +248,7 @@ obj-sparc-y += cirrus_vga.o
> else
> obj-sparc-y = sun4m.o lance.o tcx.o sun4m_iommu.o slavio_intctl.o
> obj-sparc-y += slavio_timer.o slavio_misc.o sparc32_dma.o
> -obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o
> +obj-sparc-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o empty_slot.o
> endif
The device could be compiled once, so please use instead
Makefile.objs, conditional to CONFIG_EMPTY_SLOT which gets defined in
default-configs/sparc-softmmu.mak.
On the other hand, the device is not used by other boards yet, so
there is no benefit at this point.
> obj-arm-y = integratorcp.o versatilepb.o arm_pic.o arm_timer.o
> diff --git a/hw/sun4m.c b/hw/sun4m.c
> index 90e661d..fb49af5 100644
> --- a/hw/sun4m.c
> +++ b/hw/sun4m.c
> @@ -36,6 +36,7 @@
> #include "isa.h"
> #include "fw_cfg.h"
> #include "escc.h"
> +#include "empty_slot.h"
> #include "qdev-addr.h"
> #include "loader.h"
> #include "elf.h"
> @@ -820,7 +821,11 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size,
>
> /* set up devices */
> ram_init(0, RAM_size, hwdef->max_mem);
> -
> + /* models without ECC don't trap when missing ram is accessed */
> + if(!hwdef->ecc_base) {
The indentation seems to be off and there should be a space between
'if' and '('.
> + empty_slot_init(RAM_size, hwdef->max_mem - RAM_size);
> + }
> +
> prom_init(hwdef->slavio_base, bios_name);
>
> slavio_intctl = slavio_intctl_init(hwdef->intctl_base,
>
> --
> 1.6.6.1
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-04-17 6:57 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-04-16 23:14 [Qemu-devel] [patch 02/02] sparc32 use empty_slot for missing RAM Artyom Tarasenko
2010-04-17 6:57 ` [Qemu-devel] " Blue Swirl
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.