From: gregkh@linuxfoundation•org (Greg KH)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v4 2/2] usb: Add support for ACPI identification to xhci-platform
Date: Sat, 8 Aug 2015 08:37:10 -0700 [thread overview]
Message-ID: <20150808153710.GA11851@kroah.com> (raw)
In-Reply-To: <CABxcv=nAxKqt06js1epALu8Y_61bZ+XeRwy_N=oQUTeRVCh6-w@mail.gmail.com>
On Sat, Aug 08, 2015 at 07:43:40AM +0200, Javier Martinez Canillas wrote:
> Hello Greg,
>
> On Sat, Aug 8, 2015 at 3:29 AM, Greg KH <gregkh@linuxfoundation•org> wrote:
> > On Fri, Aug 07, 2015 at 06:03:36PM -0700, Duc Dang wrote:
> >> Provide the methods to let ACPI identify the need to use
> >> xhci-platform. Change the Kconfig files so the
> >> xhci-plat.o file is selectable during kernel config.
> >>
> >> This has been tested on an ARM64 machine with platform XHCI, an
> >> x86_64 machine with XHCI, and an x86_64 machine without XHCI.
> >> There were no regressions or error messages on the machines
> >> without platform XHCI.
> >>
> >> [dhdang: regenerate the patch over 4.2-rc5]
> >> Signed-off-by: Mark Langsdorf <mlangsdo@redhat•com>
> >> Signed-off-by: Duc Dang <dhdang@apm•com>
> >>
> >> ---
> >> Changes from v3:
> >> Regenerate the patch over 4.2-rc5
> >> No code change
> >>
> >> Changes from v2
> >> Replaced tristate with a boolean as the driver doesn't
> >> compile as a module
> >> Correct --help-- to ---help---
> >>
> >> Changes from v1
> >> Renamed from "add support for APM X-Gene to xhci-platform"
> >> Removed changes to arm64/Kconfig
> >> Made CONFIG_USB_XHCI_PLATFORM a user selectable config option
> >>
> >> drivers/usb/host/Kconfig | 7 ++++++-
> >> drivers/usb/host/xhci-plat.c | 11 +++++++++++
> >> 2 files changed, 17 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
> >> index 8afc3c1..96231ee 100644
> >> --- a/drivers/usb/host/Kconfig
> >> +++ b/drivers/usb/host/Kconfig
> >> @@ -32,7 +32,12 @@ config USB_XHCI_PCI
> >> default y
> >>
> >> config USB_XHCI_PLATFORM
> >> - tristate
> >> + tristate "xHCI platform driver support"
> >> + ---help---
> >> + Say 'Y' to enable the support for the xHCI host controller
> >> + as a platform device. Many ARM SoCs provide USB this way.
> >> +
> >> + If unsure, say 'Y'.
> >>
> >> config USB_XHCI_MVEBU
> >> tristate "xHCI support for Marvell Armada 375/38x"
> >> diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
> >> index 5d03f8b..14b40d2 100644
> >> --- a/drivers/usb/host/xhci-plat.c
> >> +++ b/drivers/usb/host/xhci-plat.c
> >> @@ -19,6 +19,7 @@
> >> #include <linux/usb/phy.h>
> >> #include <linux/slab.h>
> >> #include <linux/usb/xhci_pdriver.h>
> >> +#include <linux/acpi.h>
> >>
> >> #include "xhci.h"
> >> #include "xhci-mvebu.h"
> >> @@ -262,6 +263,15 @@ static const struct of_device_id usb_xhci_of_match[] = {
> >> MODULE_DEVICE_TABLE(of, usb_xhci_of_match);
> >> #endif
> >>
> >> +#ifdef CONFIG_ACPI
> >
> > You shoudn't need this #ifdef, right?
> >
>
> Why it is not needed?
Why is it needed?
> The driver does .acpi_match_table = ACPI_PTR(usb_xhci_acpi_match) and
> ACPI_PTR() is NULL if CONFIG_ACPI is not enabled. Which can happen
> AFAIU since the driver also supports OF. So without the #ifdef guards,
> .acpi_match_table = NULL and the struct acpi_device_id
> usb_xhci_acpi_match[] will be built but not used.
Which is just fine, right?
> Or am I missing something?
Don't put #ifdef in .c files if at all possible is the kernel style
rules.
thanks,
greg k-h
next prev parent reply other threads:[~2015-08-08 15:37 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CADaLNDkeOP+gBw0qdSDha551w+w+q4ry9-EevDw5giyiQGdnqA@mail.gmail.com>
2015-08-08 1:03 ` [PATCH v4 1/2] usb: make xhci platform driver use 64 bit or 32 bit DMA Duc Dang
2015-08-08 1:03 ` [PATCH v4 2/2] usb: Add support for ACPI identification to xhci-platform Duc Dang
2015-08-08 1:29 ` Greg KH
2015-08-08 2:40 ` Duc Dang
2015-08-08 3:18 ` [PATCH v5 1/2] usb: make xhci platform driver use 64 bit or 32 bit DMA Duc Dang
2015-08-08 3:18 ` [PATCH v5 2/2] usb: Add support for ACPI identification to xhci-platform Duc Dang
2015-08-08 9:22 ` [PATCH v5 1/2] usb: make xhci platform driver use 64 bit or 32 bit DMA Russell King - ARM Linux
2015-08-08 20:31 ` Duc Dang
2015-08-15 20:05 ` Arnd Bergmann
2015-08-19 21:28 ` Duc Dang
2015-08-20 13:09 ` Arnd Bergmann
2015-08-20 19:38 ` [PATCH v7 " Duc Dang
2015-08-20 19:38 ` [PATCH v7 2/2] usb: Add support for ACPI identification to xhci-platform Duc Dang
2015-08-31 18:58 ` [PATCH v7 1/2] usb: make xhci platform driver use 64 bit or 32 bit DMA Duc Dang
2015-09-01 11:54 ` Mathias Nyman
2015-09-01 12:07 ` Russell King - ARM Linux
2015-09-10 20:53 ` Duc Dang
2015-09-17 18:19 ` [PATCH v8 0/3] usb: xhci-platform: Configure 64-bit DMA mask if the platform is capable Duc Dang
2015-09-17 18:19 ` [PATCH v8 1/3] usb: make xhci platform driver use 64 bit or 32 bit DMA Duc Dang
2015-09-17 19:51 ` Arnd Bergmann
2015-09-17 20:29 ` Duc Dang
2015-09-17 18:19 ` [PATCH v8 2/3] usb: Add support for ACPI identification to xhci-platform Duc Dang
2015-09-17 18:19 ` [PATCH v8 3/3] usb: xhci: configure 32-bit DMA if the controller does not support 64-bit DMA Duc Dang
2015-09-30 21:24 ` [PATCH v8 0/3] usb: xhci-platform: Configure 64-bit DMA mask if the platform is capable Duc Dang
2015-10-04 9:10 ` Greg KH
2015-10-07 13:20 ` Mathias Nyman
2015-08-10 7:37 ` [PATCH v6 1/2] usb: make xhci platform driver use 64 bit or 32 bit DMA Duc Dang
2015-08-10 7:37 ` [PATCH v6 2/2] usb: Add support for ACPI identification to xhci-platform Duc Dang
2015-08-08 5:43 ` [PATCH v4 " Javier Martinez Canillas
2015-08-08 15:37 ` Greg KH [this message]
2015-08-08 16:45 ` Duc Dang
2015-08-08 21:05 ` Javier Martinez Canillas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150808153710.GA11851@kroah.com \
--to=gregkh@linuxfoundation$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox