Re: [Qemu-devel] [PATCH] docs/pcie.txt: Replace ioh3420 with pcie-root-port

[Marcel Apfelbaum]

On 03/08/2017 0:25, Michael S. Tsirkin wrote:
> 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 <address@hidden>
> > Signed-off-by: Marcel Apfelbaum <address@hidden>
> > ---
>
> Do we need this in 2.10? I'm inclined to say no, it can wait
> until 2.11. Thoughts?

Is only documentation and the generic root port
is already functional, so why keep the doc outdated?

Thanks,
Marcel

> >   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 <dev>,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 <dev>,bus=downstream_port1
> > --
> > 2.9.4