diff mbox

q35: Add PCIe switch to example q35 configuration

Message ID 20130820182051.7766.29027.stgit@bling.home
State New
Headers show

Commit Message

Alex Williamson Aug. 20, 2013, 6:21 p.m. UTC
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
---
 docs/q35-chipset.cfg |   23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

Comments

Markus Armbruster Aug. 21, 2013, 9:31 a.m. UTC | #1
Alex Williamson <alex.williamson@redhat.com> writes:

> Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
> ---
>  docs/q35-chipset.cfg |   23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
>
> diff --git a/docs/q35-chipset.cfg b/docs/q35-chipset.cfg
> index 1b6efc0..e4ddb7d 100644
> --- a/docs/q35-chipset.cfg
> +++ b/docs/q35-chipset.cfg
> @@ -91,6 +91,29 @@
>    port = "4"
>    chassis = "4"
>  
> +##
> +# Example PCIe switch with two downstream ports
> +#
> +#[device "pcie-switch-upstream-port-1"]
> +#  driver = "x3130-upstream"
> +#  bus = "ich9-pcie-port-4"
> +#  addr = "00.0"
> +#
> +#[device "pcie-switch-downstream-port-1-1"]
> +#  driver = "xio3130-downstream"
> +#  multifunction = "on"
> +#  bus = "pcie-switch-upstream-port-1"
> +#  addr = "00.0"
> +#  port = "1"
> +#  chassis = "5"
> +#
> +#[device "pcie-switch-downstream-port-1-2"]
> +#  driver = "xio3130-downstream"
> +#  multifunction = "on"
> +#  bus = "pcie-switch-upstream-port-1"
> +#  addr = "00.1"
> +#  port = "1"
> +#  chassis = "6"
>  
>  [device "ich9-ehci-1"]
>    driver = "ich9-usb-ehci1"

Yes, please!

I decommented the three device definitions, and the result looks fine in
info qtree.

A brief hint at why you would want a PCIe switch in the comment would
perhaps be nice.
Michael S. Tsirkin Aug. 21, 2013, 9:39 a.m. UTC | #2
On Tue, Aug 20, 2013 at 12:21:57PM -0600, Alex Williamson wrote:
> Signed-off-by: Alex Williamson <alex.williamson@redhat.com>

Thanks, applied.

> ---
>  docs/q35-chipset.cfg |   23 +++++++++++++++++++++++
>  1 file changed, 23 insertions(+)
> 
> diff --git a/docs/q35-chipset.cfg b/docs/q35-chipset.cfg
> index 1b6efc0..e4ddb7d 100644
> --- a/docs/q35-chipset.cfg
> +++ b/docs/q35-chipset.cfg
> @@ -91,6 +91,29 @@
>    port = "4"
>    chassis = "4"
>  
> +##
> +# Example PCIe switch with two downstream ports
> +#
> +#[device "pcie-switch-upstream-port-1"]
> +#  driver = "x3130-upstream"
> +#  bus = "ich9-pcie-port-4"
> +#  addr = "00.0"
> +#
> +#[device "pcie-switch-downstream-port-1-1"]
> +#  driver = "xio3130-downstream"
> +#  multifunction = "on"
> +#  bus = "pcie-switch-upstream-port-1"
> +#  addr = "00.0"
> +#  port = "1"
> +#  chassis = "5"
> +#
> +#[device "pcie-switch-downstream-port-1-2"]
> +#  driver = "xio3130-downstream"
> +#  multifunction = "on"
> +#  bus = "pcie-switch-upstream-port-1"
> +#  addr = "00.1"
> +#  port = "1"
> +#  chassis = "6"
>  
>  [device "ich9-ehci-1"]
>    driver = "ich9-usb-ehci1"
diff mbox

Patch

diff --git a/docs/q35-chipset.cfg b/docs/q35-chipset.cfg
index 1b6efc0..e4ddb7d 100644
--- a/docs/q35-chipset.cfg
+++ b/docs/q35-chipset.cfg
@@ -91,6 +91,29 @@ 
   port = "4"
   chassis = "4"
 
+##
+# Example PCIe switch with two downstream ports
+#
+#[device "pcie-switch-upstream-port-1"]
+#  driver = "x3130-upstream"
+#  bus = "ich9-pcie-port-4"
+#  addr = "00.0"
+#
+#[device "pcie-switch-downstream-port-1-1"]
+#  driver = "xio3130-downstream"
+#  multifunction = "on"
+#  bus = "pcie-switch-upstream-port-1"
+#  addr = "00.0"
+#  port = "1"
+#  chassis = "5"
+#
+#[device "pcie-switch-downstream-port-1-2"]
+#  driver = "xio3130-downstream"
+#  multifunction = "on"
+#  bus = "pcie-switch-upstream-port-1"
+#  addr = "00.1"
+#  port = "1"
+#  chassis = "6"
 
 [device "ich9-ehci-1"]
   driver = "ich9-usb-ehci1"