From patchwork Sat Apr 27 07:12:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artyom Tarasenko X-Patchwork-Id: 240091 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8E60F2C00FD for ; Sat, 27 Apr 2013 17:13:02 +1000 (EST) Received: from localhost ([::1]:36194 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVzJc-0006RL-M6 for incoming@patchwork.ozlabs.org; Sat, 27 Apr 2013 03:13:00 -0400 Received: from eggs.gnu.org ([208.118.235.92]:37021) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVzJB-0006Or-AS for qemu-devel@nongnu.org; Sat, 27 Apr 2013 03:12:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UVzJA-0004M2-GP for qemu-devel@nongnu.org; Sat, 27 Apr 2013 03:12:33 -0400 Received: from mail-bk0-x22e.google.com ([2a00:1450:4008:c01::22e]:64295) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVzJA-0004Ls-9k for qemu-devel@nongnu.org; Sat, 27 Apr 2013 03:12:32 -0400 Received: by mail-bk0-f46.google.com with SMTP id e19so1575513bku.5 for ; Sat, 27 Apr 2013 00:12:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:in-reply-to:references; bh=dTasqYFr7FLkFGHqfRvONlVbnf4FcC6uL7kyRFnbTVU=; b=okbliCLvhMYCV2gGTnLK8r0OrYCpnyuZEwXI7kPQPeh7deoftLO33zvu9cJ6MhCktr 7KybdEI3Ja5k/V/1GJurugqbeu7OGX40/6dltPOmbD55yYRPMg3X5hrDGrgjY50RSHbh J0x2Sct0ApVOhe9DsfHkh5l94Gb2DqMoa5cjz2G7XLbTQVLseKi2Oy41yrpDdD1EgqLK wSNhDwDcXGg5YYoot0SRm+jMYvm9tzl1Cas+Sydij0zIZtLOgAE/lGAZW0tT6W6B2Gsy 8nTRRLuwZtApbxLpeskw0FV82I1RIebqW30HtqoEu3GCdUDRAw/yq4T2vttX2ZKH1drr siJQ== X-Received: by 10.205.128.68 with SMTP id hd4mr9181111bkc.23.1367046751584; Sat, 27 Apr 2013 00:12:31 -0700 (PDT) Received: from localhost (e181210163.adsl.alicedsl.de. [85.181.210.163]) by mx.google.com with ESMTPSA id f14sm4065672bky.16.2013.04.27.00.12.30 for (version=TLSv1.1 cipher=RC4-SHA bits=128/128); Sat, 27 Apr 2013 00:12:31 -0700 (PDT) From: Artyom Tarasenko To: qemu-devel@nongnu.org Date: Sat, 27 Apr 2013 09:12:18 +0200 Message-Id: <863d361cf3bdf5540ef572938caac3c780328f68.1367046225.git.atar4qemu@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2a00:1450:4008:c01::22e Cc: blauwirbel@gmail.com, Artyom Tarasenko Subject: [Qemu-devel] [PATCH 2/2] sparc64: Use the correct type of the Mostek NVRAM chip 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 The sun4u machines use an ISA Mostek chip which has MMIO, uses 1968 as a base year and no IRQ line. So, use the m48t08. Please note that this patch has its OpenBIOS counterpart. Together they fix recognising NVRAM in the sun4u machine. Signed-off-by: Artyom Tarasenko --- hw/sparc64/sun4u.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c index 5c2bbd4..bfb19d4 100644 --- a/hw/sparc64/sun4u.c +++ b/hw/sparc64/sun4u.c @@ -866,7 +866,10 @@ static void sun4uv_init(MemoryRegion *address_space_mem, fd[i] = drive_get(IF_FLOPPY, 0, i); } fdctrl_init_isa(isa_bus, fd); - nvram = m48t59_init_isa(isa_bus, 0x0074, NVRAM_SIZE, 59); + + /* XXX Ultra-5 has it at the beginning of the EBUS range, but we have + * serial port and other isa devices there */ + nvram = m48t59_init_isa(isa_bus, 0x2000, NVRAM_SIZE, 8); initrd_size = 0; initrd_addr = 0;