From patchwork Thu May 23 10:25:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 164954 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp1987282ili; Thu, 23 May 2019 03:28:43 -0700 (PDT) X-Google-Smtp-Source: APXvYqwDhhHjvbYe+5j6fxhrHA0MjxTt/8d7v9z3p944GYQ7DWDPEVhswa23Pd/lY4FKCcHTFraD X-Received: by 2002:aa7:db50:: with SMTP id n16mr94382806edt.108.1558607323232; Thu, 23 May 2019 03:28:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558607323; cv=none; d=google.com; s=arc-20160816; b=uXmTF9z58Wg8B4dZkV1K/MEwijMXXqyeeJtyDE4FpPWsB4pOs1+T3PspoFeOiaINLV 2R+hKZvn6EqIdjHD+2wyXcr6s7eTs9pBovDouPOQ0BdsQvPjMnAlN5x36t1VdCAjbWvV p7qvUSPp+ajLg7pfe46bVOMp9phF2k6uKKdPK6okOFAABnpOXabpTnlcdlNdRw03au6x tcGCLM5sAczbKoOegFAcWgTONKazYhzlIJbyreHMUCiky/A9J5GJaAX7uOySudWQD2az Y281ua16wDN4NlVaCnOWp0xojp69W9CvFnqyNix40gnyFXE6BPqCaZ92MzO6D6HUco6h n8zQ== 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 :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=VPYoDDTghYG2/LL0n9irfzSxJnK/tqgoLIbho5rYvV8=; b=Ehe1s9PqKMmAKZAZIZMKDT6M6L3HSaOQNKB6p3lPobD59KmtvoBU/f4p7a8muiePjP JEjSca+u4PSo6SH3cJVSQUYXUDahyF+yJJ2b26geyJWJk2vy83JJI1nDI91dWw3y8Jrw eN6aEoI95tmli6n28oGa9BB5xmLmHd6joCPUBYSza5yKE0Ed89LdgeeInDgymoeNBkm5 y9HZUcqqLf81qvH4UoD7vFgIu0s3vr2d2Qy3W46jBsFbEx/xh8c4By+DpsFuqH0PRXvn vOtQJFNAdduhL+M3wDVv3gEJ2pjwdav9hXj9wEfMkSyVK70Y4nj+R0txBvX1yhl2Qx3h DV+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fpmUbgTP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id hh22si394736ejb.149.2019.05.23.03.28.42 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 23 May 2019 03:28:43 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fpmUbgTP; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([127.0.0.1]:33080 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTkxl-0007tI-WC for patch@linaro.org; Thu, 23 May 2019 06:28:42 -0400 Received: from eggs.gnu.org ([209.51.188.92]:49098) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hTkuu-0005Qc-2i for qemu-devel@nongnu.org; Thu, 23 May 2019 06:25:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hTkuo-0000ui-1B for qemu-devel@nongnu.org; Thu, 23 May 2019 06:25:41 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:38080) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hTkul-0000rX-VQ for qemu-devel@nongnu.org; Thu, 23 May 2019 06:25:36 -0400 Received: by mail-wm1-x344.google.com with SMTP id t5so5200855wmh.3 for ; Thu, 23 May 2019 03:25:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=VPYoDDTghYG2/LL0n9irfzSxJnK/tqgoLIbho5rYvV8=; b=fpmUbgTP8m0B7hMdU7nymRbgU9OHxbXqRMb0US7extFNgplo5xSF8kLWC7+I6RVogM NXnfdZbTG4+AbKlkkEJZczf2XoLeelI1EzpevITj5+wj/mpi0k0HdI9mZqtiIT4MFCAa JX75HeTOu788/y19GGRtjSkbH/NNEL3XtYzbPOWvvgfpTOcj3t/8UtJp0jAEMiypClIn 4L2Z7+pM9g7g3I2eVAP2XZqxUMMTEErji6/Pbj9hPkC2n5h3QF3mIIpqTZHomWBe6SXJ 4V/xT6S6iMum3pXmGRvIAk0Dc2g/l0O7hNn8FqJkKfqbHZ1jKxQlE9MY3XL7+prrrgHf fLNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VPYoDDTghYG2/LL0n9irfzSxJnK/tqgoLIbho5rYvV8=; b=tpWuw2k3AwVEjZNttitcdRRjChVl09pb1Nt1fHZbYqPGD3TGHivXB2iIPf+TF6qwo4 xAIhHK0ww2Xeb5P7piWNNY1enUpLFhR9t9sebDGrrn7Y3AKtRskoLRfyxy9hYAVTUMGD I+8JBkyLKqPlCA1SVKobFTBsCIadDBrYFn9/n1vvBa+6z24b84rq4cHxBDWzbA0WYL7l cC6w/lUbym6nciOAq64gVnlIdNWd4qBVxqxY3extABkYU/dyFmcm8sG9wwW8tsuhaPTY HKU8MA6e2fObeaLVJpkG5eH6tD740KHUDAfwkuhwFvp8Rz4ok+jrFMsPtVo2vtpqwMfy xeRw== X-Gm-Message-State: APjAAAXnjhEl2FlB2s4PRrmgEbR91sF6oPgvu4WBRX0Hp7zVkGQF9/th IEQ55h2R6CoyJmg1V39WTwCPsw== X-Received: by 2002:a1c:1f95:: with SMTP id f143mr11864734wmf.16.1558607134510; Thu, 23 May 2019 03:25:34 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b18sm25054186wrx.75.2019.05.23.03.25.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 23 May 2019 03:25:33 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 96F531FF8F; Thu, 23 May 2019 11:25:32 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 23 May 2019 11:25:06 +0100 Message-Id: <20190523102532.10486-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190523102532.10486-1-alex.bennee@linaro.org> References: <20190523102532.10486-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH v2 02/28] semihosting: introduce CONFIG_SEMIHOSTING 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: Marek Vasut , Aleksandar Rikalo , =?utf-8?q?Alex_Benn=C3=A9e?= , Chris Wulff , Max Filippov , qemu-arm@nongnu.org, Aleksandar Markovic , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Aurelien Jarno Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" There isn't much point building semihosting for platforms that don't support it. Introduce a new symbol and enable it only for the softmmu targets that need it. Signed-off-by: Alex Bennée Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- default-configs/arm-softmmu.mak | 1 + default-configs/lm32-softmmu.mak | 2 + default-configs/m68k-softmmu.mak | 2 + default-configs/mips-softmmu-common.mak | 1 + default-configs/nios2-softmmu.mak | 2 + default-configs/xtensa-softmmu.mak | 2 + hw/Kconfig | 1 + hw/semihosting/Kconfig | 3 ++ hw/semihosting/Makefile.objs | 2 +- stubs/Makefile.objs | 1 + stubs/semihost.c | 66 +++++++++++++++++++++++++ 11 files changed, 82 insertions(+), 1 deletion(-) create mode 100644 hw/semihosting/Kconfig create mode 100644 stubs/semihost.c -- 2.20.1 Reviewed-by: Richard Henderson diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak index f23ecfd5c58..1f2e0e7fdeb 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -39,3 +39,4 @@ CONFIG_MICROBIT=y CONFIG_FSL_IMX25=y CONFIG_FSL_IMX7=y CONFIG_FSL_IMX6UL=y +CONFIG_SEMIHOSTING=y diff --git a/default-configs/lm32-softmmu.mak b/default-configs/lm32-softmmu.mak index 6d259665d60..115b3e34c98 100644 --- a/default-configs/lm32-softmmu.mak +++ b/default-configs/lm32-softmmu.mak @@ -4,6 +4,8 @@ # #CONFIG_MILKYMIST_TMU2=n # disabling it actually causes compile-time failures +CONFIG_SEMIHOSTING=y + # Boards: # CONFIG_LM32=y diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmmu.mak index e17495e2a0b..4049a8f2ba9 100644 --- a/default-configs/m68k-softmmu.mak +++ b/default-configs/m68k-softmmu.mak @@ -1,5 +1,7 @@ # Default configuration for m68k-softmmu +CONFIG_SEMIHOSTING=y + # Boards: # CONFIG_AN5206=y diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak index 8e54a74b7a5..e10ac4b20c0 100644 --- a/default-configs/mips-softmmu-common.mak +++ b/default-configs/mips-softmmu-common.mak @@ -35,6 +35,7 @@ CONFIG_MIPS_CPS=y CONFIG_MIPS_ITU=y CONFIG_R4K=y CONFIG_MALTA=y +CONFIG_SEMIHOSTING=y CONFIG_PCNET_PCI=y CONFIG_MIPSSIM=y CONFIG_ACPI_SMBUS=y diff --git a/default-configs/nios2-softmmu.mak b/default-configs/nios2-softmmu.mak index e130d024e62..1bc4082ea99 100644 --- a/default-configs/nios2-softmmu.mak +++ b/default-configs/nios2-softmmu.mak @@ -1,5 +1,7 @@ # Default configuration for nios2-softmmu +CONFIG_SEMIHOSTING=y + # Boards: # CONFIG_NIOS2_10M50=y diff --git a/default-configs/xtensa-softmmu.mak b/default-configs/xtensa-softmmu.mak index 7e4d1cc0979..3aa20a47a7f 100644 --- a/default-configs/xtensa-softmmu.mak +++ b/default-configs/xtensa-softmmu.mak @@ -1,5 +1,7 @@ # Default configuration for Xtensa +CONFIG_SEMIHOSTING=y + # Boards: # CONFIG_XTENSA_SIM=y diff --git a/hw/Kconfig b/hw/Kconfig index 88b9f150070..195f541e50c 100644 --- a/hw/Kconfig +++ b/hw/Kconfig @@ -29,6 +29,7 @@ source pci/Kconfig source rdma/Kconfig source scsi/Kconfig source sd/Kconfig +source semihosting/Kconfig source smbios/Kconfig source ssi/Kconfig source timer/Kconfig diff --git a/hw/semihosting/Kconfig b/hw/semihosting/Kconfig new file mode 100644 index 00000000000..efe0a30734c --- /dev/null +++ b/hw/semihosting/Kconfig @@ -0,0 +1,3 @@ + +config SEMIHOSTING + bool diff --git a/hw/semihosting/Makefile.objs b/hw/semihosting/Makefile.objs index 546954f4ff4..09c19bf19ed 100644 --- a/hw/semihosting/Makefile.objs +++ b/hw/semihosting/Makefile.objs @@ -1 +1 @@ -common-obj-$(CONFIG_SOFTMMU) += config.o +obj-$(CONFIG_SEMIHOSTING) += config.o diff --git a/stubs/Makefile.objs b/stubs/Makefile.objs index 269dfa58326..e0d4f11b348 100644 --- a/stubs/Makefile.objs +++ b/stubs/Makefile.objs @@ -39,3 +39,4 @@ stub-obj-y += xen-hvm.o stub-obj-y += pci-host-piix.o stub-obj-y += ram-block.o stub-obj-y += ramfb.o +stub-obj-$(CONFIG_SOFTMMU) += semihost.o diff --git a/stubs/semihost.c b/stubs/semihost.c new file mode 100644 index 00000000000..1a4e88e5326 --- /dev/null +++ b/stubs/semihost.c @@ -0,0 +1,66 @@ +/* + * Semihosting Stubs for SoftMMU + * + * Copyright (c) 2019 Linaro Ltd + * + * Stubs for SoftMMU targets that don't actually do semihosting. + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qemu/option.h" +#include "qemu/error-report.h" +#include "hw/semihosting/semihost.h" + +/* Empty config */ +QemuOptsList qemu_semihosting_config_opts = { + .name = "", + .head = QTAILQ_HEAD_INITIALIZER(qemu_semihosting_config_opts.head), + .desc = { + { /* end of list */ } + }, +}; + +/* Queries to config status default to off */ +bool semihosting_enabled(void) +{ + return false; +} + +SemihostingTarget semihosting_get_target(void) +{ + return SEMIHOSTING_TARGET_AUTO; +} + +/* + * All the rest are empty subs. We could g_assert_not_reached() but + * that adds extra weight to the final binary. Waste not want not. + */ +void qemu_semihosting_enable(void) +{ +} + +int qemu_semihosting_config_options(const char *optarg) +{ + return 1; +} + +const char *semihosting_get_arg(int i) +{ + return NULL; +} + +int semihosting_get_argc(void) +{ + return 0; +} + +const char *semihosting_get_cmdline(void) +{ + return NULL; +} + +void semihosting_arg_fallback(const char *file, const char *cmd) +{ +}