From patchwork Mon Feb 4 13:44:29 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 14531 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 1581D23FEE for ; Mon, 4 Feb 2013 13:44:46 +0000 (UTC) Received: from mail-vc0-f169.google.com (mail-vc0-f169.google.com [209.85.220.169]) by fiordland.canonical.com (Postfix) with ESMTP id AB85FA18276 for ; Mon, 4 Feb 2013 13:44:45 +0000 (UTC) Received: by mail-vc0-f169.google.com with SMTP id n10so3977700vcn.0 for ; Mon, 04 Feb 2013 05:44:45 -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=ZX/5s0d2y6sRnbdZ+smtzEtdv6ZqCxFGzLezewvm9xwjsRwiq9yDGrsPVNfC5odmIl rxyDRobhOF590xyhLzDMfRfRqP4eGaT8oYVMd0OWwS3akhsMW6u/63UTaq51E06NpWlX vSxNoMnUovRkTmj97rEWJh4wGzwGm5zUzRdFNFh9B7EZEP52gvHnsTZHh36EmGU4BS/N 8IAtuLAp8xDg0rX4JoY/xZrcJgRYz+47EK26kZI9HvFBeuX/hrStJmHCznXEOxdNb4FX Ube/S2EU7XhoENSZimwzLLAPkyVCBwFWr89FOOpwLoz7l4n+3rfdjlL9f9iP+3v5TfjG EY6Q== X-Received: by 10.52.21.146 with SMTP id v18mr19337245vde.79.1359985485189; Mon, 04 Feb 2013 05:44:45 -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.252.8 with SMTP id zo8csp87652vec; Mon, 4 Feb 2013 05:44:44 -0800 (PST) X-Received: by 10.180.85.226 with SMTP id k2mr10596852wiz.34.1359985480559; Mon, 04 Feb 2013 05:44:40 -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 x41si28398251eeo.60.2013.02.04.05.44.39 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 04 Feb 2013 05:44:40 -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 1U2MLd-0007eP-5v; Mon, 04 Feb 2013 13:44:37 +0000 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Anthony Liguori Subject: [PATCH 03/10] hw/arm_sysctl: Implement SYS_CFG_MUXFPGA writes as a no-op Date: Mon, 4 Feb 2013 13:44:29 +0000 Message-Id: <1359985476-29380-4-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1359985476-29380-1-git-send-email-peter.maydell@linaro.org> References: <1359985476-29380-1-git-send-email-peter.maydell@linaro.org> X-Gm-Message-State: ALoCoQkvCPNckxeyQxE6G5fhu+OShUecHX8Z51oJgOkzzXJRFb5BbsjDPXXHBcQC32SUfs2AFvEf 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();