[PATCH 0/2] usb: Move USB_UHCI_BIG_ENDIAN_* and select from SPARC_LEON

[PATCH 0/2] usb: Move USB_UHCI_BIG_ENDIAN_* and select from SPARC_LEON

[James Hogan]

This series moves USB_UHCI_BIG_ENDIAN_MMIO and USB_UHCI_BIG_ENDIAN_DESC
to a place where they can be easily selected from architecture code,
like USB_EHCI_BIG_ENDIAN_* are.

Patch 1 is primarily to fix MIPS generic platform warnings when this
patch ("MIPS: fix typo BIG_ENDIAN to CPU_BIG_ENDIAN") is applied:

https://patchwork.linux-mips.org/patch/18495/

It'd be awesome if this could get included in 4.16 so that the MIPS
patch can also be included without introducing warnings.

Patch 2 allows SPARC_LEON to do the same thing as MIPS_GENERIC does,
which seemed like a natural progression.

Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Corentin Labbe <clabbe.montjoie@gmail.com>
Cc: linux-usb@vger.kernel.org
Cc: sparclinux@vger.kernel.org

James Hogan (2):
  usb: Move USB_UHCI_BIG_ENDIAN_* out of USB_SUPPORT
  sparc,leon: Select USB_UHCI_BIG_ENDIAN_{MMIO,DESC}

 arch/sparc/Kconfig       | 2 ++
 drivers/usb/Kconfig      | 6 ++++++
 drivers/usb/host/Kconfig | 8 --------
 3 files changed, 8 insertions(+), 8 deletions(-)

base-commit: 6045f241b48f07b2fb80905bf49671f457a8c037
-- 
git-series 0.9.1

[PATCH 1/2] usb: Move USB_UHCI_BIG_ENDIAN_* out of USB_SUPPORT

[James Hogan]

Move the Kconfig symbols USB_UHCI_BIG_ENDIAN_MMIO and
USB_UHCI_BIG_ENDIAN_DESC out of drivers/usb/host/Kconfig, which is
conditional upon USB && USB_SUPPORT, so that it can be freely selected
by platform Kconfig symbols in architecture code.

For example once the MIPS_GENERIC platform selects are fixed in the
patch "MIPS: Fix typo BIG_ENDIAN to CPU_BIG_ENDIAN", the MIPS
32r6_defconfig warns like so:

warning: (MIPS_GENERIC) selects USB_UHCI_BIG_ENDIAN_MMIO which has unmet direct dependencies (USB_SUPPORT && USB)
warning: (MIPS_GENERIC) selects USB_UHCI_BIG_ENDIAN_DESC which has unmet direct dependencies (USB_SUPPORT && USB)

Signed-off-by: James Hogan <jhogan@kernel.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Corentin Labbe <clabbe.montjoie@gmail.com>
Cc: linux-usb@vger.kernel.org
---
 drivers/usb/Kconfig      | 8 ++++++++
 drivers/usb/host/Kconfig | 8 --------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index f699abab1787..65812a2f60b4 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -19,6 +19,14 @@ config USB_EHCI_BIG_ENDIAN_MMIO
 config USB_EHCI_BIG_ENDIAN_DESC
 	bool
 
+config USB_UHCI_BIG_ENDIAN_MMIO
+	bool
+	default y if SPARC_LEON
+
+config USB_UHCI_BIG_ENDIAN_DESC
+	bool
+	default y if SPARC_LEON
+
 menuconfig USB_SUPPORT
 	bool "USB support"
 	depends on HAS_IOMEM
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
index b80a94e632af..2763a640359f 100644
--- a/drivers/usb/host/Kconfig
+++ b/drivers/usb/host/Kconfig
@@ -625,14 +625,6 @@ config USB_UHCI_ASPEED
        bool
        default y if ARCH_ASPEED
 
-config USB_UHCI_BIG_ENDIAN_MMIO
-	bool
-	default y if SPARC_LEON
-
-config USB_UHCI_BIG_ENDIAN_DESC
-	bool
-	default y if SPARC_LEON
-
 config USB_FHCI_HCD
 	tristate "Freescale QE USB Host Controller support"
 	depends on OF_GPIO && QE_GPIO && QUICC_ENGINE
-- 
git-series 0.9.1

Re: [PATCH 1/2] usb: Move USB_UHCI_BIG_ENDIAN_* out of USB_SUPPORT

[Greg Kroah-Hartman]

On Wed, Jan 31, 2018 at 10:24:45PM +0000, James Hogan wrote:
> Move the Kconfig symbols USB_UHCI_BIG_ENDIAN_MMIO and
> USB_UHCI_BIG_ENDIAN_DESC out of drivers/usb/host/Kconfig, which is
> conditional upon USB && USB_SUPPORT, so that it can be freely selected
> by platform Kconfig symbols in architecture code.
> 
> For example once the MIPS_GENERIC platform selects are fixed in the
> patch "MIPS: Fix typo BIG_ENDIAN to CPU_BIG_ENDIAN", the MIPS
> 32r6_defconfig warns like so:
> 
> warning: (MIPS_GENERIC) selects USB_UHCI_BIG_ENDIAN_MMIO which has unmet direct dependencies (USB_SUPPORT && USB)
> warning: (MIPS_GENERIC) selects USB_UHCI_BIG_ENDIAN_DESC which has unmet direct dependencies (USB_SUPPORT && USB)
> 
> Signed-off-by: James Hogan <jhogan@kernel.org>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> Cc: Corentin Labbe <clabbe.montjoie@gmail.com>
> Cc: linux-usb@vger.kernel.org

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Re: [PATCH 1/2] usb: Move USB_UHCI_BIG_ENDIAN_* out of USB_SUPPORT

[James Hogan]

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

On Thu, Feb 15, 2018 at 06:42:03PM +0100, Greg Kroah-Hartman wrote:
> On Wed, Jan 31, 2018 at 10:24:45PM +0000, James Hogan wrote:
> > Move the Kconfig symbols USB_UHCI_BIG_ENDIAN_MMIO and
> > USB_UHCI_BIG_ENDIAN_DESC out of drivers/usb/host/Kconfig, which is
> > conditional upon USB && USB_SUPPORT, so that it can be freely selected
> > by platform Kconfig symbols in architecture code.
> > 
> > For example once the MIPS_GENERIC platform selects are fixed in the
> > patch "MIPS: Fix typo BIG_ENDIAN to CPU_BIG_ENDIAN", the MIPS
> > 32r6_defconfig warns like so:
> > 
> > warning: (MIPS_GENERIC) selects USB_UHCI_BIG_ENDIAN_MMIO which has unmet direct dependencies (USB_SUPPORT && USB)
> > warning: (MIPS_GENERIC) selects USB_UHCI_BIG_ENDIAN_DESC which has unmet direct dependencies (USB_SUPPORT && USB)
> > 
> > Signed-off-by: James Hogan <jhogan@kernel.org>
> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > Cc: Corentin Labbe <clabbe.montjoie@gmail.com>
> > Cc: linux-usb@vger.kernel.org
> 
> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Thanks, I'll apply this as a MIPS fix for 4.16.

Okay to leave patch 2 for you to deal with Greg since it doesn't really
directly affect MIPS nor is it important for 4.16?

Cheers
James

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

Re: [PATCH 1/2] usb: Move USB_UHCI_BIG_ENDIAN_* out of USB_SUPPORT

[Greg Kroah-Hartman]

On Thu, Feb 15, 2018 at 09:38:48PM +0000, James Hogan wrote:
> On Thu, Feb 15, 2018 at 06:42:03PM +0100, Greg Kroah-Hartman wrote:
> > On Wed, Jan 31, 2018 at 10:24:45PM +0000, James Hogan wrote:
> > > Move the Kconfig symbols USB_UHCI_BIG_ENDIAN_MMIO and
> > > USB_UHCI_BIG_ENDIAN_DESC out of drivers/usb/host/Kconfig, which is
> > > conditional upon USB && USB_SUPPORT, so that it can be freely selected
> > > by platform Kconfig symbols in architecture code.
> > > 
> > > For example once the MIPS_GENERIC platform selects are fixed in the
> > > patch "MIPS: Fix typo BIG_ENDIAN to CPU_BIG_ENDIAN", the MIPS
> > > 32r6_defconfig warns like so:
> > > 
> > > warning: (MIPS_GENERIC) selects USB_UHCI_BIG_ENDIAN_MMIO which has unmet direct dependencies (USB_SUPPORT && USB)
> > > warning: (MIPS_GENERIC) selects USB_UHCI_BIG_ENDIAN_DESC which has unmet direct dependencies (USB_SUPPORT && USB)
> > > 
> > > Signed-off-by: James Hogan <jhogan@kernel.org>
> > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > > Cc: Corentin Labbe <clabbe.montjoie@gmail.com>
> > > Cc: linux-usb@vger.kernel.org
> > 
> > Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> 
> Thanks, I'll apply this as a MIPS fix for 4.16.
> 
> Okay to leave patch 2 for you to deal with Greg since it doesn't really
> directly affect MIPS nor is it important for 4.16?

Just take both of them and be done with it :)

thanks,

greg k-h

Re: [PATCH 1/2] usb: Move USB_UHCI_BIG_ENDIAN_* out of USB_SUPPORT

[James Hogan]

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

On Thu, Feb 15, 2018 at 10:41:42PM +0100, Greg Kroah-Hartman wrote:
> On Thu, Feb 15, 2018 at 09:38:48PM +0000, James Hogan wrote:
> > On Thu, Feb 15, 2018 at 06:42:03PM +0100, Greg Kroah-Hartman wrote:
> > > On Wed, Jan 31, 2018 at 10:24:45PM +0000, James Hogan wrote:
> > > > Move the Kconfig symbols USB_UHCI_BIG_ENDIAN_MMIO and
> > > > USB_UHCI_BIG_ENDIAN_DESC out of drivers/usb/host/Kconfig, which is
> > > > conditional upon USB && USB_SUPPORT, so that it can be freely selected
> > > > by platform Kconfig symbols in architecture code.
> > > > 
> > > > For example once the MIPS_GENERIC platform selects are fixed in the
> > > > patch "MIPS: Fix typo BIG_ENDIAN to CPU_BIG_ENDIAN", the MIPS
> > > > 32r6_defconfig warns like so:
> > > > 
> > > > warning: (MIPS_GENERIC) selects USB_UHCI_BIG_ENDIAN_MMIO which has unmet direct dependencies (USB_SUPPORT && USB)
> > > > warning: (MIPS_GENERIC) selects USB_UHCI_BIG_ENDIAN_DESC which has unmet direct dependencies (USB_SUPPORT && USB)
> > > > 
> > > > Signed-off-by: James Hogan <jhogan@kernel.org>
> > > > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > > > Cc: Corentin Labbe <clabbe.montjoie@gmail.com>
> > > > Cc: linux-usb@vger.kernel.org
> > > 
> > > Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> > 
> > Thanks, I'll apply this as a MIPS fix for 4.16.
> > 
> > Okay to leave patch 2 for you to deal with Greg since it doesn't really
> > directly affect MIPS nor is it important for 4.16?
> 
> Just take both of them and be done with it :)

Okay,

Thanks
James

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

[PATCH 2/2] sparc,leon: Select USB_UHCI_BIG_ENDIAN_{MMIO,DESC}

[James Hogan]

Now that USB_UHCI_BIG_ENDIAN_MMIO and USB_UHCI_BIG_ENDIAN_DESC are moved
outside of the USB_SUPPORT conditional, simply select them from
SPARC_LEON rather than by the symbol's defaults in drivers/usb/Kconfig,
similar to how it is done for USB_EHCI_BIG_ENDIAN_MMIO and
USB_EHCI_BIG_ENDIAN_DESC.

Signed-off-by: James Hogan <jhogan@kernel.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Corentin Labbe <clabbe.montjoie@gmail.com>
Cc: sparclinux@vger.kernel.org
Cc: linux-usb@vger.kernel.org
---
 arch/sparc/Kconfig  | 2 ++
 drivers/usb/Kconfig | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 6bf594ace663..8767e45f1b2b 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -430,6 +430,8 @@ config SPARC_LEON
 	depends on SPARC32
 	select USB_EHCI_BIG_ENDIAN_MMIO
 	select USB_EHCI_BIG_ENDIAN_DESC
+	select USB_UHCI_BIG_ENDIAN_MMIO
+	select USB_UHCI_BIG_ENDIAN_DESC
 	---help---
 	  If you say Y here if you are running on a SPARC-LEON processor.
 	  The LEON processor is a synthesizable VHDL model of the
diff --git a/drivers/usb/Kconfig b/drivers/usb/Kconfig
index 65812a2f60b4..148f3ee70286 100644
--- a/drivers/usb/Kconfig
+++ b/drivers/usb/Kconfig
@@ -21,11 +21,9 @@ config USB_EHCI_BIG_ENDIAN_DESC
 
 config USB_UHCI_BIG_ENDIAN_MMIO
 	bool
-	default y if SPARC_LEON
 
 config USB_UHCI_BIG_ENDIAN_DESC
 	bool
-	default y if SPARC_LEON
 
 menuconfig USB_SUPPORT
 	bool "USB support"
-- 
git-series 0.9.1

Re: [PATCH 2/2] sparc,leon: Select USB_UHCI_BIG_ENDIAN_{MMIO,DESC}

[David Miller]

From: James Hogan <jhogan@kernel.org>
Date: Wed, 31 Jan 2018 22:24:46 +0000

> Now that USB_UHCI_BIG_ENDIAN_MMIO and USB_UHCI_BIG_ENDIAN_DESC are moved
> outside of the USB_SUPPORT conditional, simply select them from
> SPARC_LEON rather than by the symbol's defaults in drivers/usb/Kconfig,
> similar to how it is done for USB_EHCI_BIG_ENDIAN_MMIO and
> USB_EHCI_BIG_ENDIAN_DESC.
> 
> Signed-off-by: James Hogan <jhogan@kernel.org>

Acked-by: David S. Miller <davem@davemloft.net>