Message ID | 29de6da02b4332c16d91d651fff11b7a07624e5f.1434412857.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 BD8EA1401EF for <incoming@patchwork.ozlabs.org>; Tue, 16 Jun 2015 11:18:51 +1000 (AEST) Received: from localhost ([::1]:37080 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 1Z4fWb-00033C-KC for incoming@patchwork.ozlabs.org; Mon, 15 Jun 2015 21:18:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52941) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <alistair.francis@xilinx.com>) id 1Z4fUp-0007uz-Eu for qemu-devel@nongnu.org; Mon, 15 Jun 2015 21:17:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <alistair.francis@xilinx.com>) id 1Z4fUk-0002yt-7j for qemu-devel@nongnu.org; Mon, 15 Jun 2015 21:16:59 -0400 Received: from mail-bn1on0086.outbound.protection.outlook.com ([157.56.110.86]:2812 helo=na01-bn1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from <alistair.francis@xilinx.com>) id 1Z4fUk-0002yi-10 for qemu-devel@nongnu.org; Mon, 15 Jun 2015 21:16:54 -0400 Received: from BY2FFO11OLC009.protection.gbl (10.1.14.32) by BY2FFO11HUB011.protection.gbl (10.1.15.222) with Microsoft SMTP Server (TLS) id 15.1.190.9; Tue, 16 Jun 2015 01:16:52 +0000 Authentication-Results: spf=fail (sender IP is 149.199.60.96) smtp.mailfrom=xilinx.com; nongnu.org; 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 BY2FFO11OLC009.mail.protection.outlook.com (10.1.15.0) with Microsoft SMTP Server (TLS) id 15.1.190.9 via Frontend Transport; Tue, 16 Jun 2015 01:16:52 +0000 Received: from 172-16-1-203.xilinx.com ([172.16.1.203]:43058 helo=xsj-tvapsmtp02.xilinx.com) by xsj-tvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from <alistair.francis@xilinx.com>) id 1Z4fUi-0001YY-IF for qemu-devel@nongnu.org; Mon, 15 Jun 2015 18:16:52 -0700 Received: from [127.0.0.1] (port=48679 helo=tsj-smtp-dlp1.xlnx.xilinx.com) by xsj-tvapsmtp02.xilinx.com with esmtp (Exim 4.63) (envelope-from <alistair.francis@xilinx.com>) id 1Z4fUi-0007z2-BH; Mon, 15 Jun 2015 18:16:52 -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 t5G1CUNL029457; Mon, 15 Jun 2015 18:12:31 -0700 Received: from [172.19.5.153] (port=45534 helo=xsjrdevl46.xilinx.com) by xsj-tvapsmtp02 with esmtp (Exim 4.63) (envelope-from <alistair.francis@xilinx.com>) id 1Z4fUh-0007yz-Hi; Mon, 15 Jun 2015 18:16:51 -0700 From: Alistair Francis <alistair.francis@xilinx.com> To: <qemu-devel@nongnu.org>, <edgar.iglesias@xilinx.com> Date: Mon, 15 Jun 2015 18:16:51 -0700 Message-ID: <29de6da02b4332c16d91d651fff11b7a07624e5f.1434412857.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.1.1 In-Reply-To: <cover.1434412857.git.alistair.francis@xilinx.com> References: <cover.1434412857.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-21614.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; BY2FFO11OLC009; 1:B+rxMbbEmy5w1KAg/51XNLiZCIulVBmDaQ8NrGJx3p+3zliiOrAmtHoWmxVnBFK7w2URGsQRz4M4f1oe4j7KsQZXBnlMAvRF+/L4G+WbHmnVLCMiU5OeUYxbd958FaftFB6mJ9eANuQYIfWc+NjaA2Apdw7Lf98tegPThxg9WpXq91zwpswr+5HpU9QvDGXGhugry1HMnL7TXTfpLe9rqfK+ZrOOkLN5nzwJMiE7IJLDpuX1j1ywiEmylPfAhRIkdFRfH40AwiFJO8Fx4SyGm3VQzVTBVTQBtWQj3Bv4NS4= X-Forefront-Antispam-Report: CIP:149.199.60.96; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(339900001)(189002)(199003)(105606002)(118296001)(86362001)(575784001)(5001960100002)(107886002)(2950100001)(450100001)(87936001)(229853001)(6806004)(106466001)(50226001)(77096005)(33646002)(19580405001)(85426001)(19580395003)(76176999)(50986999)(48376002)(50466002)(92566002)(62966003)(71366001)(46102003)(77156002)(189998001)(47776003)(5001770100001)(64026002)(36756003)(5003600100002)(107986001)(4001430100001)(4001450100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2FFO11HUB011; H:xsj-tvapsmtpgw01; FPR:; SPF:Fail; MLV:sfv; MX:1; A:1; LANG:en; MIME-Version: 1.0 Content-Type: text/plain X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11HUB011; 2:JT7pGN9VRKNo0h30MB2CUqCSc7pX8W4BVNFwifOGIl6kdISyNvbhoIFQlqkiavv3; 2:5N4xc5br4oW+OBCszbf6KtknVVKgxGAzU336KAfe74QQB19hcZYBZtWuGucJ5DVifXMKMsW//6lMdbzn83KjhMhNGqKi6rvSdysuZGfWg4QrGTdqZYm67CfG7mKIcuQgv13ptz+cn3eCLbVWFKAH0cmr5kHVr4m1HyibBm/jsaFvB+Su+aokx0/Suk7J3Luc34Tqs6E24Hhw8NuKxOhwR2g3nsRHpTXaIlTclTUTDn8=; 6:OiGlp0QIhQHdBr6PKKg6/+ztshkS1+j1LA7luaWJtzY/pPGWSQZbpP6TAwvq6ci53t2t4t+/UO+gEeowHyzPlI1iq8d6c/DhgsXXRBaSa4flwhI0uibYPUgYuJXU7pOy18N8WXh79YT2NbDjl1Lv3AwuXEfnX8ODT6mjclJBec/FJma0XSnIlOU+TEUT9v0G1zye3xEQwR1O+X4ChO40FwVIVXeqQqnt/RRu6aTodHBu5YbY6gYiOsFlfyOoE52S2mMjkRuyzyDQjLA84B+Q8PIMpS/5B4c2d0AdeY8fzAcB4ITL0tJ1+kFPRzs4lcZfPTX7BV7FQp7cV1tYwC5nTysKmJQbxAKPHwyMIrQWZ22Wp40FBIzua9yuK84Q58lfqUTVQSNphPiLUa0WQV5HJeg/2ypR0wGbsrbpQWWQxDY1ecQldJNMJDAk9t3lh+E3btOTY2Y6RlDsaSh/h+W1Y248fBiYmqSdzl8IMr44Ayi8YSpWwCZrTJgKY1oW0hXL X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2FFO11HUB011; X-Microsoft-Antispam-PRVS: <BY2FFO11HUB0116A95B6A499080E112C60E2A70@BY2FFO11HUB011.protection.gbl> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(520003)(3002001); SRVR:BY2FFO11HUB011; BCL:0; PCL:0; RULEID:; SRVR:BY2FFO11HUB011; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11HUB011; 3:trWsJ3O9XINgj4um1ER/9BbUO405mvR+S6yMlGDfaUcX/OjIGxA6h8xSx8beKddmze7P+T3Im5xP7Z2pO/DUjfWLxrrl0yiDHh0TVr4rezC5NwcdzIy87B65DxVAzKndqulunDNr3uV1Dcm1dkqdhp7ZfIT+YDU3lv9Iy5AnYeFm19VjWEWbh74l95wSDRbljadMwmwxjnU0ZPbf/qxmZ0PSCgSHnM4u1TJDs/wr2bToGJZ1RNSUT8SEgiG39QYO2Kt8qpCkMjF4RESf17sHok5rIiyxD2rUhMWcd42kIMe8C+2vWqalOWIJ/zY9M//o X-Forefront-PRVS: 06098A2863 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2FFO11HUB011; 9:+K+XlFPUPvZg4RioAKH3/JdCAWDALTEaLGuOT4KaG?= =?us-ascii?Q?uuIyZ9CLTqsVkW4p26wfI2efe2103axkPzWHwbolSQAUZMlip5vlOxOL46uM?= =?us-ascii?Q?1JvcWVVTIUgz6PE/KzgmbJSyTUBI4kIRHZZD/nSu2cb630tNBQ6jMLliJlNx?= =?us-ascii?Q?S/evNBvFwR0E6SkWlzeO+NWnHM7dBeoQzx1ywYtLugeqEM9sNOCVSfgaTUVx?= =?us-ascii?Q?C+m8u/WY3jYESKooPcBVoORdzgh1JkSEYu+BY8C+oZuvGswJIr4omQaPy4a+?= =?us-ascii?Q?sDBSgUPVF4cOUGv5/zDe5XINfatqPAsVlOHVORG3GUQBsxE7xaQzik+zzzrF?= =?us-ascii?Q?WQRGi1/sK0LKq4j44AL+MAaexS+T2Jjb8itZXVG9eW5E4FnVdAVus3QULHA4?= =?us-ascii?Q?b9uajifSbjrfQS+nL4pAUtI1kQP38WIKzFBJf4dh98s4eV0GXdYxZjVgBSim?= =?us-ascii?Q?leZI/8h8uBDwFCR/AFbakHeoLhJgzbvgX7rAfO7jTxd3uuIeMA4XEcmDSwgz?= =?us-ascii?Q?MzKXYq1AMa59ZdXUP7HIWcTVaLsxXslNRb/1ZElF+gRFbK3MQ0LjRI+1FzB2?= =?us-ascii?Q?BIETu1G+wFasnz2Dga7R8z6dxVTCIxZF/x+YStS++lfYiTybz+e2u5kfBBwK?= =?us-ascii?Q?CUMjqD4ULayD2UsQqdXn4PDQcvtvDqB3F30Z9ru6d28SmSNVXPmnQGO2Myo0?= =?us-ascii?Q?wxFF3hpELFQoD3NLc9+ogoRaWs1ada5FA4Qj9F3D74DzptBnuWDN1832RJxK?= =?us-ascii?Q?dzC7lQHH55QovAM0+lesuxB2BD95aLY9jBY9I94OhMAeFR+3fffe7IdlPOlJ?= =?us-ascii?Q?ObJPt3MQQoipj767EM0xSosEijEEun9yhyVTgVqVYpn91aCsqV3ACrcNT2VV?= =?us-ascii?Q?upOmYxL2y8/xx3cokpf6bYCd6M0Ums/jTcqUIvizCdaR/rHYURtJiwzcXtjl?= =?us-ascii?Q?n6U/8oKWfFyBU2E+zTgRY6sjzgBMyvNcS8ax0TbQsjCtAeTLxB5FcodDjden?= =?us-ascii?Q?9z5gsfcUPKHEm1lXoI3rWceUQMhEIr4mlsNSYQjtLWtm65cPXBQo9grrzhfO?= =?us-ascii?Q?fc+PGMl4JIZojpazBBl5kguzmrX?= X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11HUB011; 3:OHf7YUMltA+KwpjPXRd1cRA5lR0NQGJ0CndLd+xfi7ilHCY9VopGLXsW4QuO2Pim4KYTQV/DqFYW/eFnGaHBGJQjKNeuA9t2dZgyWr+XiRwV3qSl/AjpwWcSUHauamYW9VfbPrpzYrENb/LOJl1NRA==; 10:pCS1ZCXzB+gj0i9QGTgH1Kz8YPQJt0o4j1BVBDjjzqcM6q82yEICND1g3qQVqtifJM+aePEraKBzXNzxqSKOQO3XoFkNJLhUj0f1sDbEWbs= X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2015 01:16:52.8675 (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: BY2FFO11HUB011 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 157.56.110.86 Cc: peter.crosthwaite@xilinx.com, alistair.francis@xilinx.com Subject: [Qemu-devel] [PATCH v3 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); }