From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43950) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dd19N-00080C-7X for qemu-devel@nongnu.org; Wed, 02 Aug 2017 17:25:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dd19I-0003Fi-9k for qemu-devel@nongnu.org; Wed, 02 Aug 2017 17:25:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51944) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dd19H-0003Er-Q5 for qemu-devel@nongnu.org; Wed, 02 Aug 2017 17:25:48 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7850877540 for ; Wed, 2 Aug 2017 21:25:46 +0000 (UTC) Date: Thu, 3 Aug 2017 00:25:43 +0300 From: "Michael S. Tsirkin" Message-ID: <20170803002520-mutt-send-email-mst@kernel.org> References: <20170802155113.62471-1-marcel@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20170802155113.62471-1-marcel@redhat.com> Subject: Re: [Qemu-devel] [PATCH] docs/pcie.txt: Replace ioh3420 with pcie-root-port List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Marcel Apfelbaum Cc: qemu-devel@nongnu.org, lersek@redhat.com, drjones@redhat.com On Wed, Aug 02, 2017 at 06:51:13PM +0300, Marcel Apfelbaum wrote: > 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 > Signed-off-by: Marcel Apfelbaum > --- Do we need this in 2.10? I'm inclined to say no, it can wait until 2.11. Thoughts? > docs/pcie.txt | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/docs/pcie.txt b/docs/pcie.txt > index 5bada24..f990033 100644 > --- a/docs/pcie.txt > +++ b/docs/pcie.txt > @@ -43,8 +43,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) DMI-PCI Bridges (i82801b11-bridge), for starting legacy PCI > hierarchies. > @@ -65,7 +65,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] > Only PCI Express Root Ports and DMI-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 i82801b11-bridge,id=dmi_pci_bridge1,bus=pcie.1 > > > @@ -107,14 +107,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 > -- > 2.9.4