From patchwork Mon Aug 5 18:06:21 2024 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: 816751 Delivered-To: patch@linaro.org Received: by 2002:adf:e00d:0:b0:367:895a:4699 with SMTP id s13csp1470060wrh; Mon, 5 Aug 2024 11:08:36 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVUW067UTWjQd/7PcAQEBoLkfpBJYOZ0qUaHFveeTabY7+UM3zAdNUDOjKgziPZTTvGVcYjkg==@linaro.org X-Google-Smtp-Source: AGHT+IEYCnRYqqbTHVVoyXBT83/oYfjhDWbu0Ak5LAE9HPRNvBdGoKO4KBxI8ulWWfyqc3C7nODn X-Received: by 2002:ac8:7d96:0:b0:446:4c0f:ef03 with SMTP id d75a77b69052e-45189204d74mr139183871cf.10.1722881316186; Mon, 05 Aug 2024 11:08:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1722881316; cv=none; d=google.com; s=arc-20160816; b=q2+tCMlHXXJ4IHBYXsmKgwvgoT1NNxjPHjXvwxXV09A5I1D1lCU2M+JgoHrOCvI9KW iHwU8UDTGB9l3d4RSo+GzCUCpqzBcoGc/9Q4UsB0LwzsxU6ob8FY1+PKp+49OMPtASLk lha9oCzludlf47tkg51vqrEXnoUs4ebxXtmkVpXZwUbyMnABC7xzZG83k3qz16kHROaw N4eT6+aGRJsqdtwK2q01ckKMl4l2isMdu1G1U0och9hSuloYbLEa733napZ9mH/gq86V msrsiX9HAC/13hZp5CytdSLCTKOnYHvokkBbM5L8gZDM9ArBrInvhy8Wp8MTPcyIhGXD scbg== 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=I1vkVvGYva6AXVxaYurK5JW7ap7wfr9UqBuNEWmzqSg=; fh=9FIv2ryHyUdV0M0E/xImFOb7ha8RVmpB9WW8IcVSbKs=; b=ngz4Gegfk7xNUuVrsLgEtCGCmfUh9MZWiCiRVfLHf3ovZ2FgE8rJRusypJWKnisQCZ 5phatRMWi0GvvyBvzQaPzFIzxYWY7ot5GZ1v1D9jifSQzXsPYmtQO//2GtyiI5hJJHzY pEdduiSHHcF7hk1r+bsORPjtFW3mA+M0LBvc8NeWjxbdq8NXHS696Xo55t6Xmn6zExss 0SpWpJLKJFTY8ZqlVoCSuBrIKemwNsXZWsP/9fOB3d7zPOR/TCV0w37PocFqESUCZ+T1 UjAAx64Wy1lzBREti89rjuRJBJIk0PMt0hs6uscHRncaq6jS0sLEYgWGeVsrDDc2N5xt L97w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=EsjxB9JR; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-4518a7c3286si108393661cf.806.2024.08.05.11.08.36 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 05 Aug 2024 11:08:36 -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=EsjxB9JR; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sb27p-0004c7-3K; Mon, 05 Aug 2024 14:08:05 -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 1sb27k-00047V-3L for qemu-devel@nongnu.org; Mon, 05 Aug 2024 14:08:01 -0400 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sb27h-0006T0-KW for qemu-devel@nongnu.org; Mon, 05 Aug 2024 14:07:59 -0400 Received: by mail-wm1-x32e.google.com with SMTP id 5b1f17b1804b1-428178fc07eso68960575e9.3 for ; Mon, 05 Aug 2024 11:07:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1722881275; x=1723486075; 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=I1vkVvGYva6AXVxaYurK5JW7ap7wfr9UqBuNEWmzqSg=; b=EsjxB9JR9/rTu8urC/rQYdAKQbeI+LO8HpUMV9/5KYWbam8DqPLEWvfkfLmMf5BnVH An3jQ5v2YuWQ/hHIMXakN4XH0kjvfihu8+GJM+4AakBYTRmbpzXqJVNaa84ygADTVBk5 WjMsgqcpkdY9JRjKTPXKSfPCA4A0TsASx6UIHr0RZrWhZjQMOg19CCGCqFNS9cgfOYC3 C8hBqZZwI/kDuS1vpBJoY5nfF9uHMwnjPyuXgM3AF5yiVClHdA3vrhJo1XsZNM2F0QWD /H239Qnng0Y2w3zEZ5mvFkkAFIVTVv9Ypy8UUbtD0e80AuiuG77aKZ6egrj03E/L/0zf FjvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722881275; x=1723486075; 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=I1vkVvGYva6AXVxaYurK5JW7ap7wfr9UqBuNEWmzqSg=; b=EyITy70nqyaNfsOSaqlwlQ7Z5/H7RYmLacl/Ka0yYkRKtDYSW/gfTj7DolSr7FTVSh BQ/8QzhYQK/Wii5xJtTTL1KgV7ZpcjwrxWwFbyOP4ZQrUfnZSSpx+gnGvNm7evT1oJGO 56RxHHSV8/T9bcsEhhRmsDNsdYsV3ITl1k8atO6+f5BtL+ocXEt8qQEsPiB7apXZ5s4e iAYBtiy5ibq3XSOuuYSgYbHkn4qe9rZi66OuXqIlnpsMlyARqKXKzpxUBjREZXCTSr8W 8TwxsV8vQ8k4S6qolBGXUJzH7FYmLPrA/ef/UU5dAMtS5eoU7Tf8NFe9IPUeevsOpbqW YMvQ== X-Gm-Message-State: AOJu0YzeZC5qfW0MHNyPE2x+QlL17voKPVnDssJTTobBRT0YH+mfk/rS xjCqXKGt3JmUsrtocT5TWL3qZBN8cuQEClmfA3uyfIgT9eAEN29o3SA6p7raWzqJNs8xZikgKHw t X-Received: by 2002:a05:600c:3111:b0:426:5c9b:dee6 with SMTP id 5b1f17b1804b1-428e6b7f2c7mr86127005e9.26.1722881275198; Mon, 05 Aug 2024 11:07:55 -0700 (PDT) Received: from m1x-phil.lan (cor91-h02-176-184-30-206.dsl.sta.abo.bbox.fr. [176.184.30.206]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4282bb64952sm212345545e9.37.2024.08.05.11.07.53 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 05 Aug 2024 11:07:54 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org, Bibo Mao Cc: Song Gao , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Richard Henderson , Jiaxun Yang Subject: [PATCH-for-9.1 v6 14/15] hw/intc/loongson_ipi: Restrict to MIPS Date: Mon, 5 Aug 2024 20:06:21 +0200 Message-ID: <20240805180622.21001-15-philmd@linaro.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240805180622.21001-1-philmd@linaro.org> References: <20240805180622.21001-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32e; envelope-from=philmd@linaro.org; helo=mail-wm1-x32e.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=ham 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: Bibo Mao Now than LoongArch target can use the TYPE_LOONGARCH_IPI model, restrict TYPE_LOONGSON_IPI to MIPS. Signed-off-by: Bibo Mao [PMD: Extracted from bigger commit, added commit description] Co-Developed-by: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Bibo Mao Tested-by: Bibo Mao Acked-by: Song Gao Reviewed-by: Richard Henderson Reviewed-by: Jiaxun Yang Tested-by: Jiaxun Yang Message-Id: <20240718133312.10324-18-philmd@linaro.org> --- MAINTAINERS | 2 -- hw/intc/loongson_ipi.c | 14 -------------- 2 files changed, 16 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 5ca701cf0c..74a85360fd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1251,10 +1251,8 @@ F: hw/loongarch/ F: include/hw/loongarch/virt.h F: include/hw/intc/loongarch_*.h F: include/hw/intc/loongson_ipi_common.h -F: include/hw/intc/loongson_ipi.h F: hw/intc/loongarch_*.c F: hw/intc/loongson_ipi_common.c -F: hw/intc/loongson_ipi.c F: include/hw/pci-host/ls7a.h F: hw/rtc/ls7a_rtc.c F: gdb-xml/loongarch*.xml diff --git a/hw/intc/loongson_ipi.c b/hw/intc/loongson_ipi.c index 0b88ae3230..8382ceca67 100644 --- a/hw/intc/loongson_ipi.c +++ b/hw/intc/loongson_ipi.c @@ -16,22 +16,9 @@ #include "exec/address-spaces.h" #include "exec/memory.h" #include "migration/vmstate.h" -#ifdef TARGET_LOONGARCH64 -#include "target/loongarch/cpu.h" -#endif -#ifdef TARGET_MIPS #include "target/mips/cpu.h" -#endif #include "trace.h" -#ifdef TARGET_LOONGARCH64 -static AddressSpace *get_iocsr_as(CPUState *cpu) -{ - return LOONGARCH_CPU(cpu)->env.address_space_iocsr; -} -#endif - -#ifdef TARGET_MIPS static AddressSpace *get_iocsr_as(CPUState *cpu) { if (ase_lcsr_available(&MIPS_CPU(cpu)->env)) { @@ -40,7 +27,6 @@ static AddressSpace *get_iocsr_as(CPUState *cpu) return NULL; } -#endif static const MemoryRegionOps loongson_ipi_core_ops = { .read_with_attrs = loongson_ipi_core_readl,