From patchwork Thu Oct 19 21:17:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 735617 Delivered-To: patch@linaro.org Received: by 2002:adf:f0cd:0:b0:32d:baff:b0ca with SMTP id x13csp1731192wro; Thu, 19 Oct 2023 14:23:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHF8FpQMhNdcl+aGN5CNU3TFAJ90r99dpo0EdVlO0+XtQQ4p1ZNZMH+yoef0HioxM1ErvMJ X-Received: by 2002:a05:622a:647:b0:418:225d:e9d2 with SMTP id a7-20020a05622a064700b00418225de9d2mr3889105qtb.52.1697750633525; Thu, 19 Oct 2023 14:23:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697750633; cv=none; d=google.com; s=arc-20160816; b=e/CvExhkdLni9uJ1k7PPzENG7ffENLon/wPkvwsBscQtqAjx6g+mN2OMaZzgkBweP0 OnEBnCaq9JsXdAo8zPDQooib0Y1EP3a09U6xvngOKHt14SbaCPlcW+A6rX/Dlpu/y+OY 3Brsp//21jlmPeq400t7y/nAHJDv4k2DH01sNuCR+d1fLeaghwck0g5rPDz/96bXHT3Q xaVCSbsmXLHeTcAvoJatLpYOcaVD175zG1yyg90ynDY8MkUrRyvLQ4Lj7nI6/YbGjVDE xBTaLZKooDAHpslBHSZmfRMOIe6MCjsiGBzn+srRw24KnZuvdkn8KrhHuFZpigDQq7n+ 7gfw== 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=hZIQ+KgH54UQHRZkZfXDQzeJv7i8hhcdzA1tyvUGSNc=; fh=7CaI8gdpGo7H9DlIj2s0fcRA9RJIC4t0uLXTrrIGJ3o=; b=hjDx+Dq8s6DDFeUX3gdhVAl8mE599+OK23C5Fd2PIobunOjciw1UNSJG5uOxt1JGAy ul9oE6ZT/W2fUQPSJ+Wx48aT/Ap6HWPiZLybQxg3Tk6L26/+QgLbqevBSc5Jl9ui2OVB jIN2jtI9YDPXN0Q084MKccpfVYx28WHoYBO1S8PhVKhlzbBYliyOQYIcqAkeOk8P6WeB 7npAxgGAwgRNv2k50HRL4QeBGEO+bXJmag0wrlbm2rNVQieioq5rNoLhRrVDHqUEk5/L MW/i5gd6UZYbSrjgkmn/OX2nsyoqmFXQbcsGuKkwEONN4MLYLTHZ3uVr1tH051dPr/om IHEg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=rXsaNyQl; 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=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id s7-20020a05622a178700b003f9bd68a453si236395qtk.791.2023.10.19.14.23.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Oct 2023 14:23:53 -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=pass header.i=@linaro.org header.s=google header.b=rXsaNyQl; 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=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtaQl-0006eT-3J; Thu, 19 Oct 2023 17:19:47 -0400 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 1qtaQg-0006VY-TB for qemu-devel@nongnu.org; Thu, 19 Oct 2023 17:19:44 -0400 Received: from mail-lj1-x22f.google.com ([2a00:1450:4864:20::22f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qtaQd-00055E-OR for qemu-devel@nongnu.org; Thu, 19 Oct 2023 17:19:42 -0400 Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-2c5087d19a6so1825021fa.0 for ; Thu, 19 Oct 2023 14:19:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697750377; x=1698355177; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hZIQ+KgH54UQHRZkZfXDQzeJv7i8hhcdzA1tyvUGSNc=; b=rXsaNyQlE/hzip9zJrtnv0aWBWeb6UAHNirBdHtA4GhOnxqyQ4hPq9ZS3ZK5+KrWlN dKMdJj1Edxggnz66tbn1NqJBp8/nVJbiTBlPtHKdGrlta9+Hi0jlEaD+eIGISSXpy25U FtHJm4GlHrZWTevhar8jsQvqrDKENW/1kFEx/rjtafFTvm+bIlsACC6kG8Y6fjO22bdZ +V16UQXCuGd5Z1DT+egz8R3xByBN3UDbIHZswpH4qn5qEfrM08o0ekIjMv0lGu/g/nU9 moxlu5EBHDVAE5AMg7/HYDaWF7LfI/XK1rT0PlWJzK8Ha1bgKYhS5mdPdlaHYvYzy6/4 qb6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697750377; x=1698355177; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hZIQ+KgH54UQHRZkZfXDQzeJv7i8hhcdzA1tyvUGSNc=; b=xE4cplAZX/fYcelx8JptAOiQOwEM/0YH5YQTH2spLttQNYBnGCClWGK0dHTKeWPwhX nN1gIiiwAKsp+xEDh+zIDnUjphvZmMGrNSfjkjpLCrNEju6cvLF3X9bvIrBQ5JmtKNbV d1A987+Z0Hotu1R4cEkSZltgiEhs5X+Vg+Jbu/GRbPSp5ctJ9XHf6Bb062VEWgtpvSR/ 3cfNqdk6QLqoGDo3l21M5PltFswU1gwLF8g1Zb/YvnIfsBEgSnRnmnO7mnNPwPd49rwg GTKVBwqedC1oCIyprWJPNsU6qe7rN8Jdyn+ncZrZc9RZQE7tjJ/PzmEVtVLMjWrMITEo aG6Q== X-Gm-Message-State: AOJu0YzGrvUA4cu1RcBEbP1GfFai+X2RF4m6pCZVm+D/HQIeUS/dOCa2 YTPk7WHoI81vw7i/dUhS5voPh7yHPT2eB5QeyCVJAA== X-Received: by 2002:a05:651c:170b:b0:2c5:2eaa:5398 with SMTP id be11-20020a05651c170b00b002c52eaa5398mr92601ljb.25.1697750377370; Thu, 19 Oct 2023 14:19:37 -0700 (PDT) Received: from m1x-phil.lan (176-131-216-177.abo.bbox.fr. [176.131.216.177]) by smtp.gmail.com with ESMTPSA id r9-20020a05600c158900b0040776008abdsm503991wmf.40.2023.10.19.14.19.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 19 Oct 2023 14:19:36 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, qemu-s390x@nongnu.org, qemu-block@nongnu.org, qemu-arm@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Huacai Chen , Jiaxun Yang , =?utf-8?q?Herv=C3=A9_Poussineau?= , Aleksandar Rikalo , Aurelien Jarno Subject: [PULL 12/46] hw/mips: Merge 'hw/mips/cpudevs.h' with 'target/mips/cpu.h' Date: Thu, 19 Oct 2023 23:17:37 +0200 Message-ID: <20231019211814.30576-13-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231019211814.30576-1-philmd@linaro.org> References: <20231019211814.30576-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::22f; envelope-from=philmd@linaro.org; helo=mail-lj1-x22f.google.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, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, 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 "hw/mips/cpudevs.h" contains declarations which are specific to the MIPS architecture; it doesn't make sense for these to be called from a non-MIPS architecture. Move the declarations to "target/mips/cpu.h". Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Message-Id: <20231009171443.12145-2-philmd@linaro.org> --- include/hw/mips/cpudevs.h | 14 -------------- target/mips/cpu.h | 4 +++- hw/mips/cps.c | 1 - hw/mips/fuloong2e.c | 1 - hw/mips/jazz.c | 1 - hw/mips/loongson3_virt.c | 1 - hw/mips/malta.c | 1 - hw/mips/mips_int.c | 1 - hw/mips/mipssim.c | 1 - target/mips/sysemu/cp0_timer.c | 1 - target/mips/tcg/sysemu/tlb_helper.c | 1 - 11 files changed, 3 insertions(+), 24 deletions(-) delete mode 100644 include/hw/mips/cpudevs.h diff --git a/include/hw/mips/cpudevs.h b/include/hw/mips/cpudevs.h deleted file mode 100644 index f7c9728fa9..0000000000 --- a/include/hw/mips/cpudevs.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef HW_MIPS_CPUDEVS_H -#define HW_MIPS_CPUDEVS_H - -#include "target/mips/cpu-qom.h" - -/* Definitions for MIPS CPU internal devices. */ - -/* mips_int.c */ -void cpu_mips_irq_init_cpu(MIPSCPU *cpu); - -/* mips_timer.c */ -void cpu_mips_clock_init(MIPSCPU *cpu); - -#endif diff --git a/target/mips/cpu.h b/target/mips/cpu.h index 67f8e8b988..fb44defc93 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -1345,8 +1345,10 @@ uint64_t cpu_mips_phys_to_kseg1(void *opaque, uint64_t addr); #if !defined(CONFIG_USER_ONLY) -/* mips_int.c */ +/* HW declaration specific to the MIPS target */ void cpu_mips_soft_irq(CPUMIPSState *env, int irq, int level); +void cpu_mips_irq_init_cpu(MIPSCPU *cpu); +void cpu_mips_clock_init(MIPSCPU *cpu); /* mips_itu.c */ void itc_reconfigure(struct MIPSITUState *tag); diff --git a/hw/mips/cps.c b/hw/mips/cps.c index 2b5269ebf1..b6612c1762 100644 --- a/hw/mips/cps.c +++ b/hw/mips/cps.c @@ -24,7 +24,6 @@ #include "hw/mips/mips.h" #include "hw/qdev-clock.h" #include "hw/qdev-properties.h" -#include "hw/mips/cpudevs.h" #include "sysemu/kvm.h" #include "sysemu/reset.h" diff --git a/hw/mips/fuloong2e.c b/hw/mips/fuloong2e.c index c6109633fe..97b2c8ed8e 100644 --- a/hw/mips/fuloong2e.c +++ b/hw/mips/fuloong2e.c @@ -30,7 +30,6 @@ #include "hw/block/flash.h" #include "hw/mips/mips.h" #include "hw/mips/bootloader.h" -#include "hw/mips/cpudevs.h" #include "hw/pci/pci.h" #include "hw/loader.h" #include "hw/ide/pci.h" diff --git a/hw/mips/jazz.c b/hw/mips/jazz.c index c32d2b0b0a..86dfe05ea8 100644 --- a/hw/mips/jazz.c +++ b/hw/mips/jazz.c @@ -26,7 +26,6 @@ #include "qemu/datadir.h" #include "hw/clock.h" #include "hw/mips/mips.h" -#include "hw/mips/cpudevs.h" #include "hw/intc/i8259.h" #include "hw/dma/i8257.h" #include "hw/char/serial.h" diff --git a/hw/mips/loongson3_virt.c b/hw/mips/loongson3_virt.c index b74b358874..33eae01eca 100644 --- a/hw/mips/loongson3_virt.c +++ b/hw/mips/loongson3_virt.c @@ -32,7 +32,6 @@ #include "hw/char/serial.h" #include "hw/intc/loongson_liointc.h" #include "hw/mips/mips.h" -#include "hw/mips/cpudevs.h" #include "hw/mips/fw_cfg.h" #include "hw/mips/loongson3_bootp.h" #include "hw/misc/unimp.h" diff --git a/hw/mips/malta.c b/hw/mips/malta.c index 62d04ed113..4fa5b33fd9 100644 --- a/hw/mips/malta.c +++ b/hw/mips/malta.c @@ -37,7 +37,6 @@ #include "hw/block/flash.h" #include "hw/mips/mips.h" #include "hw/mips/bootloader.h" -#include "hw/mips/cpudevs.h" #include "hw/pci/pci.h" #include "hw/pci/pci_bus.h" #include "qemu/log.h" diff --git a/hw/mips/mips_int.c b/hw/mips/mips_int.c index 73437cd90f..6c32e466a3 100644 --- a/hw/mips/mips_int.c +++ b/hw/mips/mips_int.c @@ -23,7 +23,6 @@ #include "qemu/osdep.h" #include "qemu/main-loop.h" #include "hw/irq.h" -#include "hw/mips/cpudevs.h" #include "sysemu/kvm.h" #include "kvm_mips.h" diff --git a/hw/mips/mipssim.c b/hw/mips/mipssim.c index 2f951f7fc6..4f743f37eb 100644 --- a/hw/mips/mipssim.c +++ b/hw/mips/mipssim.c @@ -30,7 +30,6 @@ #include "qemu/datadir.h" #include "hw/clock.h" #include "hw/mips/mips.h" -#include "hw/mips/cpudevs.h" #include "hw/char/serial.h" #include "hw/isa/isa.h" #include "net/net.h" diff --git a/target/mips/sysemu/cp0_timer.c b/target/mips/sysemu/cp0_timer.c index 9d2bcb0dea..62de502caa 100644 --- a/target/mips/sysemu/cp0_timer.c +++ b/target/mips/sysemu/cp0_timer.c @@ -22,7 +22,6 @@ #include "qemu/osdep.h" #include "hw/irq.h" -#include "hw/mips/cpudevs.h" #include "qemu/timer.h" #include "sysemu/kvm.h" #include "internal.h" diff --git a/target/mips/tcg/sysemu/tlb_helper.c b/target/mips/tcg/sysemu/tlb_helper.c index 7dbc2e24c4..4ede904800 100644 --- a/target/mips/tcg/sysemu/tlb_helper.c +++ b/target/mips/tcg/sysemu/tlb_helper.c @@ -24,7 +24,6 @@ #include "exec/exec-all.h" #include "exec/cpu_ldst.h" #include "exec/log.h" -#include "hw/mips/cpudevs.h" #include "exec/helper-proto.h" /* TLB management */