From nobody Tue Nov 26 12:22:28 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1707297232; cv=none; d=zohomail.com; s=zohoarc; b=Uy13tqnnJdu2qJ+PL9GYkID50/vts/TKy7n739TDiuUdD5p4p6SHN5hWFsShY2IsqxfvR8G3u1lvuB1r+HX4zM/ARCwO4W6ufG2uHLfPZdR+f9UzPNJ5uH6+JEKJvAJMmZ6zCjVN1W4mSnC8QEx9u5XKC8nzTkCuPflXBjtvEag= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1707297232; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=qdGMcRfsmtGhYej/iom74nzzoWRpqiyUHpcA+be6vSE=; b=QEdYxd2EbseC308sj6r5knDOJSTMpo47R/ob9qI/W02gKv2l6m60RcnFCDbRPjV9iM418HaCaURsTlYa6tAdVx4BkejczXTpOiBB9Hw4myvDOLCh9Evxhxur2pDssU12Bchu0ArXje8TgfvManDd6CW0uhzV2RVHMa1TppE22Ng= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1707297232832952.2970624571219; Wed, 7 Feb 2024 01:13:52 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rXdzU-0005Ly-Ul; Wed, 07 Feb 2024 04:13:12 -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 1rXdzP-0005HQ-5k for qemu-devel@nongnu.org; Wed, 07 Feb 2024 04:13:07 -0500 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rXdzN-0008Gh-Do for qemu-devel@nongnu.org; Wed, 07 Feb 2024 04:13:06 -0500 Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-55790581457so486103a12.3 for ; Wed, 07 Feb 2024 01:13:04 -0800 (PST) Received: from m1x-phil.lan ([176.176.170.22]) by smtp.gmail.com with ESMTPSA id w24-20020a17090652d800b00a3738c18c9csm528627ejn.178.2024.02.07.01.13.01 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 07 Feb 2024 01:13:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707297183; x=1707901983; 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=qdGMcRfsmtGhYej/iom74nzzoWRpqiyUHpcA+be6vSE=; b=IVDfq4qgANHftUYI4IjFXArSeiMJib04Q556HO5bX6ihQrqMCYmuO0G/I9WXl5j2b/ NvcWChN/HbAzbh/ue4guOoAV9Jv1M//bcScX9xVcv0nuzLsKJ7E58R4U6QnWK03tEKLM pic89958dgUBL1e3WQrUoyJSYQcQFZTI7+T8R1VeTALHKDHOMotrkcR6GyV9x+Bf8Fxd 9gaHkX1jqkK0M1ClNFcZTaskch7F//hboYP9VDa5zZbBp1bi8tgr4fV8F7S3AyYOVcHI nM4gXMj+ItRCtVTP/7SRw4Lzy5cAwMmgecjw4Qf3AvBuyMAwF7PQeuj2z3mED3wu/CId tSmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707297183; x=1707901983; 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=qdGMcRfsmtGhYej/iom74nzzoWRpqiyUHpcA+be6vSE=; b=errFbp4i3DCQC9THQ1BgQyAUVb5SJnlQUZUn8IeZwEF5TiQtxk1EVW8FkGGHWSeiMc Bq7XQ73qcl9XHKays+qj0+M/jwTpulQC8Dy+yY3w0i1CSn1q+LRrdantfmeVjCGhVZlH X7o2jSz+w1yabZX0As7RtiTHyMlwvK++L/QDzJLMP08F9NrWS5BjO8VKK3l0ss7dCrTS zL6k8iD0umBzx9dQBOXGLM2K5bJjiUMN7gd1+Y3Y+9mf0MpB94uMXuxUyr7UHkxVJ71B 4G/6YfJ4lqb3+gaCjqp+/Waw/neg01FQSy/IPLFpEY4BkoEuvamZT8SDbJt4ouelVie7 pbug== X-Gm-Message-State: AOJu0YzUm7/XwcSKZH0HdfR706wga6pjVF9EkMEvgUA5dLW17rhb/Mc7 dkTUwFuA+Dm0zTkUnN75l5pCGjFSXxo7zsSamLBPPC5YdLR2bSSLntF+oIum1hJsLEyA6RNqtLz Y X-Google-Smtp-Source: AGHT+IGn7aejHRfBB7NhzMHelQL6AH2NUOvJPvm+VPB9oZRKlDiV3NbTMtQKyqgfr2Uxg85XFVEEKQ== X-Received: by 2002:a17:907:960b:b0:a35:edda:ca8b with SMTP id gb11-20020a170907960b00b00a35eddaca8bmr4708718ejc.76.1707297183122; Wed, 07 Feb 2024 01:13:03 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXhd8ty0xLb2MwePx3PI+ojZX59wy9omw5on58bLRU/8WU+LeSOzP2u9ncHSm8CAzzEaYadlcg4wp+llFfEXreWmSeMXzYXRob2ssp1X0g/zfIaivRfBx9QdJjfG2wGd/e9sJ5kEnjAemK5ceEoEz7Aorq0Rb6vA4twDlIaBHg0ckgu8LS33HA+y+vX88l49qLueW3yRKRHIjpoe6dn+ViapySSg29wgMikSY1uCyNGRJvBv2A9YC8= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Nicholas Piggin , BALATON Zoltan , qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Paolo Bonzini , Daniel Henrique Barboza , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 1/4] hw/ppc/ppc4xx_pci: Remove unused "hw/ppc/ppc.h" header Date: Wed, 7 Feb 2024 10:12:51 +0100 Message-ID: <20240207091254.1478-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240207091254.1478-1-philmd@linaro.org> References: <20240207091254.1478-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::535; envelope-from=philmd@linaro.org; helo=mail-ed1-x535.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, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1707297234285100001 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: BALATON Zoltan Message-Id: <20231011132427.65001-2-philmd@linaro.org> Reviewed-by: Thomas Huth --- hw/ppc/ppc440_pcix.c | 1 - hw/ppc/ppc4xx_pci.c | 1 - 2 files changed, 2 deletions(-) diff --git a/hw/ppc/ppc440_pcix.c b/hw/ppc/ppc440_pcix.c index df4ee374d0..d84418cb7b 100644 --- a/hw/ppc/ppc440_pcix.c +++ b/hw/ppc/ppc440_pcix.c @@ -25,7 +25,6 @@ #include "qemu/module.h" #include "qemu/units.h" #include "hw/irq.h" -#include "hw/ppc/ppc.h" #include "hw/ppc/ppc4xx.h" #include "hw/pci/pci_device.h" #include "hw/pci/pci_host.h" diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c index 0a07aab5d1..e4101398c9 100644 --- a/hw/ppc/ppc4xx_pci.c +++ b/hw/ppc/ppc4xx_pci.c @@ -24,7 +24,6 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "hw/irq.h" -#include "hw/ppc/ppc.h" #include "hw/ppc/ppc4xx.h" #include "migration/vmstate.h" #include "qemu/module.h" --=20 2.41.0 From nobody Tue Nov 26 12:22:28 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1707297240; cv=none; d=zohomail.com; s=zohoarc; b=F8kSouvlH4hHtnqYuMZEEz2DY0XZAbgMwszj2qkviOuflDWtZUWY3t+4AnrYa3Av0ggKuwH/8u+Xg/apQojKe+XJ/HqA/SKGGCR/R2KUquUzoSkk3pt8tgUKG+pPWN3oi1SZtVYSAQaMb1lD6JFgyluwJYgkwLTgpWNCIoEC2BE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1707297240; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=yytOM426lSRQ7TkKcf1G+JiJxoGr/F3Uafxb01Uxm28=; b=k1LqhZmjRGwKuu/RCyyYzXFpgZmWGzhXa6/A3byDXVf+BoTgUkMOXN0X3xSWfNjJSNJ+SBxN/JEtOiD1IApT+lDM1tztMdxubs72QkJWciGt1tAg0hORCAZt2c+K/7CXQJEZSNq9mUtFko4yivIG5tQThgEUZIO/sFk6lFHFnqY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1707297240447301.59820058746834; Wed, 7 Feb 2024 01:14:00 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rXdzg-0005Q3-U6; Wed, 07 Feb 2024 04:13:24 -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 1rXdzV-0005MB-5Y for qemu-devel@nongnu.org; Wed, 07 Feb 2024 04:13:14 -0500 Received: from mail-ej1-x62b.google.com ([2a00:1450:4864:20::62b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rXdzS-0008JG-VM for qemu-devel@nongnu.org; Wed, 07 Feb 2024 04:13:12 -0500 Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-a3864258438so81872166b.0 for ; Wed, 07 Feb 2024 01:13:10 -0800 (PST) Received: from m1x-phil.lan ([176.176.170.22]) by smtp.gmail.com with ESMTPSA id f5-20020a170906084500b00a372132718esm527985ejd.90.2024.02.07.01.13.07 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 07 Feb 2024 01:13:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707297189; x=1707901989; 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=yytOM426lSRQ7TkKcf1G+JiJxoGr/F3Uafxb01Uxm28=; b=vG32kjNiOx8e15s9qxdVGn8E4L0kr1t0KBWG3pwERYdXgh1u1caTKnFkTCK7TCAFBs ag+P8dzlnRkGjUSd3ahX14L5xUFjWRSWUIePq2+N7Dc32DXfVMzJ2wKf2KGL6jwYjwtj jRaU8Jo7uFGRGrJ0FZV72cbmoaMVOIszx1HxnyE6s9+ReFPryZ9Ufn/jmajUSVQMjGE9 DXG7bTlg3JvznRbCxlPkePkJc8ltQbrtisi9V/Gvb37opwoFZTcr+nquh3S/r6eYPSHR tMvb8nnEklcWlto16G9TEOKZRPJldcrfJn04Qye0VbgnpW69lh6BUGnXtmMmgeCkTZcT ojyQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707297189; x=1707901989; 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=yytOM426lSRQ7TkKcf1G+JiJxoGr/F3Uafxb01Uxm28=; b=biCdURxPYMlCX4pb0GndPD/q34BYc9VrNfIL6LVKNint7hIxVHVWXXfVY2XIHlFucn MO6dD7ifqqcVub9tuE30fr5l53DYMVNVRTr6jVJE09CWLf24U7PO7qYpv5Sgc9//RUUk HAGV2VE4QOawSTr6NZWMOIWDZ9MY2b480+jawheDOVmgc2z4g6OpyqJJ7Ra/eDKJvw5M 7zkVsajfxuFkHwLC/3Oa28f+DEQP+xkIwmobtACkHO9rkrTXdPGGbnFLv4btqhN8yMZE mYNVZtv7079Ru8Nbm2HTRp/P+8QZ5EDuekuFPZtlGu9cxL7SCGU59JevMBXr7o2z6m5+ H3lg== X-Gm-Message-State: AOJu0YxRtAW5laj8Q29oeQTbX/2kD5yXnwzfewdG1F4SuJ5btg5koPPo RTwMJJMtpCKZK9seuBCeFNWrqYAou/FeJ+MtCfWhSTk3IRv1eSZzQU4eVPIPNegpkRinCnAgqka k X-Google-Smtp-Source: AGHT+IGBq/B1g+AP4RykN/Kn4YTMM8dlbD4j0znFVJLXgTU1dDyQy09ZBwtAA0XpZ2U/mVQF6U76TA== X-Received: by 2002:a17:906:3d29:b0:a38:187c:2a9f with SMTP id l9-20020a1709063d2900b00a38187c2a9fmr3431236ejf.36.1707297189012; Wed, 07 Feb 2024 01:13:09 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCW7vjVGQW98Tllh5Ihtam1hDoFmUJ6jv7ppRYKcs3rqOsQp/ySh69YeH9ey322Is+WrYmDoezHyKEWPfGvJ+URUlzEZdbjXv2wSn7kgLNSI1jrXaDsTZlXknc6mcy2vDy/FfYF1Tis+agDa6oJYosoVHKr5UIqkJVltI7kyEb02nLWX6xLv0rgyOWAg89covRdHmJlZaFd0RsbD0Ecwx0ppYgi9iZlJMoabB4Ek45S8u0lnustCpAs= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Nicholas Piggin , BALATON Zoltan , qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Paolo Bonzini , Daniel Henrique Barboza , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 2/4] hw/ppc/ppc4xx_pci: Extract PCI host definitions to hw/pci-host/ppc4xx.h Date: Wed, 7 Feb 2024 10:12:52 +0100 Message-ID: <20240207091254.1478-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240207091254.1478-1-philmd@linaro.org> References: <20240207091254.1478-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62b; envelope-from=philmd@linaro.org; helo=mail-ej1-x62b.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, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1707297241937100006 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: BALATON Zoltan Message-Id: <20231011132427.65001-3-philmd@linaro.org> Reviewed-by: Thomas Huth --- MAINTAINERS | 1 + include/hw/pci-host/ppc4xx.h | 17 +++++++++++++++++ include/hw/ppc/ppc4xx.h | 5 ----- hw/ppc/ppc440_bamboo.c | 1 + hw/ppc/ppc440_pcix.c | 2 +- hw/ppc/ppc440_uc.c | 1 + hw/ppc/ppc4xx_pci.c | 2 +- hw/ppc/sam460ex.c | 1 + 8 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 include/hw/pci-host/ppc4xx.h diff --git a/MAINTAINERS b/MAINTAINERS index 2f9741b898..b288f0dc76 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2068,6 +2068,7 @@ F: hw/ppc/ppc4xx*.c F: hw/ppc/ppc440_uc.c F: hw/ppc/ppc440.h F: hw/i2c/ppc4xx_i2c.c +F: include/hw/pci-host/ppc4xx.h F: include/hw/ppc/ppc4xx.h F: include/hw/i2c/ppc4xx_i2c.h F: hw/intc/ppc-uic.c diff --git a/include/hw/pci-host/ppc4xx.h b/include/hw/pci-host/ppc4xx.h new file mode 100644 index 0000000000..dc36e1ea29 --- /dev/null +++ b/include/hw/pci-host/ppc4xx.h @@ -0,0 +1,17 @@ +/* + * QEMU PowerPC 4xx PCI-host definitions + * + * Copyright (c) 2007 Jocelyn Mayer + * + * SPDX-License-Identifier: MIT + */ + +#ifndef HW_PCIHOST_PPC4XX_H +#define HW_PCIHOST_PPC4XX_H + +#define TYPE_PPC4xx_HOST_BRIDGE "ppc4xx-host-bridge" +#define TYPE_PPC4xx_PCI_HOST "ppc4xx-pci-host" +#define TYPE_PPC440_PCIX_HOST "ppc440-pcix-host" +#define TYPE_PPC460EX_PCIE_HOST "ppc460ex-pcie-host" + +#endif diff --git a/include/hw/ppc/ppc4xx.h b/include/hw/ppc/ppc4xx.h index ea7740239b..1bd9b8821b 100644 --- a/include/hw/ppc/ppc4xx.h +++ b/include/hw/ppc/ppc4xx.h @@ -29,11 +29,6 @@ #include "exec/memory.h" #include "hw/sysbus.h" =20 -#define TYPE_PPC4xx_HOST_BRIDGE "ppc4xx-host-bridge" -#define TYPE_PPC4xx_PCI_HOST "ppc4xx-pci-host" -#define TYPE_PPC440_PCIX_HOST "ppc440-pcix-host" -#define TYPE_PPC460EX_PCIE_HOST "ppc460ex-pcie-host" - /* * Generic DCR device */ diff --git a/hw/ppc/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c index c75c3083e6..e18f57efce 100644 --- a/hw/ppc/ppc440_bamboo.c +++ b/hw/ppc/ppc440_bamboo.c @@ -24,6 +24,7 @@ #include "elf.h" #include "hw/char/serial.h" #include "hw/ppc/ppc.h" +#include "hw/pci-host/ppc4xx.h" #include "sysemu/sysemu.h" #include "sysemu/reset.h" #include "hw/sysbus.h" diff --git a/hw/ppc/ppc440_pcix.c b/hw/ppc/ppc440_pcix.c index d84418cb7b..1926ae2a27 100644 --- a/hw/ppc/ppc440_pcix.c +++ b/hw/ppc/ppc440_pcix.c @@ -25,7 +25,7 @@ #include "qemu/module.h" #include "qemu/units.h" #include "hw/irq.h" -#include "hw/ppc/ppc4xx.h" +#include "hw/pci-host/ppc4xx.h" #include "hw/pci/pci_device.h" #include "hw/pci/pci_host.h" #include "trace.h" diff --git a/hw/ppc/ppc440_uc.c b/hw/ppc/ppc440_uc.c index 7d6ca70387..1312aa2080 100644 --- a/hw/ppc/ppc440_uc.c +++ b/hw/ppc/ppc440_uc.c @@ -14,6 +14,7 @@ #include "qemu/log.h" #include "hw/irq.h" #include "hw/ppc/ppc4xx.h" +#include "hw/pci-host/ppc4xx.h" #include "hw/qdev-properties.h" #include "hw/pci/pci.h" #include "sysemu/reset.h" diff --git a/hw/ppc/ppc4xx_pci.c b/hw/ppc/ppc4xx_pci.c index e4101398c9..b6c6c8993c 100644 --- a/hw/ppc/ppc4xx_pci.c +++ b/hw/ppc/ppc4xx_pci.c @@ -24,7 +24,7 @@ #include "qemu/osdep.h" #include "qemu/log.h" #include "hw/irq.h" -#include "hw/ppc/ppc4xx.h" +#include "hw/pci-host/ppc4xx.h" #include "migration/vmstate.h" #include "qemu/module.h" #include "sysemu/reset.h" diff --git a/hw/ppc/sam460ex.c b/hw/ppc/sam460ex.c index 1e615b8d35..a28498f39c 100644 --- a/hw/ppc/sam460ex.c +++ b/hw/ppc/sam460ex.c @@ -25,6 +25,7 @@ #include "elf.h" #include "exec/memory.h" #include "ppc440.h" +#include "hw/pci-host/ppc4xx.h" #include "hw/block/flash.h" #include "sysemu/sysemu.h" #include "sysemu/reset.h" --=20 2.41.0 From nobody Tue Nov 26 12:22:28 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1707297249; cv=none; d=zohomail.com; s=zohoarc; b=nfTmJGw1lgcfChIcsp0C1t2A4XfNUOfcRq6+DI/nWyFTSRmAC83WgMhQ7mKrMQU8ZALSw0Md5Wbbl1lAXZ89CofuDtP+CNLAe3oBxzAlXpyUQqHSfwcRE39xcPG0t2/QojFZ1UOYI45NX2xeCDuhfQwecmSNPrxQqjxVqeBkUAY= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1707297249; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=QVBl6Dk4lUHM78vggkMek+g7I/12xu6COw4rVVhDdU4=; b=mxG5PfycDISDd66aeuzsMjooe5ColblE/TnAAnwT5Kr+1xObDF9VTve3aFk9G3sZ7ST5mUtQxwCKRSu2s0MdgSgmjynr17qk3aEHkmHLpytnFqybTtYTlgBfRiYqqZ2qEVa5WKV0XHYMll/CMSbLAKfa6zHLR8ujtHNl37rlwgg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1707297249279438.8073038776579; Wed, 7 Feb 2024 01:14:09 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rXdzg-0005QA-VK; Wed, 07 Feb 2024 04:13:25 -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 1rXdzb-0005NZ-68 for qemu-devel@nongnu.org; Wed, 07 Feb 2024 04:13:21 -0500 Received: from mail-ej1-x62a.google.com ([2a00:1450:4864:20::62a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rXdzY-0008K3-2a for qemu-devel@nongnu.org; Wed, 07 Feb 2024 04:13:18 -0500 Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-a370328e8b8so45161966b.3 for ; Wed, 07 Feb 2024 01:13:15 -0800 (PST) Received: from m1x-phil.lan ([176.176.170.22]) by smtp.gmail.com with ESMTPSA id l24-20020a17090612d800b00a3820ec721csm533640ejb.8.2024.02.07.01.13.13 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 07 Feb 2024 01:13:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707297194; x=1707901994; 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=QVBl6Dk4lUHM78vggkMek+g7I/12xu6COw4rVVhDdU4=; b=Nxd4I82k41Pb6B7XxV4yu5ISz+jQErs0hT8qFfIOH721WyI3RuEKnAGQ481cwNruCR TjXXCJf4Zf6eDz51ewnzGwwk/SBufT5vgsAdDqCN/o75MMICwJLj+6tc2WjYkh7uWiX6 yTEgi49eQMhG0H11tS1M7ANBzEAzutxvjZqH+Dusnn4IQcXFCqtsHTZmZ6Sul/WPMV7z NDnDvlwHdafBqU79//JzyUy9FfJiKlDh9A58DJLlbOQ2bSW2j+ZvraBlI78KHpow+OWe 75XAmNJDPHlowdAWWb66/LNJ+gox84dXdD9qgy3DMEXGkNAlo+hAJIrFCPdhGrlqXcXW X8fw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707297194; x=1707901994; 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=QVBl6Dk4lUHM78vggkMek+g7I/12xu6COw4rVVhDdU4=; b=QRisi5PAR7axEnBbtERDln8kv4Y3QlKPO+5EA8M86qvlfee6OSN3E/QMXedE1aYo06 uxncWBMrsB9VeqeblxIaicpjtsTjTnEcVD7sJKQiAJ34v55Hc8p2b2K62YraDUTp7lHQ MX6vk7X+b9tbzfYeX6MvcW0v6BO0t5Wb7X8up0meIpQVdD7ee6NfCxIiNO5ahVaMBg6h 47XZAG6O9eqw+u+QlbT0RC6ooed3/Owd7cPOM2P/tn4UOODxbKNnWOCwbBD9/3b+pQiu 4AmBpcOZ/I2c0qhGaTJTaPyGHcj6XccWd2AAFyDxfRIASangVBnKeP5SXH+RAMhyVPgg iJHg== X-Gm-Message-State: AOJu0YyddnTMnbKL9iT1gaRKC+Es8JlBJjydAKuu1rOE+FACttDFB28F NGGEvlCwRhQuJxHb2OIWakfvMSNUhno+mmQcb5tbjy2HBVmdmZWMCsF+Vy3HNOAFpICzD4+cNYr i X-Google-Smtp-Source: AGHT+IHFrHS/tTDAYsFSX72SKh6SFdAd4FIy8OMzGjtXPtKIW2FahhBtvWzKdCAK4i2Ndz+ROmOOHQ== X-Received: by 2002:a17:906:abcc:b0:a38:7909:7a87 with SMTP id kq12-20020a170906abcc00b00a3879097a87mr698474ejb.54.1707297194559; Wed, 07 Feb 2024 01:13:14 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCUp4N8gq3kQdRWACqm495rF4ODPFQ5lU1g6s85RofXxC3z43BmMPPvW8eVspD+0BcA5MeCMsy6UhoMkwrrQNGjT+GVwjaNneTi9uI2TDDxRNYRCXRg+q9n34EWTcz9ZzP1OmaUNmONSIaCRgP5h7oEqQRGlfUMTMeU/JriKrMKv61de1dhInODBzujqxVyxFm0fIEDlZ4rG2n1hDfAGIdMp/Ejbmk2fLlPTUMKO3LCLDNm97cEC1ds= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Nicholas Piggin , BALATON Zoltan , qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Paolo Bonzini , Daniel Henrique Barboza , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 3/4] hw/ppc/ppc4xx_pci: Move ppc4xx_pci.c to hw/pci-host/ Date: Wed, 7 Feb 2024 10:12:53 +0100 Message-ID: <20240207091254.1478-4-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240207091254.1478-1-philmd@linaro.org> References: <20240207091254.1478-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62a; envelope-from=philmd@linaro.org; helo=mail-ej1-x62a.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, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1707297249921100001 ppc4xx_pci.c is moved from the target specific ppc_ss[] meson source set to pci_ss[] which is common to all targets: the object is built once. Declare PPC4XX_PCI selector in pci-host/Kconfig. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- MAINTAINERS | 1 + hw/{ppc =3D> pci-host}/ppc4xx_pci.c | 0 hw/pci-host/ppce500.c | 2 +- hw/pci-host/Kconfig | 4 ++++ hw/pci-host/meson.build | 1 + hw/pci-host/trace-events | 4 ++++ hw/ppc/Kconfig | 2 +- hw/ppc/meson.build | 1 - hw/ppc/trace-events | 4 ---- 9 files changed, 12 insertions(+), 7 deletions(-) rename hw/{ppc =3D> pci-host}/ppc4xx_pci.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index b288f0dc76..1927530c2d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1421,6 +1421,7 @@ Bamboo L: qemu-ppc@nongnu.org S: Orphan F: hw/ppc/ppc440_bamboo.c +F: hw/pci-host/ppc4xx_pci.c F: tests/avocado/ppc_bamboo.py =20 e500 diff --git a/hw/ppc/ppc4xx_pci.c b/hw/pci-host/ppc4xx_pci.c similarity index 100% rename from hw/ppc/ppc4xx_pci.c rename to hw/pci-host/ppc4xx_pci.c diff --git a/hw/pci-host/ppce500.c b/hw/pci-host/ppce500.c index fa0d67b342..95b983b2b3 100644 --- a/hw/pci-host/ppce500.c +++ b/hw/pci-host/ppce500.c @@ -5,7 +5,7 @@ * * Author: Yu Liu, * - * This file is derived from hw/ppc4xx_pci.c, + * This file is derived from ppc4xx_pci.c, * the copyright for that material belongs to the original owners. * * This is free software; you can redistribute it and/or modify diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig index f046d76a68..0a221e719e 100644 --- a/hw/pci-host/Kconfig +++ b/hw/pci-host/Kconfig @@ -6,6 +6,10 @@ config XEN_IGD_PASSTHROUGH default y depends on XEN && PCI_I440FX =20 +config PPC4XX_PCI + bool + select PCI + config RAVEN_PCI bool select PCI diff --git a/hw/pci-host/meson.build b/hw/pci-host/meson.build index 36d5ab756f..eb6dc71c88 100644 --- a/hw/pci-host/meson.build +++ b/hw/pci-host/meson.build @@ -14,6 +14,7 @@ pci_ss.add(when: 'CONFIG_REMOTE_PCIHOST', if_true: files(= 'remote.c')) pci_ss.add(when: 'CONFIG_SH_PCI', if_true: files('sh_pci.c')) =20 # PPC devices +pci_ss.add(when: 'CONFIG_PPC4XX_PCI', if_true: files('ppc4xx_pci.c')) pci_ss.add(when: 'CONFIG_RAVEN_PCI', if_true: files('raven.c')) pci_ss.add(when: 'CONFIG_GRACKLE_PCI', if_true: files('grackle.c')) # NewWorld PowerMac diff --git a/hw/pci-host/trace-events b/hw/pci-host/trace-events index b2f47e6335..90a37ebff0 100644 --- a/hw/pci-host/trace-events +++ b/hw/pci-host/trace-events @@ -37,6 +37,10 @@ unin_data_read(uint64_t addr, unsigned len, uint64_t val= ) "read addr 0x%"PRIx64 unin_write(uint64_t addr, uint64_t value) "addr=3D0x%" PRIx64 " val=3D0x%"= PRIx64 unin_read(uint64_t addr, uint64_t value) "addr=3D0x%" PRIx64 " val=3D0x%"P= RIx64 =20 +# ppc4xx_pci.c +ppc4xx_pci_map_irq(int32_t devfn, int irq_num, int slot) "devfn 0x%x irq %= d -> %d" +ppc4xx_pci_set_irq(int irq_num) "PCI irq %d" + # pnv_phb4.c pnv_phb4_xive_notify(uint64_t notif_port, uint64_t data) "notif=3D@0x%"PRI= x64" data=3D0x%"PRIx64 pnv_phb4_xive_notify_ic(uint64_t addr, uint64_t data) "addr=3D@0x%"PRIx64"= data=3D0x%"PRIx64 diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 44263a58c4..82e847d22c 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -53,7 +53,7 @@ config PPC440 config PPC4XX bool select BITBANG_I2C - select PCI + select PPC4XX_PCI select PPC_UIC =20 config SAM460EX diff --git a/hw/ppc/meson.build b/hw/ppc/meson.build index eba3406e7f..d0efc0aba5 100644 --- a/hw/ppc/meson.build +++ b/hw/ppc/meson.build @@ -63,7 +63,6 @@ ppc_ss.add(when: 'CONFIG_PPC440', if_true: files( 'ppc440_pcix.c', 'ppc440_uc.c')) ppc_ss.add(when: 'CONFIG_PPC4XX', if_true: files( 'ppc4xx_devs.c', - 'ppc4xx_pci.c', 'ppc4xx_sdram.c')) ppc_ss.add(when: 'CONFIG_SAM460EX', if_true: files('sam460ex.c')) # PReP diff --git a/hw/ppc/trace-events b/hw/ppc/trace-events index f670e8906c..b59fbf340f 100644 --- a/hw/ppc/trace-events +++ b/hw/ppc/trace-events @@ -146,10 +146,6 @@ rs6000mc_size_read(uint32_t addr, uint32_t val) "read = addr=3D0x%x val=3D0x%x" rs6000mc_size_write(uint32_t addr, uint32_t val) "write addr=3D0x%x val=3D= 0x%x" rs6000mc_parity_read(uint32_t addr, uint32_t val) "read addr=3D0x%x val=3D= 0x%x" =20 -# ppc4xx_pci.c -ppc4xx_pci_map_irq(int32_t devfn, int irq_num, int slot) "devfn 0x%x irq %= d -> %d" -ppc4xx_pci_set_irq(int irq_num) "PCI irq %d" - # ppc440_pcix.c ppc440_pcix_map_irq(int32_t devfn, int irq_num, int slot) "devfn 0x%x irq = %d -> %d" ppc440_pcix_set_irq(int irq_num) "PCI irq %d" --=20 2.41.0 From nobody Tue Nov 26 12:22:28 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1707297240; cv=none; d=zohomail.com; s=zohoarc; b=Md/lDtwgh6h+F4DuIoZe30UrBaAvemczY3AGrMUNmyxJdn1A1w6uTPkXiKDJdi7W+iSYhg5XVRFeNvSEwWnwpNSWGcBGSpZKF7s2uAghNmKlhA4fLiO6UhVwQFPs+R40hR+OfTPY/nF+o8VLNgXu2TdjGck48NQWpIq3PbR7WMo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1707297240; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=CLIvO5yt2v6iz48I5tKRmsspXhcoptGguz7s2UGjGhU=; b=OqED8vFKBcmePaSjXovQEuuFVZ7ANGIG6JBASOj1G8ICJ1ONnAeCAhnzuQ1hi+RjdmkI/mSJXFo7UUInSstU2zefY/VcBMBpXGJUVyvKbACxe/dEionoN89wSjS2REU0ceRfKzYI9ps3fRXzC7dHfNXhtX+nFryKr2H9jbc7PN0= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1707297240447486.63153243198406; Wed, 7 Feb 2024 01:14:00 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rXdzk-0005Sj-5Y; Wed, 07 Feb 2024 04:13:28 -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 1rXdzf-0005Q5-NB for qemu-devel@nongnu.org; Wed, 07 Feb 2024 04:13:24 -0500 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rXdze-0008Ku-2D for qemu-devel@nongnu.org; Wed, 07 Feb 2024 04:13:23 -0500 Received: by mail-ej1-x62d.google.com with SMTP id a640c23a62f3a-a3832ef7726so45363266b.0 for ; Wed, 07 Feb 2024 01:13:21 -0800 (PST) Received: from m1x-phil.lan ([176.176.170.22]) by smtp.gmail.com with ESMTPSA id h9-20020a17090619c900b00a35ed4fd4cesm526799ejd.115.2024.02.07.01.13.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 07 Feb 2024 01:13:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707297200; x=1707902000; 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=CLIvO5yt2v6iz48I5tKRmsspXhcoptGguz7s2UGjGhU=; b=kCTPCp/AaRMIJ6fC1sUbRANrOcn1q3Xn4o/Fblp698uIgk4ASwWvoFJWAGSfla4A/u GDW/myrepr9QIBCLBRZByilZRGmLiaFzZfpttVrmAmeqOPXH2/Ljzz3fgwoPWOiEYkOx GyTk9NyTFbX5BUNcssymxKda3S0ZORiz6U+KwUinrYBik0+4dYc86leB7BOTpfd4J4N6 eKfFQ3UJXD6aEtAQphzoKL+AutQLwOjWJZLsTGg+2vffPZDsYFJDoy0WPwYR1xcJFwGi CgkdpxJclXR5prvg0NeYkA4oEM0LOKiRpSHBwK8XfULBWOFte0VCRxErf2u8hFY690cP DKxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707297200; x=1707902000; 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=CLIvO5yt2v6iz48I5tKRmsspXhcoptGguz7s2UGjGhU=; b=G3+Wv0HvaSuF6dN73eZ+q1P8TKok24Xws0r4mV7WEsyTLk0iaKV+oISyXkiC83eWAl ke3GElTOW/extn68F9ec6AEB5atwegrAhN2klmuribP1OKRrwx+FHw+g9L07RnqARljU lRQ73rkyXOMwcEPu9UWFGbJ6zd5ODX6+hgcHTLqdNKrDdeUX36PTZ58tGmiNutOpgp61 peFpNUiI9JPQbF/VMHFyFAjRBjxXD1SPDgEL2XM2ESW7r6zDCGgvykGcLUenI0H9AH8j XKmcHT3LG1Q0ZbxagRyq5ZnaMT8A6wxdz9Rt245q+mVxppJPMwvBpXaiN6OsCtTPhKqV Ujrg== X-Gm-Message-State: AOJu0Yz12v+9ZZNyH+z/NEJF9/uGuctplxNFYwlBTKjKidAcs0NHlxXp fZpjpUG5uVYXjeDYyhibVifEpgsKRQYtsH7a8KM8oqwVlYQSzlUNllRditQQvItJaUfylTLGrEz K X-Google-Smtp-Source: AGHT+IGxv+xgIqJzDYSqPL9HdYDYlMKkrIdmByLxu7EtUgK+6oxrr7gN8b0Iwy9XC1QdH7jfub50Rw== X-Received: by 2002:a17:907:7791:b0:a38:7171:e832 with SMTP id ky17-20020a170907779100b00a387171e832mr866963ejc.32.1707297200021; Wed, 07 Feb 2024 01:13:20 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCVXvJM8Abm/Lo9YPdc4HJ2GV9NcB8x8JKV7ELA3XRPZB1KkCW6XBmVhuIHI0E4dieMt/D8smeoz7G514P5irK9YiJfRIsM3BB8WNxR6FhufVoFpXovhSw/gT4g9HstkRpO+l38OyrJ0ls08ku7jWLU11m5WD/fMEjCE10oWCl6VXIRPI0A0fjKLU/29HdauepD5opz3lPHVzmnzGy/+Ws3rxx4B/6+1JpEEhTwsSLnRr9z79shmpZw= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Nicholas Piggin , BALATON Zoltan , qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Paolo Bonzini , Daniel Henrique Barboza , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 4/4] hw/ppc/ppc440_pcix: Move ppc440_pcix.c to hw/pci-host/ Date: Wed, 7 Feb 2024 10:12:54 +0100 Message-ID: <20240207091254.1478-5-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240207091254.1478-1-philmd@linaro.org> References: <20240207091254.1478-1-philmd@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::62d; envelope-from=philmd@linaro.org; helo=mail-ej1-x62d.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, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1707297241917100005 ppc440_pcix.c is moved from the target specific ppc_ss[] meson source set to pci_ss[] which is common to all targets: the object is built once. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Thomas Huth --- MAINTAINERS | 2 +- hw/{ppc =3D> pci-host}/ppc440_pcix.c | 0 hw/pci-host/Kconfig | 4 ++++ hw/pci-host/meson.build | 1 + hw/pci-host/trace-events | 8 ++++++++ hw/ppc/Kconfig | 1 + hw/ppc/meson.build | 2 +- hw/ppc/trace-events | 8 -------- 8 files changed, 16 insertions(+), 10 deletions(-) rename hw/{ppc =3D> pci-host}/ppc440_pcix.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 1927530c2d..42e63ed696 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1554,7 +1554,7 @@ L: qemu-ppc@nongnu.org S: Maintained F: hw/ppc/sam460ex.c F: hw/ppc/ppc440_uc.c -F: hw/ppc/ppc440_pcix.c +F: hw/pci-host/ppc440_pcix.c F: hw/display/sm501* F: hw/ide/sii3112.c F: hw/rtc/m41t80.c diff --git a/hw/ppc/ppc440_pcix.c b/hw/pci-host/ppc440_pcix.c similarity index 100% rename from hw/ppc/ppc440_pcix.c rename to hw/pci-host/ppc440_pcix.c diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig index 0a221e719e..b348cacadb 100644 --- a/hw/pci-host/Kconfig +++ b/hw/pci-host/Kconfig @@ -10,6 +10,10 @@ config PPC4XX_PCI bool select PCI =20 +config PPC440_PCI + bool + select PCI + config RAVEN_PCI bool select PCI diff --git a/hw/pci-host/meson.build b/hw/pci-host/meson.build index eb6dc71c88..83cf3a1783 100644 --- a/hw/pci-host/meson.build +++ b/hw/pci-host/meson.build @@ -15,6 +15,7 @@ pci_ss.add(when: 'CONFIG_SH_PCI', if_true: files('sh_pci.= c')) =20 # PPC devices pci_ss.add(when: 'CONFIG_PPC4XX_PCI', if_true: files('ppc4xx_pci.c')) +pci_ss.add(when: 'CONFIG_PPC440_PCI', if_true: files('ppc440_pcix.c')) pci_ss.add(when: 'CONFIG_RAVEN_PCI', if_true: files('raven.c')) pci_ss.add(when: 'CONFIG_GRACKLE_PCI', if_true: files('grackle.c')) # NewWorld PowerMac diff --git a/hw/pci-host/trace-events b/hw/pci-host/trace-events index 90a37ebff0..0a816b9aa1 100644 --- a/hw/pci-host/trace-events +++ b/hw/pci-host/trace-events @@ -41,6 +41,14 @@ unin_read(uint64_t addr, uint64_t value) "addr=3D0x%" PR= Ix64 " val=3D0x%"PRIx64 ppc4xx_pci_map_irq(int32_t devfn, int irq_num, int slot) "devfn 0x%x irq %= d -> %d" ppc4xx_pci_set_irq(int irq_num) "PCI irq %d" =20 +# ppc440_pcix.c +ppc440_pcix_map_irq(int32_t devfn, int irq_num, int slot) "devfn 0x%x irq = %d -> %d" +ppc440_pcix_set_irq(int irq_num) "PCI irq %d" +ppc440_pcix_update_pim(int idx, uint64_t size, uint64_t la) "Added window = %d of size=3D0x%" PRIx64 " to CPU=3D0x%" PRIx64 +ppc440_pcix_update_pom(int idx, uint32_t size, uint64_t la, uint64_t pcia)= "Added window %d of size=3D0x%x from CPU=3D0x%" PRIx64 " to PCI=3D0x%" PRI= x64 +ppc440_pcix_reg_read(uint64_t addr, uint32_t val) "addr 0x%" PRIx64 " =3D = 0x%" PRIx32 +ppc440_pcix_reg_write(uint64_t addr, uint32_t val, uint32_t size) "addr 0x= %" PRIx64 " =3D 0x%" PRIx32 " size 0x%" PRIx32 + # pnv_phb4.c pnv_phb4_xive_notify(uint64_t notif_port, uint64_t data) "notif=3D@0x%"PRI= x64" data=3D0x%"PRIx64 pnv_phb4_xive_notify_ic(uint64_t addr, uint64_t data) "addr=3D@0x%"PRIx64"= data=3D0x%"PRIx64 diff --git a/hw/ppc/Kconfig b/hw/ppc/Kconfig index 82e847d22c..2da6c16186 100644 --- a/hw/ppc/Kconfig +++ b/hw/ppc/Kconfig @@ -46,6 +46,7 @@ config PPC440 imply TEST_DEVICES imply E1000_PCI select PCI_EXPRESS + select PPC440_PCI select PPC4XX select SERIAL select FDT_PPC diff --git a/hw/ppc/meson.build b/hw/ppc/meson.build index d0efc0aba5..da14fccce5 100644 --- a/hw/ppc/meson.build +++ b/hw/ppc/meson.build @@ -60,7 +60,7 @@ ppc_ss.add(when: 'CONFIG_PPC405', if_true: files( 'ppc405_uc.c')) ppc_ss.add(when: 'CONFIG_PPC440', if_true: files( 'ppc440_bamboo.c', - 'ppc440_pcix.c', 'ppc440_uc.c')) + 'ppc440_uc.c')) ppc_ss.add(when: 'CONFIG_PPC4XX', if_true: files( 'ppc4xx_devs.c', 'ppc4xx_sdram.c')) diff --git a/hw/ppc/trace-events b/hw/ppc/trace-events index b59fbf340f..157ea756e9 100644 --- a/hw/ppc/trace-events +++ b/hw/ppc/trace-events @@ -146,14 +146,6 @@ rs6000mc_size_read(uint32_t addr, uint32_t val) "read = addr=3D0x%x val=3D0x%x" rs6000mc_size_write(uint32_t addr, uint32_t val) "write addr=3D0x%x val=3D= 0x%x" rs6000mc_parity_read(uint32_t addr, uint32_t val) "read addr=3D0x%x val=3D= 0x%x" =20 -# ppc440_pcix.c -ppc440_pcix_map_irq(int32_t devfn, int irq_num, int slot) "devfn 0x%x irq = %d -> %d" -ppc440_pcix_set_irq(int irq_num) "PCI irq %d" -ppc440_pcix_update_pim(int idx, uint64_t size, uint64_t la) "Added window = %d of size=3D0x%" PRIx64 " to CPU=3D0x%" PRIx64 -ppc440_pcix_update_pom(int idx, uint32_t size, uint64_t la, uint64_t pcia)= "Added window %d of size=3D0x%x from CPU=3D0x%" PRIx64 " to PCI=3D0x%" PRI= x64 -ppc440_pcix_reg_read(uint64_t addr, uint32_t val) "addr 0x%" PRIx64 " =3D = 0x%" PRIx32 -ppc440_pcix_reg_write(uint64_t addr, uint32_t val, uint32_t size) "addr 0x= %" PRIx64 " =3D 0x%" PRIx32 " size 0x%" PRIx32 - # ppc405_boards.c opba_readb(uint64_t addr, uint32_t val) "addr 0x%" PRIx64 " =3D 0x%" PRIx32 opba_writeb(uint64_t addr, uint64_t val) "addr 0x%" PRIx64 " =3D 0x%" PRIx= 64 --=20 2.41.0