From patchwork Wed Oct 11 13:24:23 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: 731967 Delivered-To: patch@linaro.org Received: by 2002:a5d:54d1:0:b0:31d:da82:a3b4 with SMTP id x17csp408030wrv; Wed, 11 Oct 2023 06:25:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGECh5spSndz1tbOGy6JAF3DL36KOHI6ZQU0hooAHfT0qrEVFZZiU11MpXyuVT1pN9LBTM3 X-Received: by 2002:a67:f48a:0:b0:452:6efc:1789 with SMTP id o10-20020a67f48a000000b004526efc1789mr15467022vsn.32.1697030741544; Wed, 11 Oct 2023 06:25:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697030741; cv=none; d=google.com; s=arc-20160816; b=M/6CtDM2TnSp2v7t4bMhn4E1zmqGlMURvVtpsL5+L2/oMfQqKSW03fushB1bvRX34C o422YNOS7OQuTFqRxFwofeuth3b7XlHrdQsv2cJxAwYdEzYqp1ntCzmmObyNeKr+hzbT nCT1bdwKI5eUpLnVR1zgJvre5kTIQexTFPdtZKY3HU3wWC8twaucEH97XZhUQn6rlCJv 556n7SfVwMbcbvBr+JTwpOS8we6gDqbtT5VMNcn22M/Z996N4Pn4PCvh9ubd3ERX818f zTreSBFUNxksBsZJGW7w5vRLZkqFqbtjA2rjoU6dccKv97CVZVFOiNm5JQvPjsTMCzPe n7fg== 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=SYx0Hphe/DTtWkWE81vkY5dy8KmxuvKg06l16M+SgVo=; fh=0MSVIHUi8+JeQgq9/LdWahZrT/4txYwFIFsaSuwE+4o=; b=ddap2uSJPxmxK6tgTfJvu1Esla3wrvKAxTLaRhWZN90Pf43nbzAztR9KFRQz5bRrkJ qfyIUC+KLBe/GLl1nE5WVGws//I9DVwaa2/3x2+HZKP5fOt+qcvApm5JXs9798hDnV5X 9vKSveS4VACy/Ut3+kk+GUeUbvEPrX0HJguJXhYB5S2iA4ZJkBVDV70+I9wBG768zH4e NXTP61/CwET/WlWfS7wox1gD2byXXKovLyArBo1Xnpv97F43b3ltR2YRG8AAXR6JC3Te mmHzg38ideHiuVzhBT5hjNS0t6Ynty5pCnsjNOS//ei4V/Qvk3k2IDA9d6tK8EbIzUKx CiKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=JgRCqX8d; 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 g3-20020ac85803000000b00418148e82ffsi9433264qtg.666.2023.10.11.06.25.41 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Oct 2023 06:25:41 -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=JgRCqX8d; 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 1qqZCh-0006tK-Ja; Wed, 11 Oct 2023 09:24: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 1qqZCc-0006nl-2X for qemu-devel@nongnu.org; Wed, 11 Oct 2023 09:24:42 -0400 Received: from mail-ed1-x529.google.com ([2a00:1450:4864:20::529]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qqZCY-0004V1-HI for qemu-devel@nongnu.org; Wed, 11 Oct 2023 09:24:41 -0400 Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-53636f98538so11822986a12.1 for ; Wed, 11 Oct 2023 06:24:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697030676; x=1697635476; 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=SYx0Hphe/DTtWkWE81vkY5dy8KmxuvKg06l16M+SgVo=; b=JgRCqX8daaRUvqQllr0VMMsacy8Yc7cggnOr/+2yBZ9ODn6efv4mfgExQ8lGCTFKFR tr513h/oEBYHDZDvsxYyEXqygBGAAgnr2ecGXam1Edc6pIREQOtW3bITQ33ZRLqSpY4F xFyq7aCs8h+otIrvHKHI+ppDXA2V95nC+wvW7YjiqlakGGkVB7N/knkLrlH3jltfT9v5 IKmtd/nMJut9Lv+VRAOBXVbYFqQKwxbqUK7WhZWd9BRyzXpC6KibMMKU+WAn7aV9rnT9 Z3kVYQQ/wKn+4sTdq8BySuvExxXKhsvEiO1USTXPf/tM2z+s9HZhrjeSsaZMBInBlasW E4BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697030676; x=1697635476; 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=SYx0Hphe/DTtWkWE81vkY5dy8KmxuvKg06l16M+SgVo=; b=T1DIqMA/HDPaqd792dpZKx+6flotF/TI0p/G5sQqWkbDJ2N7uiHaxzB0oGxgqq7OAo 8wKEJ9oPFSCBCyKw0Iz2ZDqv8dQdZRt8NYb53FkLLMsLW9v8d4wBdUDwB4TCKZGxUL9U zhNVhZAX+o6ZkLsjgVQqSP0b1Su2ohhDB6cvM9WRe+EQXYTdktuNhC0wBQ3Ode2gwdYI UB/uJP03xiHts3wylTaiHCe6DlP760TaZbsnC0awwfF3JQS07mMZNfrIX+81JkZm28zh txRc5iNuEYGH19n9CATN5aFHesCsJeQ84KRRqCrSBmyPUEeN5hCKVeK70QZhuIbV09mw DFgg== X-Gm-Message-State: AOJu0YwovgIt3goXTli3pSJowVt/jJNLzfNI2yPQ+1SoEHkmu9eybtHv 64y5mhHvUJ7uWnl//wIgqbooLpUiGksA6WpsyJA= X-Received: by 2002:a05:6402:134f:b0:532:bb18:7986 with SMTP id y15-20020a056402134f00b00532bb187986mr18227347edw.39.1697030675756; Wed, 11 Oct 2023 06:24:35 -0700 (PDT) Received: from m1x-phil.lan (mdq11-h01-176-173-161-48.dsl.sta.abo.bbox.fr. [176.173.161.48]) by smtp.gmail.com with ESMTPSA id i22-20020a50d756000000b0053dda7926fcsm753109edj.60.2023.10.11.06.24.34 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 11 Oct 2023 06:24:35 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, BALATON Zoltan , Paolo Bonzini , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 1/5] hw/ppc/ppc4xx_pci: Remove unused "hw/ppc/ppc.h" header Date: Wed, 11 Oct 2023 15:24:23 +0200 Message-ID: <20231011132427.65001-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231011132427.65001-1-philmd@linaro.org> References: <20231011132427.65001-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::529; envelope-from=philmd@linaro.org; helo=mail-ed1-x529.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 Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: BALATON Zoltan --- 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 672090de94..e4dadbc84d 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 6652119008..51c265f0ba 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" From patchwork Wed Oct 11 13:24:24 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: 731965 Delivered-To: patch@linaro.org Received: by 2002:a5d:54d1:0:b0:31d:da82:a3b4 with SMTP id x17csp407663wrv; Wed, 11 Oct 2023 06:24:57 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEpzzPgEa8bQwAt8EsQWi4HAGTeClmFCUlAQIHx2eujI1pPVe0OTdEuIcGISvRQzHEdI/vx X-Received: by 2002:a05:620a:410c:b0:768:1e00:76c4 with SMTP id j12-20020a05620a410c00b007681e0076c4mr24542953qko.51.1697030697464; Wed, 11 Oct 2023 06:24:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697030697; cv=none; d=google.com; s=arc-20160816; b=A65hOuZ0pW3r2uT0XNSeJdTRnyWPKg7/h5cuiJotBOCqx61XjzvyKSv+lIe8Ey19Bl BL6TTy3L0ER/hQ0Ll/8nk6OZNGTrEL1g81iiRJmznHMA1JSfOAUvnx1pkjnqK1N6j9eQ GM3ImABQJiOswMKLuS1kRxiXIp5lR8CM4pQbmOsWgUI+88jLpQaMIiGX0Z7pIOJ6iod0 g03RGFvLdAJSdyvc0bpNKEpY3ZyWCzR0JmggIEOF5XVEhTsJAl23pZmVWRp2ioVoLc5A Ed9c8WDV52QY50aKeG7lG6coRuF0w8PrAQh5ewW+rhuEfUIMsAt0dAN9jT8s01BY420y EKGQ== 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=n00LFK1jZay5AN34FCEsSqtYKs4uHiPMhfa+zrLt3Oo=; fh=0MSVIHUi8+JeQgq9/LdWahZrT/4txYwFIFsaSuwE+4o=; b=rBAPcM4qs3oxJ1xU+7mXgUOslZEp/zQRa/efIxivGWyTqojMsXKtVK7qQzbLRINSUi HPPOHiZZx0MpiXKlOH2DzOUKZTig2Hfxv1lKb8Hcd7bd/x69vDtu5bnAaXlv+kSBYSyu o92wMMitxtvtwF93PHFf1qrHpX0Ca7ZVvmEgQ21BuplZ9IsASyHOzQr02kMs6DPVLrJu XdoQNmtKm5ESautL2gttdAT9CQfbtcrp1FQmDR1paWwlFnGGM79aSszFqlpdJdHHsR0A +tdakutFOf1xgBJ/sJkkvt3rKHvviuy6yPt9MaCo4YuAgDjYpzCoJZFQ5pcFE1WBZrF/ 581A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=hkHAfE41; 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 az7-20020a05620a170700b0076dbb17e788si9567992qkb.721.2023.10.11.06.24.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Oct 2023 06:24:57 -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=hkHAfE41; 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 1qqZCj-0006yQ-SB; Wed, 11 Oct 2023 09:24:49 -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 1qqZCg-0006tJ-Kr for qemu-devel@nongnu.org; Wed, 11 Oct 2023 09:24:47 -0400 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 1qqZCd-0004W5-8s for qemu-devel@nongnu.org; Wed, 11 Oct 2023 09:24:45 -0400 Received: by mail-ej1-x62b.google.com with SMTP id a640c23a62f3a-9ae75ece209so1237636766b.3 for ; Wed, 11 Oct 2023 06:24:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697030681; x=1697635481; 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=n00LFK1jZay5AN34FCEsSqtYKs4uHiPMhfa+zrLt3Oo=; b=hkHAfE41GIpm5PoBYEQW/8W3iN4znLWqfk72mfddQ8DyRATMv46039aJSM2ArNSTWZ P8uFK3/HzKQWAFV3/p+XLy390BwpOATcndkmGahfWeWl6INeQxs4wiOhHt1A0bw37ChW qx0rtV8WPMnrOaMf5VMU5x4R+ezupUGWblk/tDFFOuWFk3sDdnbj7oeIZRRXxjsWa8H/ XMsgCDMze25Ao/e3W+F7rDRtiY7D/SnFTxU0UsIVxV/4ir+lwEA+EYDRSw/ssJPqLjgX CB9M4mpp9Hy00wkWNBsTzoqfrBidIu/QA710r8692hn3o33mO65BT8/kYV6ne0HSOoMM 5/cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697030681; x=1697635481; 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=n00LFK1jZay5AN34FCEsSqtYKs4uHiPMhfa+zrLt3Oo=; b=TT79KQqvUoiDhLtKvgWjfwZO0rvGCqj6Bfn4dtHtUCrgIOYAknhm5a2kC9n5qmpJyk ZgUfRvYpbolOuMIrTPrbObkOuiCTG8Zlei1mbPPLS8aoC67G8nafV0e3RNkGUqr2zOEh Xk9joMh90CaJUw1ImBkkGGBQjSiCThfJBbcjq93OWy6DY+xOiCLM69RLrl1EWWvT8pzY 9dcpgxsyRoV3Kp1tyVL8+9agBlUdESV1XMl0cB76wSUAAU7UVCuU6TIW9nW6wD2tOTeR g2xCniFSu3iRNeONno/s8K65W8+Pz15qQJnMO+VV15knnwpTBClF3HMrvIvimbefK9Z1 jrdA== X-Gm-Message-State: AOJu0YxCGxq6+Yun6FAaM/HYen+dx0Q6CE7dgF0ccNDT8phK/bGFUWYq cNQt8IKOoht5EuBImU0wanDjZNrgFUdiv/Ez1m8= X-Received: by 2002:a17:906:51d1:b0:9ae:4843:66ee with SMTP id v17-20020a17090651d100b009ae484366eemr20116415ejk.36.1697030681139; Wed, 11 Oct 2023 06:24:41 -0700 (PDT) Received: from m1x-phil.lan (mdq11-h01-176-173-161-48.dsl.sta.abo.bbox.fr. [176.173.161.48]) by smtp.gmail.com with ESMTPSA id n24-20020a170906089800b009929d998abcsm9757647eje.209.2023.10.11.06.24.40 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 11 Oct 2023 06:24:40 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, BALATON Zoltan , Paolo Bonzini , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 2/5] hw/ppc/ppc4xx_pci: Extract PCI host definitions to hw/pci-host/ppc4xx.h Date: Wed, 11 Oct 2023 15:24:24 +0200 Message-ID: <20231011132427.65001-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231011132427.65001-1-philmd@linaro.org> References: <20231011132427.65001-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 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 --- 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 8c07d07927..158896d03e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1969,6 +1969,7 @@ L: qemu-ppc@nongnu.org S: Orphan F: hw/ppc/ppc4*.c 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 45f409c838..2049ff0eef 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 "ppc405.h" #include "sysemu/sysemu.h" #include "sysemu/reset.h" diff --git a/hw/ppc/ppc440_pcix.c b/hw/ppc/ppc440_pcix.c index e4dadbc84d..418dff6590 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 643a79e330..3a66b0c7f7 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 51c265f0ba..d2434a93ac 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" From patchwork Wed Oct 11 13:24:25 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: 731966 Delivered-To: patch@linaro.org Received: by 2002:a5d:54d1:0:b0:31d:da82:a3b4 with SMTP id x17csp408002wrv; Wed, 11 Oct 2023 06:25:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFjH3jnUAXt4joPWLbVlTMec5bB6AMClLB1JquiEWU2r7UK1uIssxJ+HWRaqiWZ6DV5LJbA X-Received: by 2002:a05:6102:3549:b0:452:62b2:36b with SMTP id e9-20020a056102354900b0045262b2036bmr20029259vss.30.1697030739185; Wed, 11 Oct 2023 06:25:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697030739; cv=none; d=google.com; s=arc-20160816; b=PupzaC6aXjrNdDKR5Ro54ut6rfsC40Dk2FDoJa33RtbHOVArXjtch9YbU7MWXlWIzF YVdx7QS2uqtGqZtMV7jHEhJbr2F3espzTtjy+GkCgrINaJACkCv7BE8GkrvMYv0+vmeC uU6Y3BDAwdZUdpb63MBJ4OFZ/Q1f6YxjZhhtPm6+YVt0oCvjrW6U21Mc2+UuWSnilaVW WStzxOU7RaHB4OmyNG9/oAtJdLY75M1GVn/NMY0wFPZqut0Mr87CrqfttrvGr10Fsmw8 prEnms+3sEEz44khRiqTH/bvHxDmTDOoavzsF2pEAxeaWnvHu7INIAYJye/BZ6gKaTXr wbCQ== 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=vt2WyObBcXYTV0fWYbJQ/kflbk2DJaUNegSKAbPEgiM=; fh=0MSVIHUi8+JeQgq9/LdWahZrT/4txYwFIFsaSuwE+4o=; b=c17lDWofyoJNsd5NvZ2Hj+czYD3BIagRaCx9RPEtduxKPfaEbTY+F/3tyYlEOb0Kj2 6nnxoIMFePJ7omrLOS29eScidoh8cuoL/apfvlXVXLCn2zzJIPvFMXsE8sPl8g8LcTYG v+hzSx0fTPv7QPTLsaO8yJv4ZEa/6UpoURrb3F+blAeOvzuXBHFAqdD6acbnUY462YjQ CboLl+aBaAa8exg0YkTVKqvJRvHqUV56p3cEoI+NJTNeUlz0dwHLmYwNlMeYqJbZLWiU Q2KzrZxZgDk+LSonPVwuE/U2DWhD5n4zKoCTYhBD3D7sHXR6evzQmjn8wfzE1/XQqAhM xbVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=dUCz3A1Z; 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 c17-20020a05622a025100b004039ef1cdd9si9798004qtx.443.2023.10.11.06.25.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Oct 2023 06:25:39 -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=dUCz3A1Z; 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 1qqZCo-0006zl-VZ; Wed, 11 Oct 2023 09:24:57 -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 1qqZCk-0006yc-3b for qemu-devel@nongnu.org; Wed, 11 Oct 2023 09:24:50 -0400 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qqZCi-0004Xa-3M for qemu-devel@nongnu.org; Wed, 11 Oct 2023 09:24:49 -0400 Received: by mail-ej1-x62f.google.com with SMTP id a640c23a62f3a-9b64b98656bso1161337666b.0 for ; Wed, 11 Oct 2023 06:24:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697030686; x=1697635486; 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=vt2WyObBcXYTV0fWYbJQ/kflbk2DJaUNegSKAbPEgiM=; b=dUCz3A1ZFgX1nMyB2WH5QwKtHbffR+fXTYrPCHWWDW0a/L4ADy3xa+YGokmXLc/ISg HojO+YsJ1Qes5zOjb6ys2bNFhKta6i7/AfgLvugPHgokT9rcJbORcvKl62vdJVHm5hmK iKkWqhBFB9xrYtZ/vd1iEMsyyewRceiolMkwgmFrdCBn7VSJm0v1AjRO226jjN0lMJGN v+mKtzXTvN3LCQ1oKwIpJOf+BpZ84Swwst898NM/KdnlNq/kaIGkFCT8qUFi6oSS7XvU UVCPk6zTABuvW69mqkeP94H4wD0/CEHm2EU/pQAID/d1c5hn4tVvUTT2enIz3cRJzYP4 qKig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697030686; x=1697635486; 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=vt2WyObBcXYTV0fWYbJQ/kflbk2DJaUNegSKAbPEgiM=; b=HNowWQagG1hq25KEvfcHdQsMyAls3aqUnAKvL/yQ7mSDs7lsKFbgrK9TWNqSg3d5VH 1ftnMzvyKHmHbswtt8XeF1EJBIyrQV1rS6NYc2SYHaf0L/Hp1hit8RdphVcDVcmy9Wbc G+cvhu1kz28c3NmBPceFh34VV7z29VgxYwJyKepU1FprlP0zcayhz7Kay4koPmY6+Maf nS5AkOCo2OfS4anEfrCaPspLyckcFiz2CvbFRddoQSBHrU6+U7YfTxD+/JsgQbMObYT3 VVKTsgLVn3H8Z4yT6ymNMEsEN452CGxlHUYT4yME9HjaIcLc7k7xu0kTUlMKr8xB6Rb9 xA/A== X-Gm-Message-State: AOJu0Yxm/TO7x49J71GbTmgevg36qxzP8KX0EnHqd1w6ZNQYWGbIFOJD mTNEsQoHPEhutS/VVLuuI2d09aNMpj0i78f23Oc= X-Received: by 2002:a17:906:76d0:b0:9ae:43be:e5f5 with SMTP id q16-20020a17090676d000b009ae43bee5f5mr18677199ejn.4.1697030686453; Wed, 11 Oct 2023 06:24:46 -0700 (PDT) Received: from m1x-phil.lan (mdq11-h01-176-173-161-48.dsl.sta.abo.bbox.fr. [176.173.161.48]) by smtp.gmail.com with ESMTPSA id u25-20020a1709063b9900b0099bc2d1429csm9855908ejf.72.2023.10.11.06.24.45 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 11 Oct 2023 06:24:46 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, BALATON Zoltan , Paolo Bonzini , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 3/5] hw/ppc/ppc4xx_pci: Declare PPC4XX_PCI in Kconfig Date: Wed, 11 Oct 2023 15:24:25 +0200 Message-ID: <20231011132427.65001-4-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231011132427.65001-1-philmd@linaro.org> References: <20231011132427.65001-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::62f; envelope-from=philmd@linaro.org; helo=mail-ej1-x62f.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 Signed-off-by: Philippe Mathieu-Daudé --- hw/pci-host/Kconfig | 4 ++++ hw/ppc/Kconfig | 2 +- hw/ppc/meson.build | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/hw/pci-host/Kconfig b/hw/pci-host/Kconfig index a07070eddf..a9030a433b 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/ppc/Kconfig b/hw/ppc/Kconfig index 5dfbf47ef5..e4e76e87a2 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 7c2c52434a..6931ba88b4 100644 --- a/hw/ppc/meson.build +++ b/hw/ppc/meson.build @@ -60,8 +60,8 @@ 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_PPC4XX_PCI', if_true: files('ppc4xx_pci.c')) ppc_ss.add(when: 'CONFIG_SAM460EX', if_true: files('sam460ex.c')) # PReP ppc_ss.add(when: 'CONFIG_PREP', if_true: files('prep.c')) From patchwork Wed Oct 11 13:24:26 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: 731968 Delivered-To: patch@linaro.org Received: by 2002:a5d:54d1:0:b0:31d:da82:a3b4 with SMTP id x17csp408061wrv; Wed, 11 Oct 2023 06:25:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGGyjhwQxj4NG8PDLlSbdTHK0r0OLCd/TA99jRQ7yH7eoBGrw2Bty9HyjbHfQwbJvnj2hJS X-Received: by 2002:a05:622a:190d:b0:419:ab8e:2353 with SMTP id w13-20020a05622a190d00b00419ab8e2353mr24155744qtc.20.1697030746257; Wed, 11 Oct 2023 06:25:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697030746; cv=none; d=google.com; s=arc-20160816; b=qfRdK0La/IAgG8Y28Z5ty/m5ynPRK4J7EZ2n1rPpitlDJvbAlsIhhMolkJS+b8q8CX zMZLodJdfkxxiGEx7eUlxY9Xz6xWignyT6SzBvRV981jxWizA3/UILLx7lk9DRyYPD99 VfHJYdAqVisrAjhKfPyA+ed4fwsmbBolO9PlSd8xHMSx3YX0xl4UVaTM0ctW9WJpg/r/ d7SGZFci3JXJL6+Tb1ZVBW7uvR+Z2+h/guktXtfhkVel/BWBdk5Njw47Zni2TWVepUkW nBoOg2QZa1aOhmEmVkv4ta3oTemLZh8Mh4WOQPJICLQEUjk0C89Js0tNkE22lJrCoIRb 2olA== 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=1k4hLIH5x/CYejK+Tga2Zv6nJJJ/LS2i152HT3xRn+4=; fh=0MSVIHUi8+JeQgq9/LdWahZrT/4txYwFIFsaSuwE+4o=; b=BY2iW3vbw/eV7D4nszblcEY1sfqbX1Et7TdvhSCY9dcqp/UXuyHsO73IceJevQwEF8 mfC8yGKef+7LBjdi7Bml31C7JXx14QWkFuRVKGeS6ntV1BRS574hlq4WG+BV/cfdqnuq DPyQzERnLNT/q3QjLLRcKrpiw4Aoaeyrldp6kVQXY47dyLowMo0Og9u/ixJchLzgue1b PKh3wxJf2tmo4JHNtZWVXQsd4HOFl8em2lPmWwJxiRH3Kf37OFSKbEZichxAgcJ9OZc7 t+YnpbABR1KLGywnNkkOGmPbYFZG8jYnLr6znkcAAqMRETzpGjnjUJLgtqWgYYxpZlz4 EOBQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=GnwPEoTa; 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 19-20020ac85913000000b00417d39dfc3esi9201909qty.755.2023.10.11.06.25.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Oct 2023 06:25:46 -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=GnwPEoTa; 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 1qqZCx-0007C9-Mm; Wed, 11 Oct 2023 09:25:03 -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 1qqZCp-00072q-Cf for qemu-devel@nongnu.org; Wed, 11 Oct 2023 09:24:57 -0400 Received: from mail-ej1-x632.google.com ([2a00:1450:4864:20::632]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qqZCn-0004Z6-IM for qemu-devel@nongnu.org; Wed, 11 Oct 2023 09:24:55 -0400 Received: by mail-ej1-x632.google.com with SMTP id a640c23a62f3a-9b275afb6abso204079966b.1 for ; Wed, 11 Oct 2023 06:24:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697030692; x=1697635492; 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=1k4hLIH5x/CYejK+Tga2Zv6nJJJ/LS2i152HT3xRn+4=; b=GnwPEoTak+FXUt0cvRIyJGNIkSPwf3osYiMp9rUrKSYPo41hXuO5ADHRr2lRejL+P5 uB6X9riYw7uTsvdRAUYQQIphB+UyGCzdtjAH2yfO1Pa6UsTznI/uXJoPBFMbGS4E7gW4 rHerPSZnMSgJcPBpZ4Bj1KJ27t8qYu/OZEcEV8XZ38pIDOGqOvLysTjLdzEfUmorjS+r 3hLaR1Einra5Ac3WIvW7XrVts5GQ6gxLmT8XnxB4sBQz2ZJln6pOmbBXVOIlvFKUKNJt eC73HUstdAgm3N0qX3NBNX1mpW6GM68S5BJDhEt8YaGkdtNJwJ5mwGeyFXs9aGheO+n/ Mf7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697030692; x=1697635492; 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=1k4hLIH5x/CYejK+Tga2Zv6nJJJ/LS2i152HT3xRn+4=; b=pUdE1MLkAJgIHpcghSscv9adA2pD0HWHUXjLcltTgolG+28G+OAFwe662sO6VbOtPl TYts2nH19PFUB7ZqkylcmbwFyO/Fs48hWYz5H+bs/byaPvQQy49qnIZtZqT3QVNJ15E7 T6EWMnKa0t6EuSVnMj6cNRQNM5TvbLtkTZUISIG7BuwBMP1rX3Fub4sTUD53zOoOBSpj V9s2ofl260CsB98OKT6pvQkg5ch6AvtOcm1edKWI06UOIsUsM1+yUaXCje9JW0pqczdK Nux9GO8q4PQGZ0MNMz2g2LCerHXq+2QXE0+74yg1sNRCmbmTqETbCBT1eBRKILRTi1aR Jx9g== X-Gm-Message-State: AOJu0Yy629E/SBnKLfxUtEuHxL8TIqM50QxjaDYKRnJ6j/sCxBm2ftHK G9O05h/C09hBU+rIBZpBogwRQt5wlmctN75E3pM= X-Received: by 2002:a17:907:8b8c:b0:9a9:f0e6:904e with SMTP id tb12-20020a1709078b8c00b009a9f0e6904emr15634129ejc.16.1697030691933; Wed, 11 Oct 2023 06:24:51 -0700 (PDT) Received: from m1x-phil.lan (mdq11-h01-176-173-161-48.dsl.sta.abo.bbox.fr. [176.173.161.48]) by smtp.gmail.com with ESMTPSA id rp19-20020a170906d97300b009b95b46bbd1sm9780620ejb.133.2023.10.11.06.24.50 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 11 Oct 2023 06:24:51 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, BALATON Zoltan , Paolo Bonzini , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 4/5] hw/ppc/ppc4xx_pci: Move ppc4xx_pci.c to hw/pci-host/ Date: Wed, 11 Oct 2023 15:24:26 +0200 Message-ID: <20231011132427.65001-5-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231011132427.65001-1-philmd@linaro.org> References: <20231011132427.65001-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::632; envelope-from=philmd@linaro.org; helo=mail-ej1-x632.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 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. Signed-off-by: Philippe Mathieu-Daudé --- MAINTAINERS | 1 + hw/{ppc => pci-host}/ppc4xx_pci.c | 0 hw/pci-host/ppce500.c | 2 +- hw/pci-host/meson.build | 1 + hw/pci-host/trace-events | 4 ++++ hw/ppc/meson.build | 1 - hw/ppc/trace-events | 4 ---- 7 files changed, 7 insertions(+), 6 deletions(-) rename hw/{ppc => pci-host}/ppc4xx_pci.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 158896d03e..d7af23c1be 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1358,6 +1358,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 38814247f2..c16bc255ed 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/meson.build b/hw/pci-host/meson.build index 64eada76fe..9cabac5d63 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 9d216bb89f..f8afb28a01 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/meson.build b/hw/ppc/meson.build index 6931ba88b4..a4821da094 100644 --- a/hw/ppc/meson.build +++ b/hw/ppc/meson.build @@ -61,7 +61,6 @@ ppc_ss.add(when: 'CONFIG_PPC440', if_true: files( ppc_ss.add(when: 'CONFIG_PPC4XX', if_true: files( 'ppc4xx_devs.c', 'ppc4xx_sdram.c')) -ppc_ss.add(when: 'CONFIG_PPC4XX_PCI', if_true: files('ppc4xx_pci.c')) ppc_ss.add(when: 'CONFIG_SAM460EX', if_true: files('sam460ex.c')) # PReP ppc_ss.add(when: 'CONFIG_PREP', if_true: files('prep.c')) 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" From patchwork Wed Oct 11 13:24:27 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: 731969 Delivered-To: patch@linaro.org Received: by 2002:a5d:54d1:0:b0:31d:da82:a3b4 with SMTP id x17csp408221wrv; Wed, 11 Oct 2023 06:26:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE6dQhVpD6aroNCfw+c/k8mesxdZ9/XKlbPvvDDSNqWV1M2/TK5/tvCr/JMDlmCrfU4huZm X-Received: by 2002:a05:6808:211d:b0:3af:5aa2:a3d with SMTP id r29-20020a056808211d00b003af5aa20a3dmr27602627oiw.40.1697030766476; Wed, 11 Oct 2023 06:26:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1697030766; cv=none; d=google.com; s=arc-20160816; b=BZ/LgWLA46QxXoPkCA9m6tFa9lbKek/YIH8uDQWMS4mtwnzRjIsn5MSKk96/3wz6io DqR+InXGvc+VOXLVATj3desLaCTrHOoHOpNACM/y4lNszTEz4sh4Jpn0+wFOkF96O+T1 tNaltpUA2fzGI+HDJCFoxyVrsztGBne3UhCJ8fJ/i6etU1mosU8w0VKH/AMnxhJbQ0O/ Doj2A5wZa6q7Vxse08lzLy2o3UapCYBZOIden6uOYneMRdjiuCmOZNCVfH1xP/WjXx9j hOH6cQspQJfyvwH/L8bVTrZ7i8ejRGcnRsgjqSJOIl7YQQoDwHJBbA3+3yXpRN55A1jn DyGA== 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=yPOKwx+vha+69RBWTG45/wKN7dXRUEkgDKQ2NkwugtM=; fh=0MSVIHUi8+JeQgq9/LdWahZrT/4txYwFIFsaSuwE+4o=; b=JhWDV0zR9JavHeUO425N7ToOQ66Dq1pDW/Sy/3Z7hvQ0uMI3yAVO1XIaUHRDhz9p/T 5fguArVFKfDk7qaQ+g/ZBNa/6lN0hYEgbyGFNYhpwVgO9aXZuJFOdigi+fUSzi8Pxm7z fhpJSEPJgDWt1teuZ7QHTETFMkW5Ag17r5GM2zqlN3f+SYeYZoVWxNNFGVuno0703+zJ gU9WKUDSwvguIqoxfIKtb0PIOjC2fn60pJV+ngPw53criBE+BOQOLDOWpvEfvef674Tv 2mZ2UfXRO/dwmhFBVYY3kZ2rJDzgbsosOZPPvTZrea6Kbiu2/0MLuvylAXd9qOZZ1kku 2ecQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=IzhlVNWy; 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 n7-20020a0cdc87000000b0066d049df7a4si1101478qvk.325.2023.10.11.06.26.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Oct 2023 06:26:06 -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=IzhlVNWy; 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 1qqZDH-0007Ub-UV; Wed, 11 Oct 2023 09:25:25 -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 1qqZCy-0007IR-TI for qemu-devel@nongnu.org; Wed, 11 Oct 2023 09:25:04 -0400 Received: from mail-ej1-x629.google.com ([2a00:1450:4864:20::629]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qqZCw-0004a5-OY for qemu-devel@nongnu.org; Wed, 11 Oct 2023 09:25:04 -0400 Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-9b64b98656bso1161386466b.0 for ; Wed, 11 Oct 2023 06:24:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1697030697; x=1697635497; 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=yPOKwx+vha+69RBWTG45/wKN7dXRUEkgDKQ2NkwugtM=; b=IzhlVNWytK9S85m028Bua9BGwzQ5zCNRbhZh+gi0Y50pS4Tj53iymNs4S6w6xCw+0j a6aIUHqii1nZIRw5FcCK4ZU3jZxNpvVKWaJUAOglbc4rw2zbFpKME1u/cx8IzrSi+5az eMVF2U6EfFgfJqYy/qIDwMkTkkFVAIR6kONWItZRjfovDe9AUhhZvtwK6ovq28BrRzgq l/j+C8Jewals9nulqwNP5tt4NwyTWEeu70LCyNTSJlY0gHmHMAkK/CI+7rZWEBECkgXv sK8iBT0Ut1maXZHD03wpZ8fgDxI1F0Ml5eBiUNrqbZMKV7byAPdmUNepNJerwUpfNK3M 9/oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697030697; x=1697635497; 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=yPOKwx+vha+69RBWTG45/wKN7dXRUEkgDKQ2NkwugtM=; b=hj+gAlUcHOwl/2+n5MVQSZ4TYGLEyHRgg2zH3XV+xuNQFU4fgIkMfVMVt1uSmkIYun ymkXicK4g34uCQM1S43GfcQDD+M6yAs8PEymkMdP+ymBY5kIamRUML63jqq1tCPEA5Ms NtScVPVYZL9RsX1QOGGLed9CMml1RRKNLuTXKT3FFQn0fauzin+y6LXyBF09uvpeMT5b lB43UrQ/41SV2Zr36KlrIDqJLy33g17AM6lETMwPvJbO8e8G3+FDTdJmvrDyTVnB9g2I viUGta5OT0n3za35pMXBpDtGFbDoCtGWnk+zPGTgC+RxtGLgCQP6cYTTsacf3UnbflYj Rz0w== X-Gm-Message-State: AOJu0YwhBDvv0HN9rf+H0ubZVWjna+NZp15L/G41SMwqHYMHe/abgaQQ NPGRUKdIoVm3eOMzEiMdgES/EgMc0rCHc4csHsM= X-Received: by 2002:a17:906:3ca1:b0:9a1:891b:6eed with SMTP id b1-20020a1709063ca100b009a1891b6eedmr16899436ejh.76.1697030697334; Wed, 11 Oct 2023 06:24:57 -0700 (PDT) Received: from m1x-phil.lan (mdq11-h01-176-173-161-48.dsl.sta.abo.bbox.fr. [176.173.161.48]) by smtp.gmail.com with ESMTPSA id h16-20020a17090619d000b00997e99a662bsm9718613ejd.20.2023.10.11.06.24.56 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 11 Oct 2023 06:24:56 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, BALATON Zoltan , Paolo Bonzini , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH 5/5] hw/ppc/ppc440_pcix: Move ppc440_pcix.c to hw/pci-host/ Date: Wed, 11 Oct 2023 15:24:27 +0200 Message-ID: <20231011132427.65001-6-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231011132427.65001-1-philmd@linaro.org> References: <20231011132427.65001-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::629; envelope-from=philmd@linaro.org; helo=mail-ej1-x629.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 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é --- MAINTAINERS | 2 +- hw/{ppc => 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 => pci-host}/ppc440_pcix.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index d7af23c1be..d727eab16b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1484,7 +1484,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 a9030a433b..19b25b2092 100644 --- a/hw/pci-host/Kconfig +++ b/hw/pci-host/Kconfig @@ -10,6 +10,10 @@ config PPC4XX_PCI bool select PCI +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 9cabac5d63..d724656f70 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')) # 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 f8afb28a01..c902f1cde6 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=0x%" PRIx64 " val=0x%"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" +# 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=0x%" PRIx64 " to CPU=0x%" PRIx64 +ppc440_pcix_update_pom(int idx, uint32_t size, uint64_t la, uint64_t pcia) "Added window %d of size=0x%x from CPU=0x%" PRIx64 " to PCI=0x%" PRIx64 +ppc440_pcix_reg_read(uint64_t addr, uint32_t val) "addr 0x%" PRIx64 " = 0x%" PRIx32 +ppc440_pcix_reg_write(uint64_t addr, uint32_t val, uint32_t size) "addr 0x%" PRIx64 " = 0x%" PRIx32 " size 0x%" PRIx32 + # 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 e4e76e87a2..fc26c775ab 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 a4821da094..09dfdafe79 100644 --- a/hw/ppc/meson.build +++ b/hw/ppc/meson.build @@ -57,7 +57,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=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" -# 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=0x%" PRIx64 " to CPU=0x%" PRIx64 -ppc440_pcix_update_pom(int idx, uint32_t size, uint64_t la, uint64_t pcia) "Added window %d of size=0x%x from CPU=0x%" PRIx64 " to PCI=0x%" PRIx64 -ppc440_pcix_reg_read(uint64_t addr, uint32_t val) "addr 0x%" PRIx64 " = 0x%" PRIx32 -ppc440_pcix_reg_write(uint64_t addr, uint32_t val, uint32_t size) "addr 0x%" PRIx64 " = 0x%" PRIx32 " size 0x%" PRIx32 - # ppc405_boards.c opba_readb(uint64_t addr, uint32_t val) "addr 0x%" PRIx64 " = 0x%" PRIx32 opba_writeb(uint64_t addr, uint64_t val) "addr 0x%" PRIx64 " = 0x%" PRIx64