Message ID | 66c7c9171d9d172b68b952625f2f1ac932f9b043.1434686378.git.alistair.francis@xilinx.com |
---|---|
State | New |
Headers | show
Return-Path: <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org> X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 6BD0614027F for <incoming@patchwork.ozlabs.org>; Fri, 19 Jun 2015 14:19:08 +1000 (AEST) Received: from localhost ([::1]:55784 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>) id 1Z5nli-0007bg-Hs for incoming@patchwork.ozlabs.org; Fri, 19 Jun 2015 00:19:06 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58538) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <alistair.francis@xilinx.com>) id 1Z5njc-0003SV-II for qemu-devel@nongnu.org; Fri, 19 Jun 2015 00:17:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <alistair.francis@xilinx.com>) id 1Z5njY-0003fb-GY for qemu-devel@nongnu.org; Fri, 19 Jun 2015 00:16:56 -0400 Received: from mail-bl2on0053.outbound.protection.outlook.com ([65.55.169.53]:26656 helo=na01-bl2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <alistair.francis@xilinx.com>) id 1Z5njW-0003f4-Ev for qemu-devel@nongnu.org; Fri, 19 Jun 2015 00:16:52 -0400 Received: from BN1BFFO11FD015.protection.gbl (10.58.144.33) by BN1BFFO11HUB024.protection.gbl (10.58.144.171) with Microsoft SMTP Server (TLS) id 15.1.190.9; Fri, 19 Jun 2015 04:16:47 +0000 Authentication-Results: spf=fail (sender IP is 149.199.60.96) smtp.mailfrom=xilinx.com; gmail.com; dkim=none (message not signed) header.d=none; Received-SPF: Fail (protection.outlook.com: domain of xilinx.com does not designate 149.199.60.96 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.96; helo=xsj-tvapsmtpgw01; Received: from xsj-tvapsmtpgw01 (149.199.60.96) by BN1BFFO11FD015.mail.protection.outlook.com (10.58.144.78) with Microsoft SMTP Server (TLS) id 15.1.190.9 via Frontend Transport; Fri, 19 Jun 2015 04:16:47 +0000 Received: from 172-16-1-203.xilinx.com ([172.16.1.203]:35786 helo=xsj-tvapsmtp02.xilinx.com) by xsj-tvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from <alistair.francis@xilinx.com>) id 1Z5njS-0005Zi-RU; Thu, 18 Jun 2015 21:16:46 -0700 Received: from [127.0.0.1] (port=41408 helo=tsj-smtp-dlp1.xlnx.xilinx.com) by xsj-tvapsmtp02.xilinx.com with esmtp (Exim 4.63) (envelope-from <alistair.francis@xilinx.com>) id 1Z5njS-0004ng-JY; Thu, 18 Jun 2015 21:16:46 -0700 Received: from xsj-tvapsmtp02 (xsj-tvapsmtp02.xilinx.com [172.16.1.203]) by tsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id t5J4CObH013591; Thu, 18 Jun 2015 21:12:24 -0700 Received: from [172.19.5.153] (port=42900 helo=xsjrdevl46.xilinx.com) by xsj-tvapsmtp02 with esmtp (Exim 4.63) (envelope-from <alistair.francis@xilinx.com>) id 1Z5njR-0004nd-OU; Thu, 18 Jun 2015 21:16:45 -0700 From: Alistair Francis <alistair.francis@xilinx.com> To: <qemu-devel@nongnu.org>, <edgar.iglesias@xilinx.com> Date: Thu, 18 Jun 2015 21:16:45 -0700 Message-ID: <66c7c9171d9d172b68b952625f2f1ac932f9b043.1434686378.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.1.1 In-Reply-To: <cover.1434686378.git.alistair.francis@xilinx.com> References: <cover.1434686378.git.alistair.francis@xilinx.com> X-RCIS-Action: ALLOW X-TM-AS-MML: disable X-TM-AS-Product-Ver: IMSS-7.1.0.1679-8.0.0.1202-21620.005 X-TM-AS-Result: No--9.382-7.0-31-10 X-imss-scan-details: No--9.382-7.0-31-10 X-TMASE-MatchedRID: dV0u7CPuH2rdM4TtXgVTNFVN8laWo90MaN2KuTwsCwKKmeQRN+6ggw1U 4SKH6t6vJbFvQR1FTZSIY8ivHy/5E3i25HfozijkFxqdoICq+IZMkOX0UoduubzZNXfJG3+a5IK dok6w7HQQx7hi2RyPf9QoRmmxDqUUl722oUhn92DJ5W6OZe5hhX0tCKdnhB589yM15V5aWpj6C0 ePs7A07QsfaqMZktsd0uNbFtG2sYjYMmxtd2AN+ixKpKUNNf8qu1hDX91q8NM= X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD015; 1:XVYSS1+ZjPLeUgBF9heh8WhN0r2QM0PuaeYJoeUlQ3dCssDntRsTbNCzde4znjGpFv3oAYy2xPj8OAbd7VdqDDIGfoF0aHC0ChkTkzgbBtasAN7jFpmKwJZywPzGvH+CqRWlu+2FsO7X3uRQyB7LR9FAw4grhP75vJIb2FZde8HdNJU7imVX8hNTsqP/oZFYWhcYHVeDxqejIAi47AZHvPRSSg2GSXYbma0T+iubZr2zGrEhl0kYWAXt7g8sgMfh80E2dd3rmDf3QeKjDgTjbdeNthXrvKFeploBsKmxWn9s1yGPKQ3slbxlcV2c7uUKDqNcaXGAzg+kvVSjJ9xSLQ== X-Forefront-Antispam-Report: CIP:149.199.60.96; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(2980300002)(339900001)(189002)(199003)(50466002)(2950100001)(33646002)(46102003)(118296001)(87936001)(71366001)(85426001)(6806004)(106466001)(229853001)(50226001)(92566002)(76176999)(50986999)(47776003)(19580405001)(48376002)(575784001)(86362001)(19580395003)(77156002)(62966003)(77096005)(5001920100001)(81156007)(5001960100002)(5003600100002)(64026002)(105606002)(107886002)(5001770100001)(36756003)(189998001)(107986001)(4001450100001)(4001430100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1BFFO11HUB024; H:xsj-tvapsmtpgw01; FPR:; SPF:Fail; MLV:ovrnspm; MX:1; A:1; PTR:unknown-60-96.xilinx.com; LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11HUB024; 2:6YKs+moGypFStP6HrKwNEskW2hD16TjPNMPiedhFQuaLWae4r4gNTJc4AvaP1oJ0; 2:U5Lj/yFFW0i6lc6m1dJZPxi7t+1ZqMycmi7HjEDZO4T/LlIxOO5OWefSmJUjTGMWlTEbKKoKacF/K0b0rdzBtlRJbtMaGSGD9q7qgB140NMH6MwDSUtLgjfmvrv93WAJdAAPQGESm/kq72IbuhRIt8bW4ZKnpEbAXRWyX8tX+NSnHbgaVU0z9cx+o3f8miiNIZfj0Hjq4NTuhQ4JisFcjmYv9JN0aUhjYQ0G4ViFDdE=; 6:eXq/7u+9wBL5hKWzsuYd6jJJPJokIbYQ2MPhmqarjLUwJXfCRCNTFlfx3avbH50R/3TScF/XzRHqFSRRELvj90czuDieYCJkZ6Do0VmPxSHjohgXNe6/3qME1bRczWZhFnzgAdRs0jg8v8j5o6Wn3f82VczvJpYa7eYNGC1Y9zbrnPkAokNzHHpQurlGiHSVMcOHHXh+JW/UkcUTEw823SSCYO0GnUhNiUjbMj16ODb4Zf7wniMU9AWg7P+n2XqOvtc5MB489LujRpg8r5LE5hq1TsXrqBMT+rPCkhiNcPnfbZVStPfmqJpjqJhA78X5i1XQLKceQhtCJfXR4Py0CYwQbMpZuFV2LppZP2F2/4TwXMcjGOvcrUk6PQTOW4fxeSWBj6D2JD0joXmzXineg9Vhjerv1fYoBNTlJcIOHkudgUWGIKvMM+QbZjMFez6xU1oA3h4RkmMQssl2QaZxocpqsyqhMo+dC8lTItgWIbt33wZobQ1DeYwn5wyAI0RV X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN1BFFO11HUB024; X-Microsoft-Antispam-PRVS: <BN1BFFO11HUB024311F54E6214F724CEF1FE2A40@BN1BFFO11HUB024.protection.gbl> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:BN1BFFO11HUB024; BCL:0; PCL:0; RULEID:; SRVR:BN1BFFO11HUB024; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11HUB024; 3:o65GPuaiFyriLMjRp2tVE1FJnbIxUP/xji/rDruIhywKD/5Ww50z4NqDbIGFNV5TcW2rP1PoBZHmju6hBL7TAMRoSjRqKPM26pUuYcL59tB9IcMQ2hJAqOPzUFV5r1/RztoXOV7elxsKihUpQqmsiTxFdXEjRLYT9Vy1LuSncPQ5sAqiwE9A+3y6GYCwvZLkmewdG3ht6fVILmlACxDAnFhLp5EbZ+SUYc75TwfxB9hozOr2YJot5QpcZlqrzt1VpnPhpCovDlKHx1p3eVR2GI2OaY3rsDPPYu1jQLoNEfw= X-Forefront-PRVS: 0612E553B4 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1BFFO11HUB024; 9:WzsmNdO3eC+qKlg0AWInB2aYdBQGgcPXNXR73X3J?= =?us-ascii?Q?rrXlyQJ0px/O7eOB0BVge69KcaKEeBFAkuQpM5n4FGUqzYxYgyQT61mb9B3f?= =?us-ascii?Q?XvYWINkuYpoVjHw9QQrw+4+/mBZbLWrLwdS5uTU5Q+p/iLsIoe7BPNvyCu23?= =?us-ascii?Q?9PvZuyCx+tiXYdJwkBqtruyN8P/5mOJPhw9do8qnvBOvTU80ThcR3R6fX41D?= =?us-ascii?Q?EIgfp/JWON1P/VUznFIJrrnf+lp7N7SNAQrmrLLcV3YCzpGDdEe24vaYu0Uj?= =?us-ascii?Q?lSfdX+gwnx6DR7qAtB58qMH2yHfjZVMT9N4ZHwlU540d29807kJZ/bw/IKK6?= =?us-ascii?Q?zK+d19es9n+myA3Qy3IQAzQKsGvZuM9senSlTQIiFadPQt2H8sfRgaRR9fnI?= =?us-ascii?Q?8+MkwMP9F502MOFAZozYPocu6vP68uLhXz7xMfx2NDQj95LAsKKuQkCnOszE?= =?us-ascii?Q?+L1kW8WIYUlwWtAqZswtaLTPkIZkPxZwnogHt9mgE3a0wo8ftQfqKcnOvEeG?= =?us-ascii?Q?EwoNKoVd6hCm0aG9J46laUcTN7fQ+grnNIl2BbHNP7AGY0GKEQUgJ0jLFL5j?= =?us-ascii?Q?DbVWIooKuW1WjDYpA9mF9ddaCo6uobqrS/sBcDcc8UC+pFw9CCh+T3XdjYFQ?= =?us-ascii?Q?1o5+zEeKCcX5rltvITz5zSw2uXNfm8E0v4706ykQs4Xzzw1BsmsssDwfh5Xb?= =?us-ascii?Q?XwBlIrET7Pz6DvFt28dW7UDvqh1ZE+VmQYQ/O6ztNTwxZmMcSgQz3tSol+0A?= =?us-ascii?Q?SgOZGEHq9DjbxCFi319inuw7so3Ywks8r8Y+Fz4+wVREA67QRfJ4I/g7c7uG?= =?us-ascii?Q?A5Pw9TgCHJ1O9asC1GdaghzuigCf2BpfgpIkQ0V5OKnmSEtMFJj9hgW0aj8Z?= =?us-ascii?Q?i4G2KdHgC1O+MXcXKl8tMok+cr3d2jKCvVpGhQS3+99EcsnQ2XUeEkbPc67l?= =?us-ascii?Q?iuaLPmvo7TlumZw4aFRXH8NItxp+zV6UT2ov0OuvTzVZ5eoSKyJFYIAz563h?= =?us-ascii?Q?1w/V7ImJwT7WCy5pSdImlX8JYdCiUeay1za62L6lyPNJCyPC0jGlYMmpyRGq?= =?us-ascii?Q?/dwluzaXFENHdCuG/9iZJfwPYuzDaW67vQrSSejGY6Z75mAc/40gaGo6nyuy?= =?us-ascii?Q?6xvn7TmvEuE=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11HUB024; 3:knaaTzo4SAKEKO50eIidiimRiXv9TZEJcTYwpq1hbe+jyA31OhyuIT5aAqWD+TtW2QfCoti0F2Lhe5+feX7Hj4gE9/HxQ4veG4SDX+cpDRQHNZnpDldseDBXPZpBx3/tUqntKsJQNwh0J9BjAheySQ==; 10:AZmbKPW6YXEW42DWlXVhqsLelhkSM56m3pmVe5BmTqcPqpTWIAfmoA5GLJGa5fy9KP7XXzET1/U2hqqVu/G6nSQHNQkY8Wp2eJQPnE/szSc= X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jun 2015 04:16:47.8035 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.96]; Helo=[xsj-tvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN1BFFO11HUB024 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x (barebone) [generic] [fuzzy] X-Received-From: 65.55.169.53 Cc: edgar.iglesias@gmail.com, peter.crosthwaite@xilinx.com, alistair.francis@xilinx.com Subject: [Qemu-devel] [PATCH v4 7/9] ml605_mmu: Move the hardcoded values to the init function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org |
diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c index 609c90b..ed84a37 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) { @@ -205,10 +194,15 @@ petalogix_ml605_init(MachineState *machine) } } + /* setup PVR to match kernel settings */ + 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); }