Re: [PATCH v2 3/3] arm: allwinner: Wire up USB ports

From: Peter Maydell <peter.maydell@linaro.org>
To: Guenter Roeck <linux@roeck-us.net>
Cc: Beniamino Galvani <b.galvani@gmail.com>,
	qemu-arm <qemu-arm@nongnu.org>, Gerd Hoffmann <kraxel@redhat.com>,
	QEMU Developers <qemu-devel@nongnu.org>
Subject: Re: [PATCH v2 3/3] arm: allwinner: Wire up USB ports
Date: Mon, 17 Feb 2020 10:13:15 +0000	[thread overview]
Message-ID: <CAFEAcA8Su5SfM9f9BpwaEK2yq0NPwjbtUSwQ1n=G1a=8W881JA@mail.gmail.com> (raw)
In-Reply-To: <20200215001248.2642-4-linux@roeck-us.net>

On Sat, 15 Feb 2020 at 00:12, Guenter Roeck <linux@roeck-us.net> wrote:
>
> Instantiate EHCI and OHCI controllers on Allwinner A10. OHCI ports are
> modeled as companions of the respective EHCI ports.
>
> With this patch applied, USB controllers are discovered and instantiated
> when booting the cubieboard machine with a recent Linux kernel.
>
> ehci-platform 1c14000.usb: EHCI Host Controller
> ehci-platform 1c14000.usb: new USB bus registered, assigned bus number 1
> ehci-platform 1c14000.usb: irq 26, io mem 0x01c14000
> ehci-platform 1c14000.usb: USB 2.0 started, EHCI 1.00
> ehci-platform 1c1c000.usb: EHCI Host Controller
> ehci-platform 1c1c000.usb: new USB bus registered, assigned bus number 2
> ehci-platform 1c1c000.usb: irq 31, io mem 0x01c1c000
> ehci-platform 1c1c000.usb: USB 2.0 started, EHCI 1.00
> ohci-platform 1c14400.usb: Generic Platform OHCI controller
> ohci-platform 1c14400.usb: new USB bus registered, assigned bus number 3
> ohci-platform 1c14400.usb: irq 27, io mem 0x01c14400
> ohci-platform 1c1c400.usb: Generic Platform OHCI controller
> ohci-platform 1c1c400.usb: new USB bus registered, assigned bus number 4
> ohci-platform 1c1c400.usb: irq 32, io mem 0x01c1c400
> usb 2-1: new high-speed USB device number 2 using ehci-platform
> usb-storage 2-1:1.0: USB Mass Storage device detected
> scsi host1: usb-storage 2-1:1.0
> usb 3-1: new full-speed USB device number 2 using ohci-platform
> input: QEMU QEMU USB Mouse as /devices/platform/soc/1c14400.usb/usb3/3-1/3-1:1.0/0003:0627:0001.0001/input/input0
>
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> ---
> v2: Instantiate EHCI and OHCI in a single patch
>     Use define instead of ARRAY_SIZE to get the number of USB ports
>     Instantiate OHCI in companion mode
>     Use &error_fatal to handle error conditions
>
>  hw/arm/allwinner-a10.c         | 43 ++++++++++++++++++++++++++++++++++
>  include/hw/arm/allwinner-a10.h |  6 +++++
>  2 files changed, 49 insertions(+)
>
> diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c
> index 45cd8d2db5..57275c92f5 100644
> --- a/hw/arm/allwinner-a10.c
> +++ b/hw/arm/allwinner-a10.c
> @@ -24,12 +24,16 @@
>  #include "hw/arm/allwinner-a10.h"
>  #include "hw/misc/unimp.h"
>  #include "sysemu/sysemu.h"
> +#include "hw/boards.h"
> +#include "hw/usb/hcd-ohci.h"
>
>  #define AW_A10_CCM_REG_BASE     0x01c20000
>  #define AW_A10_PIC_REG_BASE     0x01c20400
>  #define AW_A10_PIT_REG_BASE     0x01c20c00
>  #define AW_A10_UART0_REG_BASE   0x01c28000
>  #define AW_A10_EMAC_BASE        0x01c0b000
> +#define AW_A10_EHCI_BASE        0x01c14000
> +#define AW_A10_OHCI_BASE        0x01c14400
>  #define AW_A10_SATA_BASE        0x01c18000

Hi; I tried to apply this patchset, but it doesn't apply to master.
In particular, master doesn't have a #define for AW_A10_CCM_REG_BASE.

Is this patchset supposed to be based on some other patchset
you've already sent that's got lost in my mailbox?

thanks
-- PMM