[Qemu-devel] [PATCH] Make sysbus EHCI devices ARM only by default

[Qemu-devel] [PATCH] Make sysbus EHCI devices ARM only by default

[David Gibson]

A number of ARM embedded boards include EHCI USB host controllers which
appear as directly mapped devices, rather than sitting on a PCI bus.

At present code to emulate such devices is included whenever EHCI support
is included.  This patch adjusts teh config options to only include them
in builds targetting ARM by default.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 default-configs/arm-softmmu.mak | 1 +
 hw/usb/Makefile.objs            | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 7671ee2..b00c2e1 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -33,6 +33,7 @@ CONFIG_PFLASH_CFI01=y
 CONFIG_PFLASH_CFI02=y
 CONFIG_MICRODRIVE=y
 CONFIG_USB_MUSB=y
+CONFIG_USB_EHCI_SYSBUS=y
 
 CONFIG_ARM11MPCORE=y
 CONFIG_A9MPCORE=y
diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
index 3fe4dff..0ccd477 100644
--- a/hw/usb/Makefile.objs
+++ b/hw/usb/Makefile.objs
@@ -5,7 +5,8 @@ common-obj-y += libhw.o
 # usb host adapters
 common-obj-$(CONFIG_USB_UHCI) += hcd-uhci.o
 common-obj-$(CONFIG_USB_OHCI) += hcd-ohci.o
-common-obj-$(CONFIG_USB_EHCI) += hcd-ehci.o hcd-ehci-pci.o hcd-ehci-sysbus.o
+common-obj-$(CONFIG_USB_EHCI) += hcd-ehci.o hcd-ehci-pci.o
+common-obj-$(CONFIG_USB_EHCI_SYSBUS) += hcd-ehci-sysbus.o
 common-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o
 common-obj-$(CONFIG_USB_MUSB) += hcd-musb.o
 
-- 
2.1.0

Re: [Qemu-devel] [PATCH] Make sysbus EHCI devices ARM only by default

[Paolo Bonzini]

On 18/02/2015 06:01, David Gibson wrote:
> A number of ARM embedded boards include EHCI USB host controllers which
> appear as directly mapped devices, rather than sitting on a PCI bus.
> 
> At present code to emulate such devices is included whenever EHCI support
> is included.  This patch adjusts teh config options to only include them
> in builds targetting ARM by default.

I'm not even sure if any ARM board is using it, so it could just be
killed I think.  If not,

Reviewed-by: Paolo Bonzini <pbonzini@redhat.com>

Paolo

> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> ---
>  default-configs/arm-softmmu.mak | 1 +
>  hw/usb/Makefile.objs            | 3 ++-
>  2 files changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
> index 7671ee2..b00c2e1 100644
> --- a/default-configs/arm-softmmu.mak
> +++ b/default-configs/arm-softmmu.mak
> @@ -33,6 +33,7 @@ CONFIG_PFLASH_CFI01=y
>  CONFIG_PFLASH_CFI02=y
>  CONFIG_MICRODRIVE=y
>  CONFIG_USB_MUSB=y
> +CONFIG_USB_EHCI_SYSBUS=y
>  
>  CONFIG_ARM11MPCORE=y
>  CONFIG_A9MPCORE=y
> diff --git a/hw/usb/Makefile.objs b/hw/usb/Makefile.objs
> index 3fe4dff..0ccd477 100644
> --- a/hw/usb/Makefile.objs
> +++ b/hw/usb/Makefile.objs
> @@ -5,7 +5,8 @@ common-obj-y += libhw.o
>  # usb host adapters
>  common-obj-$(CONFIG_USB_UHCI) += hcd-uhci.o
>  common-obj-$(CONFIG_USB_OHCI) += hcd-ohci.o
> -common-obj-$(CONFIG_USB_EHCI) += hcd-ehci.o hcd-ehci-pci.o hcd-ehci-sysbus.o
> +common-obj-$(CONFIG_USB_EHCI) += hcd-ehci.o hcd-ehci-pci.o
> +common-obj-$(CONFIG_USB_EHCI_SYSBUS) += hcd-ehci-sysbus.o
>  common-obj-$(CONFIG_USB_XHCI) += hcd-xhci.o
>  common-obj-$(CONFIG_USB_MUSB) += hcd-musb.o
>  
> 

Re: [Qemu-devel] [PATCH] Make sysbus EHCI devices ARM only by default

[Amit Shah]

On (Wed) 18 Feb 2015 [16:01:01], David Gibson wrote:
> A number of ARM embedded boards include EHCI USB host controllers which
> appear as directly mapped devices, rather than sitting on a PCI bus.
> 
> At present code to emulate such devices is included whenever EHCI support
> is included.  This patch adjusts teh config options to only include them
> in builds targetting ARM by default.
> 
> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>

After this commit, the 'pc' machine type lost a few devices, as
noticed by the vmstate checker nightly run.  Is this expected?

   Section "xlnx,ps7-usb" does not exist in dest
   Section "fusbh200-ehci-usb" does not exist in dest
   Section "tegra2-ehci-usb" does not exist in dest
   Section "sysbus-ehci-usb" does not exist in dest
   Section "exynos4210-ehci-usb" does not exist in dest


		Amit

Re: [Qemu-devel] [PATCH] Make sysbus EHCI devices ARM only by default

[David Gibson]

[-- Attachment #1: Type: text/plain, Size: 1280 bytes --]

On Mon, Mar 02, 2015 at 12:45:16PM +0530, Amit Shah wrote:
> On (Wed) 18 Feb 2015 [16:01:01], David Gibson wrote:
> > A number of ARM embedded boards include EHCI USB host controllers which
> > appear as directly mapped devices, rather than sitting on a PCI bus.
> > 
> > At present code to emulate such devices is included whenever EHCI support
> > is included.  This patch adjusts teh config options to only include them
> > in builds targetting ARM by default.
> > 
> > Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> 
> After this commit, the 'pc' machine type lost a few devices, as
> noticed by the vmstate checker nightly run.  Is this expected?
> 
>    Section "xlnx,ps7-usb" does not exist in dest
>    Section "fusbh200-ehci-usb" does not exist in dest
>    Section "tegra2-ehci-usb" does not exist in dest
>    Section "sysbus-ehci-usb" does not exist in dest
>    Section "exynos4210-ehci-usb" does not exist in dest

Yes, that's expected.  Those are all sysbus EHCI interfaces that AFAIK
are only actually used on certain ARM platforms.

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: Type: application/pgp-signature, Size: 819 bytes --]

Re: [Qemu-devel] [PATCH] Make sysbus EHCI devices ARM only by default

[Amit Shah]

On (Mon) 02 Mar 2015 [18:28:12], David Gibson wrote:
> On Mon, Mar 02, 2015 at 12:45:16PM +0530, Amit Shah wrote:
> > On (Wed) 18 Feb 2015 [16:01:01], David Gibson wrote:
> > > A number of ARM embedded boards include EHCI USB host controllers which
> > > appear as directly mapped devices, rather than sitting on a PCI bus.
> > > 
> > > At present code to emulate such devices is included whenever EHCI support
> > > is included.  This patch adjusts teh config options to only include them
> > > in builds targetting ARM by default.
> > > 
> > > Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> > 
> > After this commit, the 'pc' machine type lost a few devices, as
> > noticed by the vmstate checker nightly run.  Is this expected?
> > 
> >    Section "xlnx,ps7-usb" does not exist in dest
> >    Section "fusbh200-ehci-usb" does not exist in dest
> >    Section "tegra2-ehci-usb" does not exist in dest
> >    Section "sysbus-ehci-usb" does not exist in dest
> >    Section "exynos4210-ehci-usb" does not exist in dest
> 
> Yes, that's expected.  Those are all sysbus EHCI interfaces that AFAIK
> are only actually used on certain ARM platforms.

OK, thanks.


		Amit