From patchwork Thu Jan 12 13:49:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 641654 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp3808986pvb; Thu, 12 Jan 2023 05:50:34 -0800 (PST) X-Google-Smtp-Source: AMrXdXuUB3nh+OZS//dUpOAhL8Lh0XLPYpMBFdXOZWKYBSM+MXbVCv4xP9EXccaMxCEJGnEdCe6W X-Received: by 2002:a05:6102:338c:b0:3d0:cf76:ccd4 with SMTP id i12-20020a056102338c00b003d0cf76ccd4mr5159566vsh.29.1673531434709; Thu, 12 Jan 2023 05:50:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673531434; cv=none; d=google.com; s=arc-20160816; b=lUteFi2sCoElDqgct8T1UhXbIrpT1we3/TjQU4i19veDKZc1pyM7aLUbVY5lIj3NjQ cyYpiSV1HIGeVl3uoQjUZTcJxooj8rw56Laqx019golHzsxELCWpqYdBU03Hy6hHSqtR V1w2+IgrmsVgP9tYAT9q1Wib/Y2V/jV8xrbsMyAIvVoD1GVKoi0sYo0cLbLV6nPW1WeC OuoCF+JXUAeV+5wmTyKt32f3u8nj2jDBuSaaoKz2jaGeru/rbPS8aDKbXeLQhl/wbjH8 Fu9k3scFvkIA/9w1ozQOfl9C39GmORr+W9oSqN3TkY+uM4OQUOELZgny3UvbzxOiVfin 2BzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=3qD4ndr8yIl/ZBVBvbiwIXGY8SdSYcDtBxXg5KJCkME=; b=CDB6aDOi/s0jg+DZ4iuMKh/tW6yEfT8y3MT1eDp+IjPOvMGrJILBJkonUS8Ez1AOYT fyv97VR8cGCDPZ9MqO/BdQPNUZQ9x1IS5VrUoX1eNW6HJDzmpI+lh47csB8B2TI7uqQz OH1O6uhPmclYiBhKI0PNIvjsLoqQbLcswCuumjKgoBaoovnoPCPDeT3nXyFThq736omR 4YDBZ8lRChVd1q1Pl7U1qL8BgoL2/xL8gHVLJM9t8w/rsD0xI7y9HPRaNhHAsrFa3I+/ qSx3zscC7FmW4f7OcJ1XqLSvlWu/EKCZOn02gUkIaUs0TGd4m22Q3SbT2xvECd+n+Oa2 WKJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=XmbwVEFW; 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=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTP id l14-20020a05620a28ce00b006f7fae571a3si10052480qkp.118.2023.01.12.05.50.34 for ; Thu, 12 Jan 2023 05:50:34 -0800 (PST) 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=pass header.i=@redhat.com header.s=mimecast20190719 header.b=XmbwVEFW; 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=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFxxe-0001aO-5H; Thu, 12 Jan 2023 08:49:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFxxZ-0001TW-LU for qemu-devel@nongnu.org; Thu, 12 Jan 2023 08:49:39 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFxxX-000369-MI for qemu-devel@nongnu.org; Thu, 12 Jan 2023 08:49:37 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673531375; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3qD4ndr8yIl/ZBVBvbiwIXGY8SdSYcDtBxXg5KJCkME=; b=XmbwVEFWaXIMlSlSNjkBCPJwDGyW6lcQsZwZkyiyhZnf2hd0hCU9UMcmtXoQieYfT99t/j 8lDoA5B9uQzoKY/6aIJnlNa4GExq8JXPz71m0zCBs+LX4xNL5q0JsiIJYaqXV4x34WXqS0 2ZIoGqCehiptC6cygr8dO/p8pI3CqYU= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-6-At0Y7tupP_6tQYExP8BgWw-1; Thu, 12 Jan 2023 08:49:33 -0500 X-MC-Unique: At0Y7tupP_6tQYExP8BgWw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B9E1D3811F3D; Thu, 12 Jan 2023 13:49:32 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id E00BD40C2064; Thu, 12 Jan 2023 13:49:31 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-trivial@nongnu.org Subject: [PATCH 1/7] hw/display: Move omap_lcdc.c out of target-specific source set Date: Thu, 12 Jan 2023 14:49:22 +0100 Message-Id: <20230112134928.1026006-2-thuth@redhat.com> In-Reply-To: <20230112134928.1026006-1-thuth@redhat.com> References: <20230112134928.1026006-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé While only used by the ARM targets, this device can be built once for all. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20221209170042.71169-2-philmd@linaro.org> Signed-off-by: Thomas Huth --- hw/display/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/display/meson.build b/hw/display/meson.build index 7a725ed80e..2cab7a8ff2 100644 --- a/hw/display/meson.build +++ b/hw/display/meson.build @@ -111,7 +111,7 @@ if config_all_devices.has_key('CONFIG_VIRTIO_VGA') hw_display_modules += {'virtio-vga-gl': virtio_vga_gl_ss} endif -specific_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_lcdc.c')) +softmmu_ss.add(when: 'CONFIG_OMAP', if_true: files('omap_lcdc.c')) softmmu_ss.add(when: 'CONFIG_ALL', if_true: files('acpi-vga-stub.c')) modules += { 'hw-display': hw_display_modules } From patchwork Thu Jan 12 13:49:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 641655 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp3809400pvb; Thu, 12 Jan 2023 05:51:31 -0800 (PST) X-Google-Smtp-Source: AMrXdXtw6YkaAsASrk/abmAxL5isyC0aGCJe2lrEwoFXQICKTFAlicAfmyhXSJQBSiysrxE1Acwo X-Received: by 2002:a0c:f7ce:0:b0:532:17a4:67ac with SMTP id f14-20020a0cf7ce000000b0053217a467acmr8502277qvo.37.1673531491823; Thu, 12 Jan 2023 05:51:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673531491; cv=none; d=google.com; s=arc-20160816; b=nBk/VDnnBsyh1tdpii+V9Pxn955FpgBNp7LX70R7dHf4OklC3+KDe8J1AwWlaw2RqU w/UhBscNMxpjlQHQ3HR4Qc6aoUssqugXhJw9WFFPBK6ZL2z/6TeHud4+XQYNdAqYUnRU 8CvSBkvbx/JkA5pVhIDEI1Knl2SV6RTvmI2mC2aCOKTYjUbM/40qiVGM0z2lsqc5Y3N8 TkHoCeZCd0SOc5WpnAvsF17J22GXXTdqEnh9THCbEmZdK/3+BgHTqAxM+aaZbL6YQDP/ InP3QTIbuj417TejsOExJevJqoY9DQmcdv+CGG8oPK4ej89wsXezfEJu8jBObJa+bSBD to+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=vOQJFkscjh9Ma+HtAaeij+iWQQPW9lxux+5N19vSX5w=; b=VXuLZjaaGQRVmHeTk/H3KXl3g33vEcgTL1iwMLBqmdxiiZ/bLJIoc5mqaFXsth34np CuGlzBA+03sg2TX4OsZUxhBHPvDZ7EBWRmR85bifR34QJxFNLNpmzaJKuqvzQaPBw0+i f2bVkqtwUfO6AyC6ybbvz2qlizTxlXlw8S7XJFtZcdd+zUbUJOQZy9c/bpYO0q20LWfh RTZbui8JzoiqKVRstRGdFY237eNlk0yIFn9llATYKMD0LtNdfUN47xY9Bbaai33qv4aM QaypBxqwU2hrKAhOFUp3d/9bW0IpAZkuGN0epFIAIQCkezn8jEC6P2nemb8XZpWLF5n4 k8yg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="AHiwbN/Y"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id l17-20020ad44d11000000b004c6adf76c02si9006277qvl.370.2023.01.12.05.51.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 12 Jan 2023 05:51:31 -0800 (PST) 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=pass header.i=@redhat.com header.s=mimecast20190719 header.b="AHiwbN/Y"; 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=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFxxi-0001hX-Ll; Thu, 12 Jan 2023 08:49:46 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFxxb-0001XA-Vi for qemu-devel@nongnu.org; Thu, 12 Jan 2023 08:49:40 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFxxa-000379-1m for qemu-devel@nongnu.org; Thu, 12 Jan 2023 08:49:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673531377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vOQJFkscjh9Ma+HtAaeij+iWQQPW9lxux+5N19vSX5w=; b=AHiwbN/Y/WWXVx1MVrXGyVRlIA3v9j2BCn3Wr9Ly1+z5OJR74cBUqHBC3faFJTXR2eIQ/1 +gWpwAPNjFgjzKr5WitYxYTTiXe4YsOUcCCPNl1ajH3kawAuIYZd9HsRzowl+uslp0GtAg j648x/AZxQjpNHb59VKwPLDkoH96vNE= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-228-u-LP_qjpNbKq6iHEiRhR5Q-1; Thu, 12 Jan 2023 08:49:34 -0500 X-MC-Unique: u-LP_qjpNbKq6iHEiRhR5Q-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id DC488101A55E; Thu, 12 Jan 2023 13:49:33 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1563340C2064; Thu, 12 Jan 2023 13:49:32 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-trivial@nongnu.org Subject: [PATCH 2/7] hw/intc: Move some files out of the target-specific source set Date: Thu, 12 Jan 2023 14:49:23 +0100 Message-Id: <20230112134928.1026006-3-thuth@redhat.com> In-Reply-To: <20230112134928.1026006-1-thuth@redhat.com> References: <20230112134928.1026006-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Received-SPF: pass client-ip=170.10.133.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé The Goldfish interrupt controller is not target specific. While the Exynos interrupt combiner is only used by the ARM targets, we can build this device once for all. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20221209170042.71169-3-philmd@linaro.org> [thuth: Change patch title, and also move 'exynos4210_gic.c'] Signed-off-by: Thomas Huth --- hw/intc/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/intc/meson.build b/hw/intc/meson.build index bcbf22ff51..eeb45db58e 100644 --- a/hw/intc/meson.build +++ b/hw/intc/meson.build @@ -13,6 +13,8 @@ softmmu_ss.add(when: 'CONFIG_ARM_GICV3_TCG', if_true: files( 'arm_gicv3_redist.c', )) softmmu_ss.add(when: 'CONFIG_ETRAXFS', if_true: files('etraxfs_pic.c')) +softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_gic.c', 'exynos4210_combiner.c')) +softmmu_ss.add(when: 'CONFIG_GOLDFISH_PIC', if_true: files('goldfish_pic.c')) softmmu_ss.add(when: 'CONFIG_HEATHROW_PIC', if_true: files('heathrow_pic.c')) softmmu_ss.add(when: 'CONFIG_I8259', if_true: files('i8259_common.c', 'i8259.c')) softmmu_ss.add(when: 'CONFIG_IMX', if_true: files('imx_avic.c', 'imx_gpcv2.c')) @@ -33,7 +35,6 @@ specific_ss.add(when: 'CONFIG_ARM_GIC_KVM', if_true: files('arm_gic_kvm.c')) specific_ss.add(when: ['CONFIG_ARM_GIC_KVM', 'TARGET_AARCH64'], if_true: files('arm_gicv3_kvm.c', 'arm_gicv3_its_kvm.c')) specific_ss.add(when: 'CONFIG_ARM_V7M', if_true: files('armv7m_nvic.c')) specific_ss.add(when: 'CONFIG_ASPEED_SOC', if_true: files('aspeed_vic.c')) -specific_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4210_gic.c', 'exynos4210_combiner.c')) specific_ss.add(when: 'CONFIG_GRLIB', if_true: files('grlib_irqmp.c')) specific_ss.add(when: 'CONFIG_IOAPIC', if_true: files('ioapic.c')) specific_ss.add(when: 'CONFIG_LOONGSON_LIOINTC', if_true: files('loongson_liointc.c')) @@ -60,7 +61,6 @@ specific_ss.add(when: 'CONFIG_PSERIES', if_true: files('xics_spapr.c', 'spapr_xi specific_ss.add(when: 'CONFIG_XIVE', if_true: files('xive.c')) specific_ss.add(when: ['CONFIG_KVM', 'CONFIG_XIVE'], if_true: files('spapr_xive_kvm.c')) -specific_ss.add(when: 'CONFIG_GOLDFISH_PIC', if_true: files('goldfish_pic.c')) specific_ss.add(when: 'CONFIG_M68K_IRQC', if_true: files('m68k_irqc.c')) specific_ss.add(when: 'CONFIG_NIOS2_VIC', if_true: files('nios2_vic.c')) specific_ss.add(when: 'CONFIG_LOONGARCH_IPI', if_true: files('loongarch_ipi.c')) From patchwork Thu Jan 12 13:49:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 641656 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp3809619pvb; Thu, 12 Jan 2023 05:52:00 -0800 (PST) X-Google-Smtp-Source: AMrXdXsQn7nBqcu8cgR9poQP8my+CVtuG/NHLZDvKmsxEIlBA7annN8yRJlGSaAxaHskZA7RhjAC X-Received: by 2002:a05:6214:2d49:b0:532:2cb5:33e4 with SMTP id na9-20020a0562142d4900b005322cb533e4mr26839115qvb.14.1673531520101; Thu, 12 Jan 2023 05:52:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673531520; cv=none; d=google.com; s=arc-20160816; b=X6tAUwA01mm7ouRz0mL/o+qVctSPlBBVUpz81nCpEPQ66z4A5UpXGSNRyfPGS1fZvw GxvQYqvYU04TBnmtPx1DLeXv3ER72BuTfj00UQpO3PcERO0jem/2UPe29jKVxe+fI4SO 8PCXSPBtKxEZBeJMtGCkERYjhimPSnOqJykt2KwOmMlwcsld6ozHT45nPgPzeV5ssNcj Qd9ScdRex8qTiKNjhOsVZZluziBtQX7Mje+TJVAoqEsbhyujYZEm2W/sDKSCQn40n9uU 71UbGUXAg53jrnkjQ7mrnDIjH6zkRycHykvCz/n/lYasLzBROfLCf7sQ0VVzlPKKAX7R 7EmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=vG8MsiZXqR9BpNtt6zv/oEucFrLBECeZCo9G5MfOAa0=; b=JSPmH6xtscIPfoIBSCWE+N9xvQ5ZiA/FUWWveVR/jehm8c5QFAGNFRL2ULEBzN0G2r 04TUOWjVlSy9FoPZgzI1wDfMVB8J/ihBRoTAF9bXyRdGH7PINvg+u0leLHwFQlMTjvyK P5oUNfMnm7WnCoxD3sGI4zroDHp8wTLNysFKZa2dnWc/s5C3tSqiEpGSGctvN9dKGdWL L5dGNmWPSxKrt414LbrIHQ9nLZUM8yTGyF8oyiGXBkrmdaeSblnl/1aBdGJr1ZR00DYz /8PG2MtI0slpSAjbhR+HBjlwDDtYhOo0WYzWJXqfCbomgsa2+QpVlgne1qj1OXLbmaUt iKiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PltSGh1d; 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=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d12-20020a0ce44c000000b004c70b1a154dsi9330102qvm.55.2023.01.12.05.52.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 12 Jan 2023 05:52:00 -0800 (PST) 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=pass header.i=@redhat.com header.s=mimecast20190719 header.b=PltSGh1d; 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=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFxxj-0001i5-F4; Thu, 12 Jan 2023 08:49:47 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFxxd-0001Ys-9u for qemu-devel@nongnu.org; Thu, 12 Jan 2023 08:49:41 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFxxb-00037Z-8j for qemu-devel@nongnu.org; Thu, 12 Jan 2023 08:49:40 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673531378; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vG8MsiZXqR9BpNtt6zv/oEucFrLBECeZCo9G5MfOAa0=; b=PltSGh1dwQISaFRV3/g398veOR8V+iRgd8EG4BikyJslWDNMFC7EBgbGX+ipSBYVUFgwto kT/7FOdml/2zYxb/FdagJFuuzJtu3g9qM0AtygUHVs9zKsjUhQJsNE9XY54xq7yGtCChMV Uvo+RnUtl9lif/j7sfn3EJwrSUrUV8g= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-523-gxImCNeNPbK_-NZCvz057g-1; Thu, 12 Jan 2023 08:49:35 -0500 X-MC-Unique: gxImCNeNPbK_-NZCvz057g-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 00010811E9C; Thu, 12 Jan 2023 13:49:34 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 32E6340C2064; Thu, 12 Jan 2023 13:49:34 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-trivial@nongnu.org Subject: [PATCH 3/7] hw/tpm: Move tpm_ppi.c out of target-specific source set Date: Thu, 12 Jan 2023 14:49:24 +0100 Message-Id: <20230112134928.1026006-4-thuth@redhat.com> In-Reply-To: <20230112134928.1026006-1-thuth@redhat.com> References: <20230112134928.1026006-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé The TPM Physical Presence Interface is not target specific. Build this file once for all targets. Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20221209170042.71169-4-philmd@linaro.org> [thuth: Drop the CONFIG_SOFTMMU statements, they are not needed here] Signed-off-by: Thomas Huth --- hw/tpm/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/tpm/meson.build b/hw/tpm/meson.build index 1c68d81d6a..7abc2d794a 100644 --- a/hw/tpm/meson.build +++ b/hw/tpm/meson.build @@ -2,7 +2,7 @@ softmmu_ss.add(when: 'CONFIG_TPM_TIS', if_true: files('tpm_tis_common.c')) softmmu_ss.add(when: 'CONFIG_TPM_TIS_ISA', if_true: files('tpm_tis_isa.c')) softmmu_ss.add(when: 'CONFIG_TPM_TIS_SYSBUS', if_true: files('tpm_tis_sysbus.c')) softmmu_ss.add(when: 'CONFIG_TPM_CRB', if_true: files('tpm_crb.c')) +softmmu_ss.add(when: 'CONFIG_TPM_TIS', if_true: files('tpm_ppi.c')) +softmmu_ss.add(when: 'CONFIG_TPM_CRB', if_true: files('tpm_ppi.c')) -specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TPM_TIS'], if_true: files('tpm_ppi.c')) -specific_ss.add(when: ['CONFIG_SOFTMMU', 'CONFIG_TPM_CRB'], if_true: files('tpm_ppi.c')) specific_ss.add(when: 'CONFIG_TPM_SPAPR', if_true: files('tpm_spapr.c')) From patchwork Thu Jan 12 13:49:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 641657 Delivered-To: patch@linaro.org Received: by 2002:a17:522:f3c4:b0:4b4:3859:abed with SMTP id in4csp3809940pvb; Thu, 12 Jan 2023 05:52:45 -0800 (PST) X-Google-Smtp-Source: AMrXdXvuHP3YI2MLk3u8g2lDN5VrtQZ5bE5TN32ghRFVFdEpX92iRsRv6V/CRJfCfgDBDWu3DEFJ X-Received: by 2002:a05:622a:59cb:b0:3a9:80b6:4c9c with SMTP id gc11-20020a05622a59cb00b003a980b64c9cmr107382949qtb.47.1673531565614; Thu, 12 Jan 2023 05:52:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673531565; cv=none; d=google.com; s=arc-20160816; b=T+3kGbsfSHgKuFHCYJN6qokAvDv+YoB6pAGzZsxSNpEi9SRwjwjsPzR5kgFeiCbMet 63pYhL/gAbzHaJk8my7ANj1W7/eoo/+NHyUD3wHmqVd8vjGuFdpLWlvMsEKEBCoHzpsh +daspXX2XZzAKmlmsX9jvcKanP6Qe7aoDZZmJKn7XU3JqWDO7bO0ha+NM5A97pkaUI0N /J0J+ZJ3UtuiPsP04B575l1cS34dIAjMTLSMYE/EKO90TOmfDOHRJU5kBgo3BqJktw5V cDRsprtlcYvGACVdo/pMev0NIQdMiKjnorO+Gd6vEPM3lozdPN7I1zF4hQATMMI9gYUi 17Iw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=1KUTSENUDqoXrb8Lk8ln5lSj0uVJXRa4hAjhpEkVc1k=; b=kqslr+AHdjQc9QM1K3lfKTAGxxGezztlSJBwNragNVhxDFDuIkP3PWjtNr5k95K7aD PLyEd5q2QXQLyBx3KzziMbOUghHCoZ/s4XlgwPVpY5Xo5VmG97obfpmYxNtQGPScRhxH AHHKLgUCHMz4nGrjxtT9ZrhyxmsxC1VkNqWFeJC13XxSrMo4yS42jZizyglIPunsCKMn YoYPHYUXwr7OMnH/Cz4GLCD5Sl01OLlEn5YlCtGLhT4c8n3NhgCA45lOSl9S/wEuX6/W rQU/z6G8pRPvnYIpIHmgMxWyXISVYm9YCXiMec6v2CbsNAHY0gKnwXkmMAJ7QBGXFLEy AcHQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Oey4ZVIA; 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=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTP id a5-20020ac84d85000000b003a694ff31b0si9922136qtw.549.2023.01.12.05.52.45 for ; Thu, 12 Jan 2023 05:52:45 -0800 (PST) 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=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Oey4ZVIA; 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=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pFxxk-0001k7-V9; Thu, 12 Jan 2023 08:49:48 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFxxf-0001fP-TB for qemu-devel@nongnu.org; Thu, 12 Jan 2023 08:49:45 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pFxxd-00038k-CM for qemu-devel@nongnu.org; Thu, 12 Jan 2023 08:49:43 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1673531380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1KUTSENUDqoXrb8Lk8ln5lSj0uVJXRa4hAjhpEkVc1k=; b=Oey4ZVIARU78xuAIo++X8sxbIbLbDqV7FXQRUMdnP9anoxT8YX1k0qJqXyWSL+ki/wXwDj mtA0QAsdBo+L9bL/H7x9flDxnjajnXD7YC1/AicUAfcHBD1S+KMX5pHH5Q0dAKO2iKfV+0 rqvivKULDRyanX8aBSVqOcvwOWzWZ8A= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-375-Nzq2B019O5GOMTlinKwguA-1; Thu, 12 Jan 2023 08:49:36 -0500 X-MC-Unique: Nzq2B019O5GOMTlinKwguA-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1AC8D811E6E; Thu, 12 Jan 2023 13:49:36 +0000 (UTC) Received: from thuth.com (unknown [10.39.193.2]) by smtp.corp.redhat.com (Postfix) with ESMTP id 49C1040C2004; Thu, 12 Jan 2023 13:49:35 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, qemu-trivial@nongnu.org Subject: [PATCH 4/7] hw/arm: Move various units to softmmu_ss[] Date: Thu, 12 Jan 2023 14:49:25 +0100 Message-Id: <20230112134928.1026006-5-thuth@redhat.com> In-Reply-To: <20230112134928.1026006-1-thuth@redhat.com> References: <20230112134928.1026006-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Philippe Mathieu-Daudé arm_ss[] units are built twice: once for 32-bit word size and once for 64-bit. The following units don't require any word size knowledge and can be moved to softmmu_ss[] (where they are built once): - smmu-common.c - exynos4_boards.c - bcm2835_peripherals.c - tosa.c Signed-off-by: Philippe Mathieu-Daudé Message-Id: <20230110164406.94366-2-philmd@linaro.org> Signed-off-by: Thomas Huth --- hw/arm/meson.build | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/hw/arm/meson.build b/hw/arm/meson.build index 92f9f6e000..4babaa8dfc 100644 --- a/hw/arm/meson.build +++ b/hw/arm/meson.build @@ -3,7 +3,6 @@ arm_ss.add(files('boot.c'), fdt) arm_ss.add(when: 'CONFIG_ARM_VIRT', if_true: files('virt.c')) arm_ss.add(when: 'CONFIG_ACPI', if_true: files('virt-acpi-build.c')) arm_ss.add(when: 'CONFIG_DIGIC', if_true: files('digic_boards.c')) -arm_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4_boards.c')) arm_ss.add(when: 'CONFIG_EMCRAFT_SF2', if_true: files('msf2-som.c')) arm_ss.add(when: 'CONFIG_HIGHBANK', if_true: files('highbank.c')) arm_ss.add(when: 'CONFIG_INTEGRATOR', if_true: files('integratorcp.c')) @@ -18,7 +17,6 @@ arm_ss.add(when: 'CONFIG_SX1', if_true: files('omap_sx1.c')) arm_ss.add(when: 'CONFIG_CHEETAH', if_true: files('palm.c')) arm_ss.add(when: 'CONFIG_GUMSTIX', if_true: files('gumstix.c')) arm_ss.add(when: 'CONFIG_SPITZ', if_true: files('spitz.c')) -arm_ss.add(when: 'CONFIG_TOSA', if_true: files('tosa.c')) arm_ss.add(when: 'CONFIG_Z2', if_true: files('z2.c')) arm_ss.add(when: 'CONFIG_REALVIEW', if_true: files('realview.c')) arm_ss.add(when: 'CONFIG_SBSA_REF', if_true: files('sbsa-ref.c')) @@ -38,7 +36,7 @@ arm_ss.add(when: 'CONFIG_OMAP', if_true: files('omap1.c', 'omap2.c')) arm_ss.add(when: 'CONFIG_STRONGARM', if_true: files('strongarm.c')) arm_ss.add(when: 'CONFIG_ALLWINNER_A10', if_true: files('allwinner-a10.c', 'cubieboard.c')) arm_ss.add(when: 'CONFIG_ALLWINNER_H3', if_true: files('allwinner-h3.c', 'orangepi.c')) -arm_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_peripherals.c', 'bcm2836.c', 'raspi.c')) +arm_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2836.c', 'raspi.c')) arm_ss.add(when: 'CONFIG_STM32F100_SOC', if_true: files('stm32f100_soc.c')) arm_ss.add(when: 'CONFIG_STM32F205_SOC', if_true: files('stm32f205_soc.c')) arm_ss.add(when: 'CONFIG_STM32F405_SOC', if_true: files('stm32f405_soc.c')) @@ -59,8 +57,13 @@ arm_ss.add(when: 'CONFIG_MSF2', if_true: files('msf2-soc.c')) arm_ss.add(when: 'CONFIG_MUSCA', if_true: files('musca.c')) arm_ss.add(when: 'CONFIG_ARMSSE', if_true: files('armsse.c')) arm_ss.add(when: 'CONFIG_FSL_IMX7', if_true: files('fsl-imx7.c', 'mcimx7d-sabre.c')) -arm_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmu-common.c', 'smmuv3.c')) +arm_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmuv3.c')) arm_ss.add(when: 'CONFIG_FSL_IMX6UL', if_true: files('fsl-imx6ul.c', 'mcimx6ul-evk.c')) arm_ss.add(when: 'CONFIG_NRF51_SOC', if_true: files('nrf51_soc.c')) +softmmu_ss.add(when: 'CONFIG_ARM_SMMUV3', if_true: files('smmu-common.c')) +softmmu_ss.add(when: 'CONFIG_EXYNOS4', if_true: files('exynos4_boards.c')) +softmmu_ss.add(when: 'CONFIG_RASPI', if_true: files('bcm2835_peripherals.c')) +softmmu_ss.add(when: 'CONFIG_TOSA', if_true: files('tosa.c')) + hw_arch += {'arm': arm_ss}