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'))