From patchwork Tue Jun 16 01:16:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alistair Francis X-Patchwork-Id: 484755 Return-Path: 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 951291401F6 for ; Tue, 16 Jun 2015 11:17:45 +1000 (AEST) Received: from localhost ([::1]:37068 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4fVX-00014Z-Ln for incoming@patchwork.ozlabs.org; Mon, 15 Jun 2015 21:17:43 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53019) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4fUt-00087Y-Vy for qemu-devel@nongnu.org; Mon, 15 Jun 2015 21:17:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Z4fUp-00031d-Vg for qemu-devel@nongnu.org; Mon, 15 Jun 2015 21:17:03 -0400 Received: from mail-bl2on0053.outbound.protection.outlook.com ([65.55.169.53]:16080 helo=na01-bl2-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Z4fUp-00031E-Rc for qemu-devel@nongnu.org; Mon, 15 Jun 2015 21:16:59 -0400 Received: from BN1AFFO11FD039.protection.gbl (10.58.52.34) by BN1AFFO11HUB033.protection.gbl (10.58.52.144) with Microsoft SMTP Server (TLS) id 15.1.190.9; Tue, 16 Jun 2015 01:16:58 +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 BN1AFFO11FD039.mail.protection.outlook.com (10.58.52.243) with Microsoft SMTP Server (TLS) id 15.1.190.9 via Frontend Transport; Tue, 16 Jun 2015 01:16:58 +0000 Received: from 172-16-1-203.xilinx.com ([172.16.1.203]:43066 helo=xsj-tvapsmtp02.xilinx.com) by xsj-tvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1Z4fUn-0001Yb-Ov for qemu-devel@nongnu.org; Mon, 15 Jun 2015 18:16:57 -0700 Received: from [127.0.0.1] (port=48687 helo=tsj-smtp-dlp1.xlnx.xilinx.com) by xsj-tvapsmtp02.xilinx.com with esmtp (Exim 4.63) (envelope-from ) id 1Z4fUn-0007zC-Hp; Mon, 15 Jun 2015 18:16:57 -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 t5G1CaRs030060; Mon, 15 Jun 2015 18:12:36 -0700 Received: from [172.19.5.153] (port=45535 helo=xsjrdevl46.xilinx.com) by xsj-tvapsmtp02 with esmtp (Exim 4.63) (envelope-from ) id 1Z4fUm-0007z9-Jx; Mon, 15 Jun 2015 18:16:56 -0700 From: Alistair Francis To: , Date: Mon, 15 Jun 2015 18:16:56 -0700 Message-ID: <47eb4ab88dfad58347b2cd872566af04b3dec034.1434412857.git.alistair.francis@xilinx.com> X-Mailer: git-send-email 2.1.1 In-Reply-To: References: 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--8.415-7.0-31-10 X-imss-scan-details: No--8.415-7.0-31-10 X-TMASE-MatchedRID: bmBzhk9GAxuNv0u2bxmd5ogQP9GwUC5raN2KuTwsCwIGW3hFnC9N1Zju 2HI2B0OeSgJB0j15cgazoCZpOz+88FMCj3zwc5fzFxqdoICq+IZMkOX0UoduuQqiCYa6w8tvr7a G4P3mCTkQx7hi2RyPf9QoRmmxDqUUl722oUhn92DJ5W6OZe5hhX0tCKdnhB589yM15V5aWpj6C0 ePs7A07c+mdjb1i6PwTr6gIcSuSZpU396TzLLdJNYwfMDYtL96en8TGiMSO+xWXGvUUmKP2w== X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD039; 1:tR/1xqJn6UclCtT5ytBU+4u/S/Mnn/sV8QfbWG1tg+WvFb76zZia07fd/tPjqdGIFHDIALoAQ1tAVAR5h3c4lWH64D0yDrpskITidGPCmb/XgzgLzwiAXppBC/QCRoNLbwzXVC6NQ/FR3JsrabNiC/iDfYgr1wco0hgKHQMUD0+nSmUiFKcY/C0+RgxT7jpy1NlTgM0H6X7KYw86hmoBOCampwzDMAHL+YIVXdmfOudmnMpnMNfalWbCYXzRirwUEHvnCrVklWw9UTKdnuk6W7xPobXzq2rfSXYWjaWqB5Y= X-Forefront-Antispam-Report: CIP:149.199.60.96; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(339900001)(189002)(199003)(229853001)(50466002)(19580405001)(77156002)(87936001)(36756003)(118296001)(71366001)(48376002)(33646002)(575784001)(47776003)(76176999)(86362001)(189998001)(50986999)(450100001)(92566002)(5001920100001)(62966003)(50226001)(77096005)(5001770100001)(46102003)(107886002)(2950100001)(64026002)(85426001)(105606002)(5003600100002)(19580395003)(6806004)(5001960100002)(106466001)(107986001)(4001450100001)(4001430100001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN1AFFO11HUB033; H:xsj-tvapsmtpgw01; FPR:; SPF:Fail; MLV:sfv; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11HUB033; 2:gXT/WiQP27/aeDC+J1GxGtDWMQy2xe0HgfAuC76Wz8omDrTdH0kz+SLzsR/OaKKp; 2:frLIDINiPy3JeV+VH6GqPvbccR8NNXOutlodSxB/88qatjIMDRozRAfsBD7sPYI+Cck4ozmYZzpwJzLqGbPywUKpCrO6vizc7XvHgdu6jEQnOdTfXjlw+DlxS/utEq4yhiAbIA0g/jz/3j+JUTVU9TFLM2SUa8Jv1yXnpA7zdyaBlnU8sw+V3lkydeK7LCoP7dZ8FGOSg0k7ZqFAd3MBR5b7BIRFtITU4UJ96nV/L0E=; 6:ivvCkPfEPtiRTtCgZAdksdsrfd2axh/ikbRNS/tevTN7gskLFQMaHVAasnyPkI8fK5/hS3Vpaq+gFBHz8IZASBB+KDuAMpQ78bfE1JeK/bP1Gqh84Zh0o6uxKsYBcn1hpMzht3O5JD6eeXnoEmCxmBLE/8qNIXqVuWspyD49hyYovTNv7s3sLQmQWKYyHjSJx/J0AdHmfYobmXldt1nSXvxDXYCvuwKrAoeIft9zNmdws6279DaLqz50hUPSopmZL4G+xZRqsMIGdCIqTG3NqVbRIfkCxgZshCKHBtfb9HUWUaeh+8TCiH2bCAxFPiIlMwa9eXbKPB0ZC+cfSkuAfzIrF2dsp/hIE/B0zPMQXBMDb5anLWFlT/nm/wx+szMCMQbX82biL2tx3A/XeFdQPdGLOJvCMwZMLsTUi60KDud6K91BfuRxRJ60ZpDA/fZhYMmneQ99S4j+rN7FrdwFk7PUBTCMT4bO9i3yl75Wtdym89xmOgJTixCWs+VcxGy4 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN1AFFO11HUB033; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(520003)(3002001); SRVR:BN1AFFO11HUB033; BCL:0; PCL:0; RULEID:; SRVR:BN1AFFO11HUB033; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11HUB033; 3:ITSTOziAw9oQzNvPP6WZCy+j5nHrEBS+fSufaEAZjfVQRtK+CegIai2Qn7H3d3MYxaExkknsU6MjbOfrsidPUKJsYBbX534lGOJem4uGuxY66/vHinT9VzordrTUnWGsHOsAooqS4wY7WARsRsfe4fwJHg0LWWSYIwe83DcA11S7h06AGBlL3QIpZS35pX8ou9ou16HySvPu/3BwpAv6lj6TSGma6P/jtF1k1pRp4rC4chtRLtx0zKLsbBG/xwjMOishsUuFcIePESy9aFfkO77oefe3f7GZI73WIq56xRQ9bc/gKlPEOsk5YMGotewm X-Forefront-PRVS: 06098A2863 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1AFFO11HUB033; 9:Izm6YOCl54dk9KBMujAqkPof6fZLi038oO/Xmydy?= =?us-ascii?Q?i6I2VliL4z1GmwMvjc/UkyJJgRnrPN2OOd4mWO0hIHkTGkpKzqlmaqbNnzLI?= =?us-ascii?Q?R6H0uj9464rzA3m9kJI5tdvQUCOWz2Ccs2daSbz/AIlVj5hO5Agh6oQaCCuN?= =?us-ascii?Q?lFpk7NEyckYHYBMWTLz1GTuWLcVXPpr0kYBllzvot1RhgIykS+vOa7sAFXx8?= =?us-ascii?Q?h2SiRjUt/Xb0mb3kNuW4vYzqmFf3zKzvB0xAt9IBXbvAZoqwGz84fpEoif/3?= =?us-ascii?Q?dcHVZhacJzYS8w6SF7XmaEoaTWG3iJkIUKLTASkL9LIpspkDe4wHYGMVtTp0?= =?us-ascii?Q?zMewpXSuX9msDqvKyYeYokOkMYiUOBNTVB69K/nesf6CcsaF9koip/gipPhV?= =?us-ascii?Q?ul8yRnlII5nW2kvn54POm8BLUu7ALArjcMyoa7xCgz5IIATadF2NFvBCdy0y?= =?us-ascii?Q?gAnwXyf7HyvyMziQ5gf+gGcjR9HjTopw0NaW6o9MCTfzz9uUwBIH8Abk1GBj?= =?us-ascii?Q?dJRRC3QyqxK31NxczBZFc3bsFvg2WWJvurpjBfllerLrirh39Iy7GdX6E8op?= =?us-ascii?Q?2XNjx5ofJOTVcx2Hy+wDbAUX+pyTqKyH5AYXwxBL9ERlNKzVFJMMxIbqMA8x?= =?us-ascii?Q?a9WOeBPRGo8pCRn6FhaxRXZtlydWtPWFoIjCyljnSnLlrNT/vc7aNh7l/UK2?= =?us-ascii?Q?pOhCD8qapO01r7m3g2nUTU3VTq26WRAs/2xlkSjLBN2U4C1E+5dinvvyyuZS?= =?us-ascii?Q?SzD8Yflspjb64TNdDanb1H5IS/MOCMOgu7UHJXgN6iBr4Q/GERbbk7NHj4gI?= =?us-ascii?Q?NpW+Ujvyxp+6eUg4MW2cX4CfXDjSNQBvNQmYdX2GBzria9TvflK9sVgoTFu9?= =?us-ascii?Q?5qYQEBlJ1Z/JdcZ/t72EJBcSq1KhQJ7oicYL2NyU0xzbXaRHALcFtAunx8SH?= =?us-ascii?Q?gSsuDzlf6Ri3S4BYbqNLLynVonX9Oe/4QwS+yOh1UsXD/cns8vM7grJ0Yk8Q?= =?us-ascii?Q?ItOQ0soA5Y9VFJog7Fbs2iCAKzJGQEHfMdV99xttl4vlDYAuw/JzRJDAMu1/?= =?us-ascii?Q?Py39wWNmrVonpjV26o+LCDcYYXBhnNIm8Tz90Kl70PVYGQ5ZPQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11HUB033; 3:M0Q4Ox1owVK3KGXaoeZYdRUNVMMxeG75x95lN3UEtCB2SCu9SxaYxhe5OtT16vk6OTyGQIPWXio+IKlIsAQDfesvquV74AQ2r51b/3OSpl+44zWfNoivEFSeYw6BS69Zq9f4Xk1P3vz6JXC2SpZg6Q==; 10:AhluJLH4bDPPOJAIwEmsdEYjxa/py5sDUJTaOtXABEYCrs9dC/1wFcJwwffOcSbUCHO9tcohk8+M+rLs6m6aLFoXN/dX55lDtnMeEQ4gSTY= X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jun 2015 01:16:58.5393 (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: BN1AFFO11HUB033 X-detected-operating-system: by eggs.gnu.org: Windows 7 or 8 X-Received-From: 65.55.169.53 Cc: peter.crosthwaite@xilinx.com, alistair.francis@xilinx.com Subject: [Qemu-devel] [PATCH v3 8/9] s3adsp1800: Remove the hardcoded values from the reset X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Remove the hardcoded values from the machine specific reset function, as the same values are already set in the standard MicroBlaze reset. This also allows the entire reset function to be deleted, as PVR registers are now preserved on reset. Signed-off-by: Alistair Francis Reviewed-by: Edgar E. Iglesias Reviewed-by: Peter Crosthwaite --- hw/microblaze/petalogix_s3adsp1800_mmu.c | 9 +-------- 1 files changed, 1 insertions(+), 8 deletions(-) diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c index 84f6e74..7109e63 100644 --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c @@ -51,13 +51,6 @@ #define ETHLITE_IRQ 1 #define UARTLITE_IRQ 3 -static void machine_cpu_reset(MicroBlazeCPU *cpu) -{ - CPUMBState *env = &cpu->env; - - env->pvr.regs[10] = 0x0c000000; /* spartan 3a dsp family. */ -} - static void petalogix_s3adsp1800_init(MachineState *machine) { @@ -132,7 +125,7 @@ petalogix_s3adsp1800_init(MachineState *machine) microblaze_load_kernel(cpu, ddr_base, ram_size, machine->initrd_filename, BINARY_DEVICE_TREE_FILE, - machine_cpu_reset); + NULL); } static QEMUMachine petalogix_s3adsp1800_machine = {