From nobody Wed May 8 14:53:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1493314813440553.8046098162582; Thu, 27 Apr 2017 10:40:13 -0700 (PDT) Received: from localhost ([::1]:33482 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d3nOl-0004ot-Tw for importer@patchew.org; Thu, 27 Apr 2017 13:40:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38528) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d3nNc-00049Z-WC for qemu-devel@nongnu.org; Thu, 27 Apr 2017 13:39:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d3nNc-0005Fn-8L for qemu-devel@nongnu.org; Thu, 27 Apr 2017 13:39:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:57188) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d3nNX-0005DV-PV; Thu, 27 Apr 2017 13:38:55 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id ADD1380483; Thu, 27 Apr 2017 17:38:54 +0000 (UTC) Received: from weilaptop.redhat.com (ovpn-125-235.rdu2.redhat.com [10.10.125.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id D3E7A996D0; Thu, 27 Apr 2017 17:38:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com ADD1380483 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=wei@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com ADD1380483 From: Wei Huang To: qemu-arm@nongnu.org Date: Thu, 27 Apr 2017 12:38:46 -0500 Message-Id: <1493314727-6951-2-git-send-email-wei@redhat.com> In-Reply-To: <1493314727-6951-1-git-send-email-wei@redhat.com> References: <1493314727-6951-1-git-send-email-wei@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Thu, 27 Apr 2017 17:38:54 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/2] armv7m: Make armv7m SoC compilation dependent on CONFIG_ARM_V7M 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@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" In current QEMU, when CONFIG_ARM_V7M is not configured, armv7m_nvic.c and armv7m_systick.c won't be compiled. This causes dependency issues for armv7m SoC because armv7m uses the device "armv7m_nvic". This patch makes the compilation of armv7m.c and other v7m SoC dependent on CONFIG_ARM_V7M. Signed-off-by: Wei Huang --- default-configs/arm-softmmu.mak | 2 -- hw/arm/Makefile.objs | 7 +++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.= mak index 78d7af0..a89d77d 100644 --- a/default-configs/arm-softmmu.mak +++ b/default-configs/arm-softmmu.mak @@ -15,7 +15,6 @@ CONFIG_TWL92230=3Dy CONFIG_TSC2005=3Dy CONFIG_LM832X=3Dy CONFIG_TMP105=3Dy -CONFIG_STELLARIS=3Dy CONFIG_STELLARIS_INPUT=3Dy CONFIG_STELLARIS_ENET=3Dy CONFIG_SSD0303=3Dy @@ -92,7 +91,6 @@ CONFIG_STM32F2XX_USART=3Dy CONFIG_STM32F2XX_SYSCFG=3Dy CONFIG_STM32F2XX_ADC=3Dy CONFIG_STM32F2XX_SPI=3Dy -CONFIG_STM32F205_SOC=3Dy =20 CONFIG_VERSATILE_PCI=3Dy CONFIG_VERSATILE_I2C=3Dy diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 4c5c4ee..e3c5fc5 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -1,18 +1,17 @@ obj-y +=3D boot.o collie.o exynos4_boards.o gumstix.o highbank.o obj-$(CONFIG_DIGIC) +=3D digic_boards.o obj-y +=3D integratorcp.o mainstone.o musicpal.o nseries.o -obj-y +=3D omap_sx1.o palm.o realview.o spitz.o stellaris.o +obj-y +=3D omap_sx1.o palm.o realview.o spitz.o obj-y +=3D tosa.o versatilepb.o vexpress.o virt.o xilinx_zynq.o z2.o obj-$(CONFIG_ACPI) +=3D virt-acpi-build.o -obj-y +=3D netduino2.o obj-y +=3D sysbus-fdt.o =20 -obj-y +=3D armv7m.o exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o +obj-y +=3D exynos4210.o pxa2xx.o pxa2xx_gpio.o pxa2xx_pic.o obj-$(CONFIG_DIGIC) +=3D digic.o +obj-$(CONFIG_ARM_V7M) +=3D armv7m.o netduino2.o stellaris.o stm32f205_soc.o obj-y +=3D omap1.o omap2.o strongarm.o obj-$(CONFIG_ALLWINNER_A10) +=3D allwinner-a10.o cubieboard.o obj-$(CONFIG_RASPI) +=3D bcm2835_peripherals.o bcm2836.o raspi.o -obj-$(CONFIG_STM32F205_SOC) +=3D stm32f205_soc.o obj-$(CONFIG_XLNX_ZYNQMP) +=3D xlnx-zynqmp.o xlnx-ep108.o obj-$(CONFIG_FSL_IMX25) +=3D fsl-imx25.o imx25_pdk.o obj-$(CONFIG_FSL_IMX31) +=3D fsl-imx31.o kzm.o --=20 1.8.3.1 From nobody Wed May 8 14:53:59 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1493314813439767.0854308040213; Thu, 27 Apr 2017 10:40:13 -0700 (PDT) Received: from localhost ([::1]:33483 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d3nOm-0004p3-4v for importer@patchew.org; Thu, 27 Apr 2017 13:40:12 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38525) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1d3nNc-00049T-T6 for qemu-devel@nongnu.org; Thu, 27 Apr 2017 13:39:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1d3nNb-0005FT-Tj for qemu-devel@nongnu.org; Thu, 27 Apr 2017 13:39:00 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44636) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1d3nNY-0005Dh-Ir; Thu, 27 Apr 2017 13:38:56 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 727A146D093; Thu, 27 Apr 2017 17:38:55 +0000 (UTC) Received: from weilaptop.redhat.com (ovpn-125-235.rdu2.redhat.com [10.10.125.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id E30B5996D0; Thu, 27 Apr 2017 17:38:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 727A146D093 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=wei@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 727A146D093 From: Wei Huang To: qemu-arm@nongnu.org Date: Thu, 27 Apr 2017 12:38:47 -0500 Message-Id: <1493314727-6951-3-git-send-email-wei@redhat.com> In-Reply-To: <1493314727-6951-1-git-send-email-wei@redhat.com> References: <1493314727-6951-1-git-send-email-wei@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Thu, 27 Apr 2017 17:38:55 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 2/2] armv7m: Use stub functions if CONFIG_ARM_V7M is not defined 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@linaro.org, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" M-profile CPUs relies on NVIC controller which won't be compiled if CONFIG_ARM_V7M is not defined. To solve the problem, this patch defines four NVIC stub functions. These functions are called when CONFIG_ARM_V7M is not defined. Signed-off-by: Wei Huang --- target/arm/Makefile.objs | 1 + target/arm/armv7m-stub.c | 43 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 target/arm/armv7m-stub.c diff --git a/target/arm/Makefile.objs b/target/arm/Makefile.objs index 847fb52..328367d 100644 --- a/target/arm/Makefile.objs +++ b/target/arm/Makefile.objs @@ -4,6 +4,7 @@ obj-$(CONFIG_KVM) +=3D kvm.o obj-$(call land,$(CONFIG_KVM),$(call lnot,$(TARGET_AARCH64))) +=3D kvm32.o obj-$(call land,$(CONFIG_KVM),$(TARGET_AARCH64)) +=3D kvm64.o obj-$(call lnot,$(CONFIG_KVM)) +=3D kvm-stub.o +obj-$(call lnot,$(CONFIG_ARM_V7M)) +=3D armv7m-stub.o obj-y +=3D translate.o op_helper.o helper.o cpu.o obj-y +=3D neon_helper.o iwmmxt_helper.o obj-y +=3D gdbstub.o diff --git a/target/arm/armv7m-stub.c b/target/arm/armv7m-stub.c new file mode 100644 index 0000000..1be3874 --- /dev/null +++ b/target/arm/armv7m-stub.c @@ -0,0 +1,43 @@ +/* + * ARMv7M stubs + * + * This work is licensed under the terms of the GNU GPL, version 2 or late= r. + * See the COPYING file in the top-level directory. + * + */ +#include "qemu/osdep.h" +#include "qemu-common.h" +#include "cpu.h" +#include "hw/arm/armv7m.h" + +void armv7m_nvic_acknowledge_irq(void *opaque) +{ + NVICState *s =3D (NVICState *)opaque; + + cpu_abort(CPU(s->cpu), "No NVIC avaialable to acknowledge IRQ\n"); +} + +void armv7m_nvic_set_pending(void *opaque, int irq) +{ + NVICState *s =3D (NVICState *)opaque; + + cpu_abort(CPU(s->cpu), "No NVIC avaialable to set IRQ pending\n"); +} + +int armv7m_nvic_complete_irq(void *opaque, int irq) +{ + NVICState *s =3D (NVICState *)opaque; + + cpu_abort(CPU(s->cpu), "No NVIC avaialable to complete IRQ\n"); + + return 0; +} + +bool armv7m_nvic_can_take_pending_exception(void *opaque) +{ + NVICState *s =3D (NVICState *)opaque; + + cpu_abort(CPU(s->cpu), "No NVIC avaialable to check pending exception\= n"); + + return false; +} --=20 1.8.3.1