From patchwork Wed Dec 20 17:14:42 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 122487 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp5889507qgn; Wed, 20 Dec 2017 09:45:06 -0800 (PST) X-Google-Smtp-Source: ACJfBoto8rOQh3IAG+f7yPp/FzUW3kBfCXF45fdP/4OSgySciyn0EZHFE4mJx92NJswqV9h1Y/Li X-Received: by 10.37.116.86 with SMTP id p83mr6058889ybc.128.1513791906133; Wed, 20 Dec 2017 09:45:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513791906; cv=none; d=google.com; s=arc-20160816; b=bAWzBbA9GeBdrVrg9GC8XCVOuI6ChpAxcuqFV9FZEZwNs7a7raYi8PzlAua0ZHboL0 6Su6xyfV5a/itX3wSbSFP3Jkal6bMtzvwHQR69GQvJmViUgMqJAwgwAMco/osnPo9K50 S/TUmadOAizsj1W5aYHigAlJp0MIs4ueGJl0iOhI5GXa16yfPGjs3d625EPVzuwG1rsw 6xXV5S+keK7ayM97yhoYWNiYa1MURXHyOZoSYB/X840fD9/eRsQ/KHWUAr4INx8O7enn z74TNvWxb0KyE3ctytb3pmIKNHmWfJgLI1exIsOGkHjuyMxgAMiVL5KKBjCESVAJ9cjF mWzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=pKpkifw8hWxEpYyeYQK8s7k+qdEtLUZUQXiL1OTSFqc=; b=qCNX17uoMG93GsK1pCfJbOgXo18vz+k/tS440GsJ7kpeqnlJVtO4MFG1kcMLvOs/6e w2u8MaJxOoOoIWo+uTPPmC/cPyctyHyhjg8OqapoTDSxPmTPM5+XHfrWOnGmdgi0YxDg Cd5jnZBQYABCf67bQB3bkzoVJUDbM7HZ2yoCUnW/rzwnrH3zUZZ+zEi84aC4x6QS00HX Vg7i1EsPjpNVtGyXtAR4Mi81WvlgxY4bdm0Z5pJm+dyKSw3hF7zXTRtycNlxwL3r503N kPIUSRGF15qsKcW0r6DnJDUi3U4l0JAKGeo9p9R5gVmm8Zf3Nodvh2zi2KanAfPjpdNs b1KA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=Y1Q7M8AM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id r188si2893176ybr.616.2017.12.20.09.45.06 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 20 Dec 2017 09:45:06 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=Y1Q7M8AM; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1]:60611 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eRiQT-0003TP-Lm for patch@linaro.org; Wed, 20 Dec 2017 12:45:05 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56513) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eRhyT-0004mH-CT for qemu-devel@nongnu.org; Wed, 20 Dec 2017 12:16:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eRhyS-0007Iy-Cx for qemu-devel@nongnu.org; Wed, 20 Dec 2017 12:16:09 -0500 Received: from mail-wr0-x243.google.com ([2a00:1450:400c:c0c::243]:34988) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eRhyS-0007Ik-6f for qemu-devel@nongnu.org; Wed, 20 Dec 2017 12:16:08 -0500 Received: by mail-wr0-x243.google.com with SMTP id l19so10550382wrc.2 for ; Wed, 20 Dec 2017 09:16:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=pKpkifw8hWxEpYyeYQK8s7k+qdEtLUZUQXiL1OTSFqc=; b=Y1Q7M8AMfAQURJ8tTdX0F6yrWPpPk+nJq9I3CmJrcbis1TLtMso9UdtdpGcfPIIBoF wcglC2brR41jaJG/oOEJP+uuhn1AomNWH1T/Cr1s5hyNKGDN1b7RjkVxSu/XCTzAFtS6 dsJQrdaEZ+lmSN8WDrcz23Q4wVhHIYgXD1DEKGpGhzS1adPOOfkf4EsTwvAbrR9UCFKt AYSRCu0C0S6ld+btcz9AA0IsftIjLqYyzvP9+1TavP+2vDMoedeiBQTPFF23P7Y1y2xQ MMfTCK6qbIdbjIgUyfHcw012b8eBoUyr3AJPmh+7qH36zfrbOdEUo7ic0zEnEwPsvRSR 6Rvw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=pKpkifw8hWxEpYyeYQK8s7k+qdEtLUZUQXiL1OTSFqc=; b=q39RnM4RJBjvne4bSt2U+UwfB9BaWWwUDrJTLDQaSU1HVLzMvmUejcGVywUEDNMYEb mYrq+5iOMiCyhKrHcjmy+jnISfgtCb83f5plWXGr+3796Sdll/uRD82NA01PrPtVGcns 2mRO7xcSbp0MKtYBfh2SYhf5DFwsX6kUYuqDjqXdvtpoFtZbJt7F4sdHxUtcbJAcsRaL ukwKsR5SlcVhSxdMnLQ6vxMdXZPpiVxvxq5StEEg0geeUPZEVWPx6+qDiIYTWYmbgys5 uxoHLGmH6jH+IbiMChVKtFXNj4MjlrcKWdyjuPxofBZqmoH9+umXp+LuR9KarGGFNXdU qnBg== X-Gm-Message-State: AKGB3mJkEoXYsmGiWiCJKh5NPdEz73DL3lENOHkTF9NqFKaNkVwdY6gB 1dbRKmQhSwUknrbkUYGOLPZN97U3 X-Received: by 10.223.152.178 with SMTP id w47mr9755188wrb.254.1513790166953; Wed, 20 Dec 2017 09:16:06 -0800 (PST) Received: from 640k.lan (dynamic-adsl-78-12-251-125.clienti.tiscali.it. [78.12.251.125]) by smtp.gmail.com with ESMTPSA id f125sm2751101wme.45.2017.12.20.09.16.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 20 Dec 2017 09:16:06 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Wed, 20 Dec 2017 18:14:42 +0100 Message-Id: <1513790098-9815-31-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1513790098-9815-1-git-send-email-pbonzini@redhat.com> References: <1513790098-9815-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::243 Subject: [Qemu-devel] [PULL 30/46] hw/mips/boston: Remove workaround for writes to ROM aborting X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Peter Maydell Now that the memory system correctly handles writes to ROM for guest CPUs that may generate exceptions for decode errors, we can remove the workaround from the boston board. Signed-off-by: Peter Maydell Message-Id: <1513187549-2435-3-git-send-email-peter.maydell@linaro.org> Signed-off-by: Paolo Bonzini --- hw/mips/boston.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) -- 1.8.3.1 diff --git a/hw/mips/boston.c b/hw/mips/boston.c index 1cb4b6a..fb23161 100644 --- a/hw/mips/boston.c +++ b/hw/mips/boston.c @@ -248,16 +248,6 @@ static const MemoryRegionOps boston_platreg_ops = { .endianness = DEVICE_NATIVE_ENDIAN, }; -static void boston_flash_write(void *opaque, hwaddr addr, - uint64_t val, unsigned size) -{ -} - -static const MemoryRegionOps boston_flash_ops = { - .write = boston_flash_write, - .endianness = DEVICE_NATIVE_ENDIAN, -}; - static const TypeInfo boston_device = { .name = TYPE_MIPS_BOSTON, .parent = TYPE_SYS_BUS_DEVICE, @@ -481,8 +471,8 @@ static void boston_mach_init(MachineState *machine) sysbus_mmio_map_overlap(SYS_BUS_DEVICE(s->cps), 0, 0, 1); flash = g_new(MemoryRegion, 1); - memory_region_init_rom_device_nomigrate(flash, NULL, &boston_flash_ops, s, - "boston.flash", 128 * M_BYTE, &err); + memory_region_init_rom_nomigrate(flash, NULL, + "boston.flash", 128 * M_BYTE, &err); memory_region_add_subregion_overlap(sys_mem, 0x18000000, flash, 0); ddr = g_new(MemoryRegion, 1);