From patchwork Thu Feb 15 10:50:13 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: 772891 Delivered-To: patch@linaro.org Received: by 2002:adf:9dc2:0:b0:33b:4db1:f5b3 with SMTP id q2csp761519wre; Thu, 15 Feb 2024 02:52:09 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCUSClvwTbCZx1qvqjbmscVefUHBfBIeJiwg1Trkbb0n803UIlpsd6Xror8RMc9oGueNUYOYMcTncjT6m9RKKy2C X-Google-Smtp-Source: AGHT+IGYQpCZ165HgUSLCaz1t8HhickXhT7YeF+wlqMP6vU46BsOeJUqPS85i3soUvu7IMbaaQkV X-Received: by 2002:a05:620a:91a:b0:785:9c70:c7fa with SMTP id v26-20020a05620a091a00b007859c70c7famr1697185qkv.1.1707994328897; Thu, 15 Feb 2024 02:52:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707994328; cv=none; d=google.com; s=arc-20160816; b=Wz78gljgrGr3tEAsVjbcZI1lxWEckITez3sTbQyu2miF0KOKWCxVWp+PM3oNS1h+C9 2hKieq/Sqa9Ag86kiXuxcgN7SwdSkXzZfEGy/NJoLfGwNLr2iSpREIcLvg5mNvW5e2Hu 0wY1Fx3ToHwtbwQYEGv5b7MDD2YLh/CJqK37zCQ2gJJcjWLnh4J9qNuJvgL8YrvDDKwN 3LTCsqbi3slxvoSweugb2Jd0ukMLUC8j/IhuKl5UcmSiVqjsJz+J5IofimrsHtWdlNJ7 AvzdmAVNNAEZjrTtVut9tpHv4VLTkxfE2mwdodkxhNb4UhIYq69UTQJfzinyDf9Ayn5X Ixmw== 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=4H6r4N7AivgzoKJ92Ycqsqp3ekwmltnC77Az1yhOAZE=; fh=A+lY13+jFVcdA8ecQ4hcAHs/x8ylQFF0oU/oe2DVPZ8=; b=C+H3X2LDdn9H1SWps5kUU2uqmOFYvYRLG6d+N/MWl14XnBeSOVdRypi/PNTEF/JiBD lGI+cNhcYuLvJ+SDk3f8JfHQlHybxFmdYAR4wsw9z7p23sW/EmXMaEw5h31Mswinn/3T g2vAinAiRMT7ZyVaNt/IYvj258l70pH4R3xDI0lr+G/mDhzOkWLJi7PZsln/pPa5Ax1e U9HvipNqnaEvfySd15p7SSrvxtLH4haAiJP0Y1vjr2FQadFoWYR5HPf4U00CUt3y32sX CuXM9pttFFgGNH68cUwSwdNotiKN35xOqQnTd9+xKGtulyJvEv5gJyt2PnArAEm52x2C pa7w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=o7etBia8; 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 b16-20020a05620a127000b00785d5b4c627si1144178qkl.243.2024.02.15.02.52.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 Feb 2024 02:52: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=o7etBia8; 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 1raZK4-0001rp-7m; Thu, 15 Feb 2024 05:50:32 -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 1raZK2-0001rF-FL for qemu-devel@nongnu.org; Thu, 15 Feb 2024 05:50:30 -0500 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 1raZK0-0007WN-V5 for qemu-devel@nongnu.org; Thu, 15 Feb 2024 05:50:30 -0500 Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-55f279dca99so1213517a12.3 for ; Thu, 15 Feb 2024 02:50:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707994227; x=1708599027; 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=4H6r4N7AivgzoKJ92Ycqsqp3ekwmltnC77Az1yhOAZE=; b=o7etBia8kWjlqIX/A2ye3A4ts3U5Sz3PGf7sckHRX01WntWwcK8ZD/iPLaPjR9PjBx Iq36jSKcw2rShZU4ag14e1sJN4eNiHlTHE8zf84gfwiULGM+hBbxG6ewcc41lFiiFs2L fN0TNS70uIoutPtke4qai+ow9ox1VemfektzuBgw2SDdfOCQJ4awEd/Amid/aOm9FST0 ZqnXCYiXyl+0bKvhE1RV2RS4QESUvJOUMgm0vh4wzdVpL8zqFS5OsQstkFS5BlUqkGQQ e2EpW1I3Fj7u4jqj8dJ+49f5Zih9cAGM64p5Y3cdFboVmKJphtouvWzzah5yQYV5brLO TDwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707994227; x=1708599027; 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=4H6r4N7AivgzoKJ92Ycqsqp3ekwmltnC77Az1yhOAZE=; b=GARKowtKXxmc12nZ3V/hjrEJYD27gWqvz0BvSQygve0GpzjF0NZtiKxHKSN4+L3gYb 9vpt371MxB4+khH1sNGAz4ewgBiAVArgON43cobO0V5Z2eV6eHTWz3Hg/7q5Hzs+r48R i1RKzi92XDUuP9ceXnz3j+KxxF3zEbZQ63Vr/g0Ye9knjEJGpDTGCRPFR0svcdpw7azN VOzrGhq7l/YnW3o0OzIw+igg7pVlVLmlNXX9Ved9AOeH+rJwgWbyKJqzi39D3qPfW1qS VAMOz3PfAht3k3X9VtAg9IUqkloyoW+I6v+IztLQe96+BbVIACk7mAX/hacJkuBIYjzZ q+jg== X-Gm-Message-State: AOJu0YyELx3b0IIgysJX9mbqhToKHzRVubTVqef2uyMvVVccEg0Wm/7G dGzmVYqVinUs3j0I6j5JwfQQoUVrDZdejYkdIRden21RcpPEpvk5C/uSumG8UHFKrloZ92oFtXm 6mxw= X-Received: by 2002:aa7:d148:0:b0:563:c54e:f7 with SMTP id r8-20020aa7d148000000b00563c54e00f7mr217290edo.17.1707994226761; Thu, 15 Feb 2024 02:50:26 -0800 (PST) Received: from localhost.localdomain ([92.88.170.215]) by smtp.gmail.com with ESMTPSA id g13-20020a056402428d00b0055d333a0584sm430757edc.72.2024.02.15.02.50.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 15 Feb 2024 02:50:26 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , qemu-ppc@nongnu.org, =?utf-8?q?C?= =?utf-8?q?=C3=A9dric_Le_Goater?= , Nicholas Piggin , BALATON Zoltan , Daniel Henrique Barboza , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 1/4] hw/ppc/ppc4xx_pci: Remove unused "hw/ppc/ppc.h" header Date: Thu, 15 Feb 2024 11:50:13 +0100 Message-ID: <20240215105017.57748-2-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240215105017.57748-1-philmd@linaro.org> References: <20240215105017.57748-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, T_SCC_BODY_TEXT_LINE=-0.01 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 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" From patchwork Thu Feb 15 10:50:14 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: 772887 Delivered-To: patch@linaro.org Received: by 2002:adf:9dc2:0:b0:33b:4db1:f5b3 with SMTP id q2csp761172wre; Thu, 15 Feb 2024 02:51:01 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCXzy9agmzuGWkoUTAPA6roFYv28wH038kX6zHu6bWnIN5+yolpCrFGXcq7BqOFZRa5x4TnVFYqBPlhnijz8+E8o X-Google-Smtp-Source: AGHT+IHN4oAH7JmmH/CDSVu3uiAT20QFfyG5+cFhx5L+rTIaWOnBaWTLrjzcnG5OEanP9Tts+YcN X-Received: by 2002:ae9:e608:0:b0:787:1625:3312 with SMTP id z8-20020ae9e608000000b0078716253312mr1422965qkf.44.1707994261670; Thu, 15 Feb 2024 02:51:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707994261; cv=none; d=google.com; s=arc-20160816; b=O0G7Ax5NqCWistgO2DCvj4bfqfwbJsU9ppFgmYwOwlLQ7Kaf11z4W7sSkKCqea/zvb bBDPz82f5Pw8Endg8duRlaRI1IXptEIz+zRVnhiKvUk7uk7KjTH04FWsGItY9x7Yud+B xKbLD8/56zhrH82q3JK9Axxea9JPvA/+9695oRsYJWcB9aw6QbJw+xIGy+4Fodu0Hl6V ZH/5XMf1t2kOEHhENZq4ZQYGUzMiueIktIgldyJoHMQhnESinnaIPR7sqNaprPQ+lyfq hATrfqF1LAmKvBc9AgMEFHdZIPmLHY7SAbv/8q0SpNP361N5x+KNp83wTVRgs0+obrgM PRhg== 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=VAFRh/EAl/HtsoAFF4atOhVIQ1s/gH8aym6XGe49VAg=; fh=A+lY13+jFVcdA8ecQ4hcAHs/x8ylQFF0oU/oe2DVPZ8=; b=J0VFLn9/izhpFTrvANo4BFYF9OBQRBaG+lWc0yWC4LL/6hsYUhW4JJu8MeIWlzhORE 2+l8Ry4z3jGkrPVOuI1wNr1oR8dWlZxATuNZl/8qNs1cycmtZLyRUqNEGynZ/abJWAxQ q3cw0fopPbkaaqypuJacI/HeYEd/jr9Eft5H5pQNVWWJXw2LtdvSz7aVSCmOlTBDP0ft Hq0qZSTO8dEhGfqDQr5mo81kXSYKgcr1JvEoZ8MevrALDc/buhixX8+fhp0nRCAQXPQZ XwAnFKLnTD/zojqm9fYiNtt0sK6vh2PJE5sc+BVpqM5H6kddjuhLMHG0xW005UrMzYcm dtWQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RZYCVcoK; 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 g7-20020a05620a218700b007872453d88bsi1209745qka.289.2024.02.15.02.51.01 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 Feb 2024 02:51:01 -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=RZYCVcoK; 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 1raZK9-0001su-Vv; Thu, 15 Feb 2024 05:50:38 -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 1raZK8-0001sW-8m for qemu-devel@nongnu.org; Thu, 15 Feb 2024 05:50:36 -0500 Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1raZK6-0007ak-Gp for qemu-devel@nongnu.org; Thu, 15 Feb 2024 05:50:36 -0500 Received: by mail-ed1-x52f.google.com with SMTP id 4fb4d7f45d1cf-55f279dca99so1213662a12.3 for ; Thu, 15 Feb 2024 02:50:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707994233; x=1708599033; 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=VAFRh/EAl/HtsoAFF4atOhVIQ1s/gH8aym6XGe49VAg=; b=RZYCVcoKUk25g6ygDPRmTfYDjY6gFVAAaA2ZJ7O5NCm+UoSrDGq6RCequhtnasYoVx 0x3ulLOrtkZs4nIUMktDGlFenZplBklRJ+g6AGutENCtumRLxWHw6EpFbX3JHiwBoKN1 9LEtgrraz7q5t8JW7p5EvfC/t+weNQcwbl2NcJw/jQ+tUaqLZzQ/bRzSuA6ZZcKieM1u CCxQFLoacY+kDARDLeHqaWo8TYEokC0cBsgkrm9ehQEQC8vo5ecD+KwxPl1Ves/ip5t5 AqcJU/C++4dS7KJaQbEudcAkxohJjdtvNC1VN/+QbFf9sw5jFf8QK+24W9+QwePIbtiu PLqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707994233; x=1708599033; 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=VAFRh/EAl/HtsoAFF4atOhVIQ1s/gH8aym6XGe49VAg=; b=c9U2Zy6wYwSRSkyeCema4dvyPH064tysoYe/eHj3CxrkPQid31rbk81oqlHumIPSQP Y0eueKZCr27Df6+NRqD6qHDvgzQ71o3t2zUyZymJA9bzlfeCddlh1j24oo2dmBPRjXP1 WHyS8e7P5VmMAd+IlpQTB48N8v9CMDbtgqTagddtMn0LpWD7RWgv/Un+bMLrjNEO2Xs9 34vpBevh4/pRf7ab0IrcZbwabAum+ATgC6NrqRGmH2/grl8sW0fc+pPmu9r0D6UQkB6d DKFv+ue/a5GfS93fXGr3JQZ/Ar7aK2aArxHTeX5z5g/WeRbjaKhwlNLblpIcwnBOOyFZ 4Y3w== X-Gm-Message-State: AOJu0YwK72YV77DjM9QaLUKLr0gWoDSmX5jAuE6p5CMY+qm7Lzkyjm6r yWoPIljST7hDTkO1PwIbP355U/p24dFvcm522py249zv0SsEW3t9qyyQdo6tCtt5nt7UJ1Zyka9 q/WM= X-Received: by 2002:aa7:d6cb:0:b0:561:123f:a98f with SMTP id x11-20020aa7d6cb000000b00561123fa98fmr916202edr.24.1707994232894; Thu, 15 Feb 2024 02:50:32 -0800 (PST) Received: from localhost.localdomain ([92.88.170.215]) by smtp.gmail.com with ESMTPSA id v20-20020aa7d9d4000000b00561fbfebdb5sm417338eds.96.2024.02.15.02.50.31 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 15 Feb 2024 02:50:32 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , qemu-ppc@nongnu.org, =?utf-8?q?C?= =?utf-8?q?=C3=A9dric_Le_Goater?= , Nicholas Piggin , BALATON Zoltan , Daniel Henrique Barboza , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 2/4] hw/ppc/ppc4xx_pci: Extract PCI host definitions to hw/pci-host/ppc4xx.h Date: Thu, 15 Feb 2024 11:50:14 +0100 Message-ID: <20240215105017.57748-3-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240215105017.57748-1-philmd@linaro.org> References: <20240215105017.57748-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::52f; envelope-from=philmd@linaro.org; helo=mail-ed1-x52f.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=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 Reviewed-by: BALATON Zoltan Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daudé --- 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 a24c2b51b6..a9458121d9 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..32396417fc --- /dev/null +++ b/include/hw/pci-host/ppc4xx.h @@ -0,0 +1,17 @@ +/* + * QEMU PowerPC 4xx PCI-host definitions + * + * Copyright (c) 2018-2023 BALATON Zoltan + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#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" From patchwork Thu Feb 15 10:50:15 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: 772889 Delivered-To: patch@linaro.org Received: by 2002:adf:9dc2:0:b0:33b:4db1:f5b3 with SMTP id q2csp761184wre; Thu, 15 Feb 2024 02:51:03 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCV3LwwrhrU/0bc19KGgl2Gg/LY/KC+HgPnXDjJltYPeRHYJt6P77oxAt75kt1MiEmnXsEPIHZREPKWDaeYg9JoO X-Google-Smtp-Source: AGHT+IHvIKaCMRiXmtR7mHV/pCLQreMPPwNmEGrT8rRXH7iWzAVoNDkBS2p00V0Lktu3aWF6QAj8 X-Received: by 2002:a05:6808:118b:b0:3c0:32d7:b93b with SMTP id j11-20020a056808118b00b003c032d7b93bmr1556549oil.50.1707994263690; Thu, 15 Feb 2024 02:51:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707994263; cv=none; d=google.com; s=arc-20160816; b=reWcmbinVZ7ea3JAHNwo5vr+7fwUyR7/MNp2TFPPMT5Co8ukBfEjcWuuCfBcneAeQ7 DCAInDgQG5ojupEd5jiv1ehco+Tdgq6tcaxNBb12Ipwy1LV4yYhN7f91hGYpDlAGhrDV zdVKMPazJfyuQAJiwrxryvE1ViDlskT9TgR8Oq5lj2Lje2PvIiYQtzrTADHkRz/gJ8E3 +SAXXDEFGLvQ/zAf6uSza6Vi0foPAC1PDRRO91H48RulgY5oa+ugH/URFmU9cBv7GwB0 P5gLDJjp0AwbqWaUHh1wOO9Ro0/qKeInUgmiIgEV0b8wYWNghVQKVSVQCzNY5hAsdSB7 6qhA== 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=yhZzQzmhVddUlJgteVfeViS+t3SxqCZ/XKPCSY22WK8=; fh=A+lY13+jFVcdA8ecQ4hcAHs/x8ylQFF0oU/oe2DVPZ8=; b=l/qjdhzNL1aaRVNf0BL/ao4fM1iPkI1BrJqjtfvGm+Q7uVHkmbxzkyQJpSQP917B3I cPKt+hFlMH7MaWKaS22ULw0NtB09T+P3FkUyWtnIxpHQ7s9L89QthU3WUnKlUhuIPRZb v/lh8kIPKXwDnUMpj+1vECv8F8ZxHjIB7mih+XEjSsSC7WnFygYL1uWQYW3w+xPI/cQS wz8HlfTp//OZuRrrY1Hh+Ki4fpa6mS9AwQTdyAZO/634f7nveUP3UenIuwmW4/zA2unr k9nBbgwN2no9sLXkyzcdWi22+hnaIGQ8+1AW/HWMKTW5vYeRtHh3tTTzcLgOKSvj0MYh V8BQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=MxXROj9P; 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 n20-20020ac86754000000b0042c7c949b22si975701qtp.366.2024.02.15.02.51.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 Feb 2024 02:51:03 -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=MxXROj9P; 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 1raZKG-0001vz-6O; Thu, 15 Feb 2024 05:50:44 -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 1raZKE-0001vV-Q9 for qemu-devel@nongnu.org; Thu, 15 Feb 2024 05:50:42 -0500 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 1raZKD-0007br-3l for qemu-devel@nongnu.org; Thu, 15 Feb 2024 05:50:42 -0500 Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-563c403719cso158984a12.2 for ; Thu, 15 Feb 2024 02:50:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707994239; x=1708599039; 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=yhZzQzmhVddUlJgteVfeViS+t3SxqCZ/XKPCSY22WK8=; b=MxXROj9PoStTbIwDZaER9h2hL7N4m1OzL584T3dbQIG4YJCdNn6Xzk3Ef/ec/XVxrH BdvWlLbnzSe2cXPQjqf1q0u8ZKWk9xfI0mDCSxZw3BOr689J2RGTK2q4CaaQBFtO7vvF 0A5p9Xk50g6xeAQp0VtxeQj1FHosEXBN0vTnBV+qiBd6yVkR3OKFOvmytUszulAa+/H6 /nV/Qubq5LEgVij48yu/4OAuDWKMCISqGOSqBy19AlJUdSdgSf4ZfcpWFLGQtkON/HPv ZoRsitZfhmHe5BiaLSN1t+BGn+3MJ8le7GYb3PHeedPJd2v8hMZ5kwt2gnR3BuEW+pya iiXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707994239; x=1708599039; 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=yhZzQzmhVddUlJgteVfeViS+t3SxqCZ/XKPCSY22WK8=; b=gYcdIL8yejpZjoyUVVrk5i4GuWLULYryqeWJnIkGRY0TFX/bvKNiAqNQ1UVXMYSYpk Z/LaXFKvna4HUweB0VVwIP85/gMXLf5lZhJjVC28BI4JOoOgssyMViF2VCvvtC3bZMBp a+8kWJlPc0QtC4vcNVv8bsU/0wZeFRzc3IpvvFQLGTvKbismkZ5cjWgFhz3tFC2Y0jy1 CvXRlatZrawxNMLSQe5fawGLD9SLNxAmOBCnniAcm4XxLgiYqQ+WZ0Y38uwBIe2CRY6g kR7R46ZYLI/YRdvjHs1cf5wGn0P3oRtpWcr0wBJp3dh7RZafIyaxvHUJZ8pv9664MAOj GbeA== X-Gm-Message-State: AOJu0YwcaWEGE9UHvORq4KRyowm7HCH/8hxzJncgQC22WWhhP7NvJdxA lW9Cs+wkRzHK8fWpdUiR02h2yYARQRzIqnhWvd2OwubD/yUXNjJmJ/Yf2x5xPv2F+EjgrjeQdzu wiIQ= X-Received: by 2002:a17:906:851:b0:a3c:c5ee:fd84 with SMTP id f17-20020a170906085100b00a3cc5eefd84mr1204389ejd.48.1707994239154; Thu, 15 Feb 2024 02:50:39 -0800 (PST) Received: from localhost.localdomain ([92.88.170.215]) by smtp.gmail.com with ESMTPSA id wb3-20020a170907d50300b00a3d2e690abfsm413344ejc.122.2024.02.15.02.50.37 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 15 Feb 2024 02:50:38 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , qemu-ppc@nongnu.org, =?utf-8?q?C?= =?utf-8?q?=C3=A9dric_Le_Goater?= , Nicholas Piggin , BALATON Zoltan , Daniel Henrique Barboza , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 3/4] hw/ppc/ppc4xx_pci: Move ppc4xx_pci.c to hw/pci-host/ Date: Thu, 15 Feb 2024 11:50:15 +0100 Message-ID: <20240215105017.57748-4-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240215105017.57748-1-philmd@linaro.org> References: <20240215105017.57748-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, 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 a9458121d9..b24f7e7e60 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" From patchwork Thu Feb 15 10:50:16 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: 772890 Delivered-To: patch@linaro.org Received: by 2002:adf:9dc2:0:b0:33b:4db1:f5b3 with SMTP id q2csp761314wre; Thu, 15 Feb 2024 02:51:29 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCWNA7RuXmguPORhpd9NSIR884InyOt7OnwS1e8L2L1WpkkcP67JrmZrrLohDjHjMWhlpHo1enr0J3Gx6tVgbznW X-Google-Smtp-Source: AGHT+IFNYfVzb4hbsxG+6yie/FSKwLIWVB5IRUSEkFetB7Z7SJ0hsCG1m6ErsWnmqk8CT4C+6Tcv X-Received: by 2002:a05:6102:2924:b0:46d:6dfb:bfc4 with SMTP id cz36-20020a056102292400b0046d6dfbbfc4mr1884078vsb.6.1707994289003; Thu, 15 Feb 2024 02:51:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1707994288; cv=none; d=google.com; s=arc-20160816; b=yqjk7t/JPcHT0w501D13ON/j5JscySo12L0McYVptOUhu52PpUGd/ltkikQAMXaiEr 2RzjQiSeoXIdQ9pvrwn5o428Atf+iPR2wsQIC3+NxRn7xyFplfJ5WVKi/gS94rH2IBLc YyX6DCIknoIL4fa8sQGFwT+m4x5a2LrC6LH0AFNSec8+YSToU6oRJyQPAKI1g4pGSAQB R+6xYieKnBWUB2i3POTAsNNx7n2KnkFSzV7Px3LGO4QpWBZ0KFKrnzmjE0kht7DRhdsm NJJ+wtmsrWQvvUrOKdw+FmPyUnKc/9MVQ0HggrFymTPnKhul4brhehVXSIqNTYmm09lO RkYA== 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=rih3/8Q+RSzgWPVyG4FhwvSTAtV5rhc3hhCf8/R/bOI=; fh=A+lY13+jFVcdA8ecQ4hcAHs/x8ylQFF0oU/oe2DVPZ8=; b=DtBBX+egur2Xh5tw7YZa92qo6bAaRndsxtKTuIcIDnaWEExz940m+Rle6LAHsIY+nG vQSpq6iBx645T0hG7GQyDs4OHFGP0Io7IVyVSjjML/FZzL5kF2Rg/B3vWbp00zsN8ggU DwbpSfJqinc9QkXD4tI7jf7SpCVeUZvZibhlM8Jxk4awRzIzSR7PBrpFzXwz0q4ZVS34 uYvJehUh/zJSMQWqaa5EX8mQOO7rmbnvhs0uyyLDlp6o0WlySFrtyH2iwTgl0eQPq1EY O5S/NxnWufxP9/2uydYqYLkI3X2L1AI5VIHijgBsC3q6N4AfY7iF7r2oCBG3jF42y6fv +9jw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xxYhAtXy; 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 w2-20020ac857c2000000b0042c7737be89si1119547qta.580.2024.02.15.02.51.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 15 Feb 2024 02:51:28 -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=xxYhAtXy; 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 1raZKV-00024J-R4; Thu, 15 Feb 2024 05:51:00 -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 1raZKL-0001zP-0k for qemu-devel@nongnu.org; Thu, 15 Feb 2024 05:50:49 -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 1raZKJ-0007eP-8o for qemu-devel@nongnu.org; Thu, 15 Feb 2024 05:50:48 -0500 Received: by mail-ed1-x535.google.com with SMTP id 4fb4d7f45d1cf-5639ffbcc10so875765a12.0 for ; Thu, 15 Feb 2024 02:50:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1707994245; x=1708599045; 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=rih3/8Q+RSzgWPVyG4FhwvSTAtV5rhc3hhCf8/R/bOI=; b=xxYhAtXyqQ69blwcS9f9E93Ew7+F3iW1EN67x+cVkBuk/eifb84GR3nDJVnjEcEite CdZPji4P5GOIbvwk1NLWMWwWlI5T+I+OS/aoqw066RKg29adw6Rax1UancyvP+OLtCZm JuNNsj+Km5C1m8S8TSXWEwuWDdJa5LLcZFJCSBv0FOAhYmGpffcnaZFpPZxzh9vtZJhi pHEU2zT874kkasQTZmiMUY7kDqMAW6XWtXExSrLKL4P6DhyvoUFbCByWou1dyizXclKv 3Qf6wlS70NaN88xT3qqhfFPTuwdr/DOJ6xZX5iooj2LAtSKgSAJPfagVF1n3nautyFOH RzSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707994245; x=1708599045; 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=rih3/8Q+RSzgWPVyG4FhwvSTAtV5rhc3hhCf8/R/bOI=; b=cXeuwqBDU/7x/JKGLL8zzT2lNmQvkboLuQ7ssYIGTefo3xdKKkUu8F7cWUIZmzhnW4 nPjgKQ+b59Yme17QZ4Z37+deh8UIZT7om6SdkECxQNo+9XQEBWy3U6YfjpZax7AGrK4f enEsWgAIpD2V7YfG5W6E8x37kc+mtEKdHLhJRPwQqthOzq0TpOmp2jVL+ClGIlP+JFmm ooPhr4bMrKM50OpnqfAevYl0WEINidstduJhjqxrGKU3tpdcudnnqNdwneo5DprHUxp5 d6RUZdr4OyvnTeW3KbU2zv+qYMJnbMNlxewt/uB+QMV5y91M7XCbS+nQ5gouo9K5TRt5 hOPw== X-Gm-Message-State: AOJu0YyiN68d+6pS0lTBbK6uXGRwL4kZe9z9pv2mhKz3Az9GtLJF5BHr fOrzZCcME4wPck+y4u3BiycTzuqt+l6l1soBa97d3AdUyttitvffWN91cEkjdSaZz0NyOTJ4ZaR E7VI= X-Received: by 2002:aa7:d148:0:b0:563:c54e:f7 with SMTP id r8-20020aa7d148000000b00563c54e00f7mr217880edo.17.1707994245622; Thu, 15 Feb 2024 02:50:45 -0800 (PST) Received: from localhost.localdomain ([92.88.170.215]) by smtp.gmail.com with ESMTPSA id u26-20020a50a41a000000b0056392b7d85fsm446683edb.9.2024.02.15.02.50.44 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 15 Feb 2024 02:50:45 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Paolo Bonzini , qemu-ppc@nongnu.org, =?utf-8?q?C?= =?utf-8?q?=C3=A9dric_Le_Goater?= , Nicholas Piggin , BALATON Zoltan , Daniel Henrique Barboza , Thomas Huth , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v3 4/4] hw/ppc/ppc440_pcix: Move ppc440_pcix.c to hw/pci-host/ Date: Thu, 15 Feb 2024 11:50:16 +0100 Message-ID: <20240215105017.57748-5-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240215105017.57748-1-philmd@linaro.org> References: <20240215105017.57748-1-philmd@linaro.org> MIME-Version: 1.0 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=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. Reviewed-by: Thomas Huth 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 b24f7e7e60..4eb98973d7 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..c91880b237 100644 --- a/hw/pci-host/Kconfig +++ b/hw/pci-host/Kconfig @@ -10,6 +10,10 @@ config PPC4XX_PCI bool select PCI +config PPC440_PCIX + 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..3001e93a43 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_PCIX', 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=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 82e847d22c..99d571fa20 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_PCIX 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=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