From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46618) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0fr5-0006Uc-Kz for qemu-devel@nongnu.org; Thu, 04 Jun 2015 20:51:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z0fr2-0008Ec-Eu for qemu-devel@nongnu.org; Thu, 04 Jun 2015 20:51:27 -0400 Received: from mail-bn1bon0082.outbound.protection.outlook.com ([157.56.111.82]:49190 helo=na01-bn1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z0fr2-0008Dj-9f for qemu-devel@nongnu.org; Thu, 04 Jun 2015 20:51:24 -0400 Received: from unknown-38-66.xilinx.com ([149.199.38.66]:40260 helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw02 with esmtp (Exim 4.63) (envelope-from ) id 1Z0fr0-0000Oi-CV for qemu-devel@nongnu.org; Thu, 04 Jun 2015 17:51:22 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1Z0fr0-0002Au-7P for qemu-devel@nongnu.org; Thu, 04 Jun 2015 17:51:22 -0700 Date: Fri, 5 Jun 2015 10:47:06 +1000 From: "Edgar E. Iglesias" Message-ID: <20150605004706.GU17878@toto> References: <6914a01f86671039bf35be203411d00786b8cb28.1433314301.git.alistair.francis@xilinx.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <6914a01f86671039bf35be203411d00786b8cb28.1433314301.git.alistair.francis@xilinx.com> Subject: Re: [Qemu-devel] [PATCH RESEND v1 6/8] ml605_mmu: Move the hardcoded values to the init function List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alistair Francis Cc: peter.crosthwaite@xilinx.com, qemu-devel@nongnu.org On Thu, Jun 04, 2015 at 11:24:34AM +1000, Alistair Francis wrote: > Move the hard coded register values to the init function. > This also allows the entire reset function to be deleted, as > PVR registers are now preserved on reset. This looks OK but I assume that the remaining pvr settings will gradually move towards props? > > Signed-off-by: Alistair Francis > --- > hw/microblaze/petalogix_ml605_mmu.c | 19 +++++++------------ > 1 files changed, 7 insertions(+), 12 deletions(-) > > diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c > index f52654c..140a9d9 100644 > --- a/hw/microblaze/petalogix_ml605_mmu.c > +++ b/hw/microblaze/petalogix_ml605_mmu.c > @@ -64,17 +64,6 @@ > #define SPI_IRQ 4 > #define UART16550_IRQ 5 > > -static void machine_cpu_reset(MicroBlazeCPU *cpu) > -{ > - CPUMBState *env = &cpu->env; > - > - env->pvr.regs[10] = 0x0e000000; /* virtex 6 */ > - /* setup pvr to match kernel setting */ > - env->pvr.regs[0] |= (0x14 << 8); > - env->pvr.regs[4] = 0xc56b8000; > - env->pvr.regs[5] = 0xc56be000; > -} > - > static void > petalogix_ml605_init(MachineState *machine) > { > @@ -206,10 +195,16 @@ petalogix_ml605_init(MachineState *machine) > } > } > > + /* setup PVR to match kernel settings */ > + cpu->env.pvr.regs[0] |= (0x14 << 8); > + cpu->env.pvr.regs[4] = 0xc56b8000; > + cpu->env.pvr.regs[5] = 0xc56be000; > + cpu->env.pvr.regs[10] = 0x0e000000; /* virtex 6 */ > + > microblaze_load_kernel(cpu, MEMORY_BASEADDR, ram_size, > machine->initrd_filename, > BINARY_DEVICE_TREE_FILE, > - machine_cpu_reset); > + NULL); > > } > > -- > 1.7.1 >