From patchwork Mon Feb 25 16:44:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 15070 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 5D3F023E02 for ; Mon, 25 Feb 2013 16:44:44 +0000 (UTC) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by fiordland.canonical.com (Postfix) with ESMTP id EC4EAA180C2 for ; Mon, 25 Feb 2013 16:44:43 +0000 (UTC) Received: by mail-ve0-f175.google.com with SMTP id cy12so2313690veb.20 for ; Mon, 25 Feb 2013 08:44:43 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=3AnJrLLhjlBdD7y2/J7YLuPLdaUwWZnndNo5b6HDejw=; b=d+N0DHDAIdfSt8LwohdcJqu2eycI/5PYnpCTDgrkN0TofKbsaKStF42Rx4oKpDxiNA trkcoYXmKhqS7fLg8Y5256YpqtnS+w/oruIXYp2lv1jaFSjhjpeHWPGMEBoHd3+smimD J6HdYlm+/mT/367EiRmQ8BKuiLsu5eKslVzHUDumfowbTsX2aYSCwBe1N2P+ccIJdMNz lfX0AcAPxR0Zz4WZlN/KPie1BiNLm7siVHdbnVG0kVinHsPwofkot25NUSZizlTy0yxl T/rlWet4ROlYDZMIkner8CyJder5IPw7Xlrhkhz/sExDSieagDexMUM0Fj+JVjVByGOO j8RQ== X-Received: by 10.52.18.148 with SMTP id w20mr8865908vdd.8.1361810683477; Mon, 25 Feb 2013 08:44:43 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.145.101 with SMTP id st5csp67553veb; Mon, 25 Feb 2013 08:44:42 -0800 (PST) X-Received: by 10.112.101.130 with SMTP id fg2mr4699016lbb.64.1361810677674; Mon, 25 Feb 2013 08:44:37 -0800 (PST) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id fx2si5060965lbb.240.2013.02.25.08.44.36 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 25 Feb 2013 08:44:37 -0800 (PST) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Authentication-Results: mx.google.com; spf=neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1UA1AH-0006tW-9Q; Mon, 25 Feb 2013 16:44:33 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= , Anthony Liguori Subject: [PATCH v2 03/10] hw/arm_sysctl: Implement SYS_CFG_MUXFPGA writes as a no-op Date: Mon, 25 Feb 2013 16:44:26 +0000 Message-Id: <1361810673-26473-4-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1361810673-26473-1-git-send-email-peter.maydell@linaro.org> References: <1361810673-26473-1-git-send-email-peter.maydell@linaro.org> X-Gm-Message-State: ALoCoQnbOY4yK6O6IppHKBUHan5CLgYqQB5KosK6v5gQPktUI/bnCsJSs8rZHN0VGRxOqBKy71f8 SYS_CFG_MUXFPGA allows the guest to select whether the video output should come from the motherboard's LCD controller or the daughterboard's one. Since QEMU doesn't currently support selecting the video output like this, implement as a no-op, so Linux doesn't complain about the register not being implemented. Signed-off-by: Peter Maydell --- hw/arm_sysctl.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/hw/arm_sysctl.c b/hw/arm_sysctl.c index 64e9ad5..960b664 100644 --- a/hw/arm_sysctl.c +++ b/hw/arm_sysctl.c @@ -272,6 +272,17 @@ static bool vexpress_cfgctrl_write(arm_sysctl_state *s, unsigned int dcc, } switch (function) { + case SYS_CFG_MUXFPGA: + if (site == SYS_CFG_SITE_MB && device == 0) { + /* Select whether video output comes from motherboard + * or daughterboard: log and ignore as QEMU doesn't + * support this. + */ + qemu_log_mask(LOG_UNIMP, "arm_sysctl: selection of video output " + "not supported, ignoring\n"); + return true; + } + break; case SYS_CFG_SHUTDOWN: if (site == SYS_CFG_SITE_MB && device == 0) { qemu_system_shutdown_request();