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

[Laszlo Ersek]

On 1/23/23 18:42, Daniel P. Berrangé wrote:
> From: Marcel Apfelbaum <marcel@redhat.com>
> 
> 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 <drjones@redhat.com>
> Reviewed-by: Laszlo Ersek <lersek@redhat.com>
> Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
> ---
> 
> 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 <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