From patchwork Wed Feb 7 09:12:52 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: 770636 Delivered-To: patch@linaro.org Received: by 2002:a5d:40c1:0:b0:33b:4db1:f5b3 with SMTP id b1csp212733wrq; Wed, 7 Feb 2024 01:14:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IFfp+ZdRRGm0Il58eXwN4cDQkgoUTeduxv/CraWECVmcSNZUJVNtXqlSQQM4CwkD1ok1ZiL X-Received: by 2002:a05:620a:844:b0:785:53af:2899 with SMTP id u4-20020a05620a084400b0078553af2899mr4932959qku.60.1707297240242; Wed, 07 Feb 2024 01:14:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707297240; cv=none; d=google.com; s=arc-20160816; b=BzVdExyVnjIvAHxoFa6A27JTervbfbp9rXpWbK2WoXdO51P0ALNjP6r7S0z4WIx+b/ XCNMTFrA6/7nTQmL2Jo/ULeB5perWASRfO4gJv4TbkFSKXfneZ58mxPNlj0VgG7nDQkB Z8nCKzFjVpsWIC8XzIXaqg5rjHahvCLgMyTvzk9frB35SbRys+R+i4PFnK1rQ3258CaE vLj+Q5kSjUZogPy8UgNI216GNnZYbhJlIsvrkMw0RYZrrUER5nLTCjzRcbl2LC94kDez s3GKZahqFu/mIrhYFVWN05SFTe1UMzJjYo6LlfEau/C8cEvhenN8kuIqutXkNcnzrOeO lIkg== 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=yytOM426lSRQ7TkKcf1G+JiJxoGr/F3Uafxb01Uxm28=; fh=ZmVQKJtugXfLBKYNIq8jpA3+Gnn+/5EpBt6LVsSLt28=; b=nS5VZVAYTaiA5zOyTXGQDs0jlM8SU+TGn4pe6J2GGIwoeIiCRJLSyaHnJVv4jysAeA oisRx/4IA0q7Y7bYDqDXSEOffyHMh4NaRyB1FheR48NutxHbjrUbZ8/j9MdRx5O6wV+J M0ab25L5axplPrKTcuDZRIlh7w0rKldhwDAYhwyUbrdsMa4JabLVzYcuc4a7DW8eB/V+ ycXhfOeiyFkF9/gXagrHEKU0mauwXDm+mB4rYvi3P89/pILOXd98IzeP5Y8WzJ9e4R4N 6kO1DExNlioo64L/dkNhuYSmYvNloAzKEt6Jo9PPlHg+cEe/QAnKELwF/+BFedkt58bv gcgQ==; darn=linaro.org ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vG32kjNi; 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 X-Forwarded-Encrypted: i=1; AJvYcCUTq3Mj5hd1nl03E393zjRFwflTIBFv6FmmC/glIVYK2BdXLJA2q5Er2/dr23MAiutbGNyRBNT/iu//Em7WmBV4 Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v18-20020a05620a123200b00783eb03fe1dsi732796qkj.222.2024.02.07.01.14.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 Feb 2024 01:14: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=@linaro.org header.s=google header.b=vG32kjNi; 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 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) 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-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= 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) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Thomas Huth , Nicholas Piggin , BALATON Zoltan , qemu-ppc@nongnu.org, =?utf-8?q?C=C3=A9?= =?utf-8?q?dric_Le_Goater?= , Paolo Bonzini , Daniel Henrique Barboza , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Signed-off-by: Philippe Mathieu-Daudé 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" -#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"