[PATCH 0/4] usb: dwc3: ACPI support

[PATCH 0/4] usb: dwc3: ACPI support

[Heikki Krogerus]

And Intel Braswell PCI ID


Alan Cox (1):
  usb: dwc3: pci: Add PCI ID for Intel Braswell

Heikki Krogerus (3):
  ACPI / platform: provide default DMA mask
  usb: dwc3: core: only setting the dma_mask when needed
  usb: dwc3: add ACPI support

 drivers/acpi/acpi_platform.c |  2 ++
 drivers/usb/dwc3/core.c      | 18 +++++++++++++++---
 drivers/usb/dwc3/dwc3-pci.c  |  2 ++
 3 files changed, 19 insertions(+), 3 deletions(-)

-- 
2.1.0

[PATCH 1/4] usb: dwc3: pci: Add PCI ID for Intel Braswell

[Heikki Krogerus]

From: Alan Cox <alan@linux.intel.com>

The device controller is the same but it has different PCI ID. Add this new
ID to the driver's list of supported IDs.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
 drivers/usb/dwc3/dwc3-pci.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
index a60bab7..3eb0229 100644
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@ -30,6 +30,7 @@
 #define PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3	0xabcd
 #define PCI_DEVICE_ID_INTEL_BYT		0x0f37
 #define PCI_DEVICE_ID_INTEL_MRFLD	0x119e
+#define PCI_DEVICE_ID_INTEL_BSW		0x22B7
 
 struct dwc3_pci {
 	struct device		*dev;
@@ -183,6 +184,7 @@ static const struct pci_device_id dwc3_pci_id_table[] = {
 		PCI_DEVICE(PCI_VENDOR_ID_SYNOPSYS,
 				PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3),
 	},
+	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BSW), },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_BYT), },
 	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_MRFLD), },
 	{  }	/* Terminating Entry */
-- 
2.1.0

[PATCH 2/4] ACPI / platform: provide default DMA mask

[Heikki Krogerus]

Most devices are configured for 32-bit DMA addresses.
Setting the mask to 32-bit here removes the need for the
drivers to do it separately.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
 drivers/acpi/acpi_platform.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
index 2bf9082..8d099e6 100644
--- a/drivers/acpi/acpi_platform.c
+++ b/drivers/acpi/acpi_platform.c
@@ -16,6 +16,7 @@
 #include <linux/err.h>
 #include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/dma-mapping.h>
 #include <linux/platform_device.h>
 
 #include "internal.h"
@@ -102,6 +103,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev)
 	pdevinfo.res = resources;
 	pdevinfo.num_res = count;
 	pdevinfo.acpi_node.companion = adev;
+	pdevinfo.dma_mask = DMA_BIT_MASK(32);
 	pdev = platform_device_register_full(&pdevinfo);
 	if (IS_ERR(pdev))
 		dev_err(&adev->dev, "platform device creation failed: %ld\n",
-- 
2.1.0

Re: [PATCH 2/4] ACPI / platform: provide default DMA mask

[Heikki Krogerus]

On Wed, Aug 20, 2014 at 02:55:26PM +0300, Heikki Krogerus wrote:
> Most devices are configured for 32-bit DMA addresses.
> Setting the mask to 32-bit here removes the need for the
> drivers to do it separately.

Rafael, is this OK?

> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> ---
>  drivers/acpi/acpi_platform.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
> index 2bf9082..8d099e6 100644
> --- a/drivers/acpi/acpi_platform.c
> +++ b/drivers/acpi/acpi_platform.c
> @@ -16,6 +16,7 @@
>  #include <linux/err.h>
>  #include <linux/kernel.h>
>  #include <linux/module.h>
> +#include <linux/dma-mapping.h>
>  #include <linux/platform_device.h>
>  
>  #include "internal.h"
> @@ -102,6 +103,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev)
>  	pdevinfo.res = resources;
>  	pdevinfo.num_res = count;
>  	pdevinfo.acpi_node.companion = adev;
> +	pdevinfo.dma_mask = DMA_BIT_MASK(32);
>  	pdev = platform_device_register_full(&pdevinfo);
>  	if (IS_ERR(pdev))
>  		dev_err(&adev->dev, "platform device creation failed: %ld\n",
> -- 
> 2.1.0

-- 
heikki

Re: [PATCH 2/4] ACPI / platform: provide default DMA mask

[Rafael J. Wysocki]

On Tuesday, September 23, 2014 03:17:12 PM Heikki Krogerus wrote:
> On Wed, Aug 20, 2014 at 02:55:26PM +0300, Heikki Krogerus wrote:
> > Most devices are configured for 32-bit DMA addresses.
> > Setting the mask to 32-bit here removes the need for the
> > drivers to do it separately.
> 
> Rafael, is this OK?

Fine by me, but it should go in via dwc3 I think.

> > Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> > ---
> >  drivers/acpi/acpi_platform.c | 2 ++
> >  1 file changed, 2 insertions(+)
> > 
> > diff --git a/drivers/acpi/acpi_platform.c b/drivers/acpi/acpi_platform.c
> > index 2bf9082..8d099e6 100644
> > --- a/drivers/acpi/acpi_platform.c
> > +++ b/drivers/acpi/acpi_platform.c
> > @@ -16,6 +16,7 @@
> >  #include <linux/err.h>
> >  #include <linux/kernel.h>
> >  #include <linux/module.h>
> > +#include <linux/dma-mapping.h>
> >  #include <linux/platform_device.h>
> >  
> >  #include "internal.h"
> > @@ -102,6 +103,7 @@ struct platform_device *acpi_create_platform_device(struct acpi_device *adev)
> >  	pdevinfo.res = resources;
> >  	pdevinfo.num_res = count;
> >  	pdevinfo.acpi_node.companion = adev;
> > +	pdevinfo.dma_mask = DMA_BIT_MASK(32);
> >  	pdev = platform_device_register_full(&pdevinfo);
> >  	if (IS_ERR(pdev))
> >  		dev_err(&adev->dev, "platform device creation failed: %ld\n",
> 
> 

-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.

Re: [PATCH 2/4] ACPI / platform: provide default DMA mask

[Felipe Balbi]

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

On Tue, Sep 23, 2014 at 04:52:01PM +0200, Rafael J. Wysocki wrote:
> On Tuesday, September 23, 2014 03:17:12 PM Heikki Krogerus wrote:
> > On Wed, Aug 20, 2014 at 02:55:26PM +0300, Heikki Krogerus wrote:
> > > Most devices are configured for 32-bit DMA addresses.
> > > Setting the mask to 32-bit here removes the need for the
> > > drivers to do it separately.
> > 
> > Rafael, is this OK?
> 
> Fine by me, but it should go in via dwc3 I think.

huh ? Seems like there's no direct dependency.

-- 
balbi

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

Re: [PATCH 2/4] ACPI / platform: provide default DMA mask

[Rafael J. Wysocki]

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

On Tuesday, September 23, 2014 09:52:21 AM Felipe Balbi wrote:
> On Tue, Sep 23, 2014 at 04:52:01PM +0200, Rafael J. Wysocki wrote:
> > On Tuesday, September 23, 2014 03:17:12 PM Heikki Krogerus wrote:
> > > On Wed, Aug 20, 2014 at 02:55:26PM +0300, Heikki Krogerus wrote:
> > > > Most devices are configured for 32-bit DMA addresses.
> > > > Setting the mask to 32-bit here removes the need for the
> > > > drivers to do it separately.
> > > 
> > > Rafael, is this OK?
> > 
> > Fine by me, but it should go in via dwc3 I think.
> 
> huh ? Seems like there's no direct dependency.

Well, it's part of a series where all of the other patches touch dwc3.
Doesn't anything in that series depend on this patch?

-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 2/4] ACPI / platform: provide default DMA mask

[Felipe Balbi]

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

On Tue, Sep 23, 2014 at 05:17:03PM +0200, Rafael J. Wysocki wrote:
> On Tuesday, September 23, 2014 09:52:21 AM Felipe Balbi wrote:
> > On Tue, Sep 23, 2014 at 04:52:01PM +0200, Rafael J. Wysocki wrote:
> > > On Tuesday, September 23, 2014 03:17:12 PM Heikki Krogerus wrote:
> > > > On Wed, Aug 20, 2014 at 02:55:26PM +0300, Heikki Krogerus wrote:
> > > > > Most devices are configured for 32-bit DMA addresses.
> > > > > Setting the mask to 32-bit here removes the need for the
> > > > > drivers to do it separately.
> > > > 
> > > > Rafael, is this OK?
> > > 
> > > Fine by me, but it should go in via dwc3 I think.
> > 
> > huh ? Seems like there's no direct dependency.
> 
> Well, it's part of a series where all of the other patches touch dwc3.
> Doesn't anything in that series depend on this patch?

dunno, I haven't received anything.

-- 
balbi

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

Re: [PATCH 2/4] ACPI / platform: provide default DMA mask

[Rafael J. Wysocki]

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

On Tuesday, September 23, 2014 10:29:45 AM Felipe Balbi wrote:
> On Tue, Sep 23, 2014 at 05:17:03PM +0200, Rafael J. Wysocki wrote:
> > On Tuesday, September 23, 2014 09:52:21 AM Felipe Balbi wrote:
> > > On Tue, Sep 23, 2014 at 04:52:01PM +0200, Rafael J. Wysocki wrote:
> > > > On Tuesday, September 23, 2014 03:17:12 PM Heikki Krogerus wrote:
> > > > > On Wed, Aug 20, 2014 at 02:55:26PM +0300, Heikki Krogerus wrote:
> > > > > > Most devices are configured for 32-bit DMA addresses.
> > > > > > Setting the mask to 32-bit here removes the need for the
> > > > > > drivers to do it separately.
> > > > > 
> > > > > Rafael, is this OK?
> > > > 
> > > > Fine by me, but it should go in via dwc3 I think.
> > > 
> > > huh ? Seems like there's no direct dependency.
> > 
> > Well, it's part of a series where all of the other patches touch dwc3.
> > Doesn't anything in that series depend on this patch?
> 
> dunno, I haven't received anything.

Hmm.

Heikki, can you please resend the series and CC all of it to Felipe?

Rafael

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

Re: [PATCH 2/4] ACPI / platform: provide default DMA mask

[Heikki Krogerus]

On Tue, Sep 23, 2014 at 06:05:36PM +0200, Rafael J. Wysocki wrote:
> On Tuesday, September 23, 2014 10:29:45 AM Felipe Balbi wrote:
> > On Tue, Sep 23, 2014 at 05:17:03PM +0200, Rafael J. Wysocki wrote:
> > > On Tuesday, September 23, 2014 09:52:21 AM Felipe Balbi wrote:
> > > > On Tue, Sep 23, 2014 at 04:52:01PM +0200, Rafael J. Wysocki wrote:
> > > > > On Tuesday, September 23, 2014 03:17:12 PM Heikki Krogerus wrote:
> > > > > > On Wed, Aug 20, 2014 at 02:55:26PM +0300, Heikki Krogerus wrote:
> > > > > > > Most devices are configured for 32-bit DMA addresses.
> > > > > > > Setting the mask to 32-bit here removes the need for the
> > > > > > > drivers to do it separately.
> > > > > > 
> > > > > > Rafael, is this OK?
> > > > > 
> > > > > Fine by me, but it should go in via dwc3 I think.
> > > > 
> > > > huh ? Seems like there's no direct dependency.
> > > 
> > > Well, it's part of a series where all of the other patches touch dwc3.
> > > Doesn't anything in that series depend on this patch?
> > 
> > dunno, I haven't received anything.
> 
> Hmm.
> 
> Heikki, can you please resend the series and CC all of it to Felipe?

The series was send "To" Felipe...

I'll resend.


Thanks,

-- 
heikki

[PATCH 3/4] usb: dwc3: core: only setting the dma_mask when needed

[Heikki Krogerus]

If the probe drivers have already set the dma_mask, not
replacing the value.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
 drivers/usb/dwc3/core.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index b769c1f..3f307f6 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -711,9 +711,11 @@ static int dwc3_probe(struct platform_device *pdev)
 	spin_lock_init(&dwc->lock);
 	platform_set_drvdata(pdev, dwc);
 
-	dev->dma_mask	= dev->parent->dma_mask;
-	dev->dma_parms	= dev->parent->dma_parms;
-	dma_set_coherent_mask(dev, dev->parent->coherent_dma_mask);
+	if (!dev->dma_mask) {
+		dev->dma_mask = dev->parent->dma_mask;
+		dev->dma_parms = dev->parent->dma_parms;
+		dma_set_coherent_mask(dev, dev->parent->coherent_dma_mask);
+	}
 
 	pm_runtime_enable(dev);
 	pm_runtime_get_sync(dev);
-- 
2.1.0

[PATCH 4/4] usb: dwc3: add ACPI support

[Heikki Krogerus]

Adding ACPI ID used on newer Intel SoCs.

Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
 drivers/usb/dwc3/core.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c
index 3f307f6..6b0dcdb 100644
--- a/drivers/usb/dwc3/core.c
+++ b/drivers/usb/dwc3/core.c
@@ -32,6 +32,7 @@
 #include <linux/delay.h>
 #include <linux/dma-mapping.h>
 #include <linux/of.h>
+#include <linux/acpi.h>
 
 #include <linux/usb/ch9.h>
 #include <linux/usb/gadget.h>
@@ -962,12 +963,21 @@ static const struct of_device_id of_dwc3_match[] = {
 MODULE_DEVICE_TABLE(of, of_dwc3_match);
 #endif
 
+#ifdef CONFIG_ACPI
+static const struct acpi_device_id dwc3_acpi_match[] = {
+	{ "808622B7", 0 },
+	{ },
+};
+MODULE_DEVICE_TABLE(acpi, dwc3_acpi_match);
+#endif
+
 static struct platform_driver dwc3_driver = {
 	.probe		= dwc3_probe,
 	.remove		= dwc3_remove,
 	.driver		= {
 		.name	= "dwc3",
 		.of_match_table	= of_match_ptr(of_dwc3_match),
+		.acpi_match_table = ACPI_PTR(dwc3_acpi_match),
 		.pm	= DWC3_PM_OPS,
 	},
 };
-- 
2.1.0