From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A6D1DC54EAA for ; Tue, 24 Jan 2023 10:20:05 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pKGOe-00007u-PQ; Tue, 24 Jan 2023 05:19:21 -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 1pKGOB-0008Tz-Uh for qemu-devel@nongnu.org; Tue, 24 Jan 2023 05:18:54 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pKGO9-0001IG-Qh for qemu-devel@nongnu.org; Tue, 24 Jan 2023 05:18:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1674555528; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FonaZJHenX2eXtjoNC1YBwas1/EXOUzFxeMp0baqkxI=; b=Vm+ELgXBN8hpw+LxxyoRdasf6TtMZhkj+SXiiokwwpysgnLLSFK225ZeKoTjokVHOrmMMY mw9uLkWOMAofN2yfHby14Vxcb/MrAOX44TvtgRlLg63xuACein0Us5SvrH5U8CE5rtAKl7 BiYKsqVtU9jY06NeKmXragbSIrBwotw= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-332-KJqv2dfLNp6LQjhH95Ki2w-1; Tue, 24 Jan 2023 05:18:44 -0500 X-MC-Unique: KJqv2dfLNp6LQjhH95Ki2w-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 4C14D85CCE1; Tue, 24 Jan 2023 10:18:44 +0000 (UTC) Received: from [10.39.195.138] (unknown [10.39.195.138]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1D8FC40C2004; Tue, 24 Jan 2023 10:18:42 +0000 (UTC) Message-ID: <9b1e6554-c56d-cb55-4904-05caee2143a3@redhat.com> Date: Tue, 24 Jan 2023 11:18:41 +0100 MIME-Version: 1.0 Subject: Re: [PATCH] docs/pcie.txt: Replace ioh3420 with pcie-root-port Content-Language: en-US To: =?UTF-8?Q?Daniel_P=2e_Berrang=c3=a9?= , qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Marcel Apfelbaum , Marcel Apfelbaum , Andrew Jones References: <20230123174205.683979-1-berrange@redhat.com> From: Laszlo Ersek In-Reply-To: <20230123174205.683979-1-berrange@redhat.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Received-SPF: pass client-ip=170.10.133.124; envelope-from=lersek@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 1/23/23 18:42, Daniel P. Berrangé wrote: > From: Marcel Apfelbaum > > Do not mention ioh3420 in the "how to" doc. > The device still works and can be used by already > existing setups, but no need to be mentioned. > > Suggested-by: Andrew Jones > Reviewed-by: Laszlo Ersek > Signed-off-by: Marcel Apfelbaum > Signed-off-by: Daniel P. Berrangé > --- > > This patch was posted 5 years ago: > > https://lore.kernel.org/all/20170802155113.62471-1-marcel@redhat.com/ > > but seems to have fallen through the cracks and did not get merged. > > This just had the obvious/trivial conflict resolution done, along with > trimming hugely excessive whitespace before the '\' line continuation. > > docs/pcie.txt | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) Thanks for resurrecting this! Laszlo > diff --git a/docs/pcie.txt b/docs/pcie.txt > index 89e3502075..df49178311 100644 > --- a/docs/pcie.txt > +++ b/docs/pcie.txt > @@ -48,8 +48,8 @@ Place only the following kinds of devices directly on the Root Complex: > strangely when PCI Express devices are integrated > with the Root Complex. > > - (2) PCI Express Root Ports (ioh3420), for starting exclusively PCI Express > - hierarchies. > + (2) PCI Express Root Ports (pcie-root-port), for starting exclusively > + PCI Express hierarchies. > > (3) PCI Express to PCI Bridge (pcie-pci-bridge), for starting legacy PCI > hierarchies. > @@ -70,7 +70,7 @@ Place only the following kinds of devices directly on the Root Complex: > -device pxb-pcie,id=pcie.1,bus_nr=x[,numa_node=y][,addr=z] > PCI Express Root Ports and PCI Express to PCI bridges can be > connected to the pcie.1 bus: > - -device ioh3420,id=root_port1[,bus=pcie.1][,chassis=x][,slot=y][,addr=z] \ > + -device pcie-root-port,id=root_port1[,bus=pcie.1][,chassis=x][,slot=y][,addr=z] \ > -device pcie-pci-bridge,id=pcie_pci_bridge1,bus=pcie.1 > > > @@ -112,14 +112,14 @@ Plug only PCI Express devices into PCI Express Ports. > ------------ > > 2.2.1 Plugging a PCI Express device into a PCI Express Root Port: > - -device ioh3420,id=root_port1,chassis=x,slot=y[,bus=pcie.0][,addr=z] \ > + -device pcie-root-port,id=root_port1,chassis=x,slot=y[,bus=pcie.0][,addr=z] \ > -device ,bus=root_port1 > 2.2.2 Using multi-function PCI Express Root Ports: > - -device ioh3420,id=root_port1,multifunction=on,chassis=x,addr=z.0[,slot=y][,bus=pcie.0] \ > - -device ioh3420,id=root_port2,chassis=x1,addr=z.1[,slot=y1][,bus=pcie.0] \ > - -device ioh3420,id=root_port3,chassis=x2,addr=z.2[,slot=y2][,bus=pcie.0] \ > + -device pcie-root-port,id=root_port1,multifunction=on,chassis=x,addr=z.0[,slot=y][,bus=pcie.0] \ > + -device pcie-root-port,id=root_port2,chassis=x1,addr=z.1[,slot=y1][,bus=pcie.0] \ > + -device pcie-root-port,id=root_port3,chassis=x2,addr=z.2[,slot=y2][,bus=pcie.0] \ > 2.2.3 Plugging a PCI Express device into a Switch: > - -device ioh3420,id=root_port1,chassis=x,slot=y[,bus=pcie.0][,addr=z] \ > + -device pcie-root-port,id=root_port1,chassis=x,slot=y[,bus=pcie.0][,addr=z] \ > -device x3130-upstream,id=upstream_port1,bus=root_port1[,addr=x] \ > -device xio3130-downstream,id=downstream_port1,bus=upstream_port1,chassis=x1,slot=y1[,addr=z1]] \ > -device ,bus=downstream_port1