From patchwork Wed Feb 7 09:12:53 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: 770637 Delivered-To: patch@linaro.org Received: by 2002:a5d:40c1:0:b0:33b:4db1:f5b3 with SMTP id b1csp212778wrq; Wed, 7 Feb 2024 01:14:09 -0800 (PST) X-Google-Smtp-Source: AGHT+IHbeBGOjwcTCGtft8o+D0xQJau/u7HAwyTafSfyGt+2jz/+PqqxfSk+19rX+8sW6EyZjiuI X-Received: by 2002:a05:620a:24c7:b0:783:f77b:6dc9 with SMTP id m7-20020a05620a24c700b00783f77b6dc9mr9638649qkn.18.1707297249005; Wed, 07 Feb 2024 01:14:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707297248; cv=none; d=google.com; s=arc-20160816; b=ZlP0wNfEgi0PPI0GobsKD6iB9oZDXQFAXbsMwt8vn9GvAn9hmPEhGwhb4jhM6stNZx +Cf1nT0i+RgBeEbCABlwu2ws1uExRxX45Xd5adyuQ2E2cyQc5mjAIvZ0w5TVffYppedP dM8FMGXJe7PweE/QojtmYB+wAB7OxwGR3AxISz9P0WqiFhnSZ8TnGPzbuAlIGQPR0t1A QAqVLp27qdjzsRcHJktoN6PerzHlBy/deaLD7BU5tpMCZ7vU7Zl11UfstqbU0koqIvqU iLQa20P+1TxMG+0xj6g/6JbUxFmyUu/EQKJCcYz2zHRyJPG7XW3Gg7D5q0J1c0/+c0hj qwaA== 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=QVBl6Dk4lUHM78vggkMek+g7I/12xu6COw4rVVhDdU4=; fh=PqZsCB2IKspBU+C+vSpz6XrMBu+Dg3DdyMuI/y2F2Kc=; b=Gyc0XGOsQB7wcKchQTw/7vJ/Bn+dRJXAld1rEeTcysFshYnvlWdv2OojWf3b1fL8FF +lnO3clQ/wJRzYeYfR7QFWX6mipB26Pk9CLJA4IQsCBeuMLeGl3JLPOE5q/Y6m3hb6sx H0dUmdFOuvmrJwghlvmTNAdbckwSn3lhoWdhxGpssuhUEOb+zKrSI0O46b2jK5dFbvOV JeU+B7E1cf88KiC/4Zs3HtwYWroNk6drXUcCnC6c5gJaHV5Go1tZCpGwwR7/NO+pR08x 766AGgBrKIQ79t5lEr6HIiodkO0UxGNaPWM8MWYpkm2Btls+PpQyy1T7Ui6vpI8hEw0l MXjw==; darn=linaro.org ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Nxd4I82k; 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; AJvYcCVdx8oVkUt5wzZ4xk4tKmeLW1+oZ3yMacSM0OOtg+t8sIWCq/+8OblzfMMdibdCzQxxLv5nQKdSQ2Gkfy0c/T4v Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id b7-20020a05620a04e700b007859ebf2434si365264qkh.599.2024.02.07.01.14.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 07 Feb 2024 01:14:08 -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=Nxd4I82k; 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-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) 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-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= 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) 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 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 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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org 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é Reviewed-by: Thomas Huth --- MAINTAINERS | 1 + hw/{ppc => 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 => 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 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 +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')) # 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=0x%" PRIx64 " val=0x%"PRIx64 unin_read(uint64_t addr, uint64_t value) "addr=0x%" PRIx64 " val=0x%"PRIx64 +# 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=@0x%"PRIx64" data=0x%"PRIx64 pnv_phb4_xive_notify_ic(uint64_t addr, uint64_t data) "addr=@0x%"PRIx64" data=0x%"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 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=0x%x val=0x%x" rs6000mc_size_write(uint32_t addr, uint32_t val) "write addr=0x%x val=0x%x" rs6000mc_parity_read(uint32_t addr, uint32_t val) "read addr=0x%x val=0x%x" -# 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"