usb: dwc2: Gadget descriptor DMA and IOT

PATCH Superseded John Youn 7 participants 11 messages Nov 7, 2016 – Nov 14, 2016 3 messages not in the archive

Subsystems (5)

Device tree bindings USB Arm Rockchip DesignWare USB2 DRD IP driver +1 more subsystems

lore

Share & tools

lore

John Youn

author

2016-11-07 22:39 UTC #0 lore raw

cover usb: dwc2: Gadget descriptor DMA and IOT

This series implements gadget-side descriptor DMA for the DWC_hsotg controller.

It also includes support for DWC USB IOT controllers which use the descriptor DMA mode of operation exclusively. These are two new device-only USB controller IPs based on DWC_hsotg.

Tested on HAPS platform with:
* HSOTG IP version 3.30a
* FS/LS IOT IP version 1.00a
* HS IOT IP version 1.00a

This series should be applied on top of:
http://marc.info/?l=linux-usb&m=147822095118860&w=2

Regards,
John

John Youn (2):
usb: dwc2: Deprecate g-use-dma binding
usb: dwc2: Enable gadget DDMA by default for HAPS

Vahram Aharonyan (25):
usb: dwc2: Update DMA descriptor structure
usb: dwc2: gadget: Add descriptor DMA binding
usb: dwc2: gadget: Add DMA descriptor status quadlet fields
usb: dwc2: gadget: Enable BNA interrupt in descriptor DMA mode
usb: dwc2: gadget: Add DMA descriptor chains for EP 0
usb: dwc2: host: Rename MAX_DMA_DESC_SIZE to HOST_DMA_NBYTES_LIMIT
usb: dwc2: gadget: Transfer length limit checking for DDMA
usb: dwc2: gadget: Add DDMA chain pointers to dwc2_hsotg_ep structure
usb: dwc2: gadget: Add DDMA chain fill and parse functions
usb: dwc2: gadget: EP 0 specific DDMA programming
usb: dwc2: gadget: DDMA transfer start and complete
usb: dwc2: gadget: Fixes for StsPhseRcvd interrupt
usb: dwc2: gadget: Start DDMA IN status phase in StsPhseRcvd handler
usb: dwc2: gadget: Enable descriptor DMA mode
usb: dwc2: gadget: Add DDMA isoc related fields to dwc2_hsotg_ep
usb: dwc2: gadget: Fill isoc descriptor and start transfer in DDMA
usb: dwc2: gadget: Add completions for DDMA isoc transfers
usb: dwc2: gadget: In DDMA keep incompISOOUT and incompISOIN masked
usb: dwc2: gadget: Add start and complete calls for DDMA ISOC
usb: dwc2: gadget: Adjust ISOC OUT request's actual len for DDMA
usb: dwc2: gadget: Adjustments in debug prints
usb: dwc2: gadget: For DDMA parse setup only after SetUp interrupt
usb: dwc2: gadget: Correct dwc2_hsotg_ep_stop_xfr() function
usb: dwc2: gadget: Disable enabled HW endpoint in
dwc2_hsotg_ep_disable
usb: dwc2: Add support of dedicated full-speed PHY interface

Vardan Mikayelyan (3):
usb: dwc2: gadget: Add IOT device IDs, configure core accordingly
usb: dwc2: gadget: Program ep0_mps for LS
usb: dwc2: gadget: Add new core parameter for low speed

 Documentation/devicetree/bindings/usb/dwc2.txt |   6 +-
 arch/arm/boot/dts/rk3036.dtsi                  |   2 +-
 arch/arm/boot/dts/rk3288.dtsi                  |   2 +-
 arch/arm/boot/dts/rk3xxx.dtsi                  |   2 +-
 arch/arm64/boot/dts/hisilicon/hi6220.dtsi      |   2 +-
 arch/arm64/boot/dts/rockchip/rk3368.dtsi       |   2 +-
 drivers/usb/dwc2/core.h                        |  48 ++
 drivers/usb/dwc2/gadget.c                      | 978 ++++++++++++++++++++++---
 drivers/usb/dwc2/hcd.c                         |  12 +-
 drivers/usb/dwc2/hcd.h                         |   2 +-
 drivers/usb/dwc2/hcd_ddma.c                    |  52 +-
 drivers/usb/dwc2/hw.h                          |  48 +-
 drivers/usb/dwc2/params.c                      |  42 +-
 drivers/usb/dwc2/pci.c                         |   3 +-
 14 files changed, 1039 insertions(+), 162 deletions(-)

Signature · 1 line

2.10.0

John Youn

author

2016-11-07 22:39 UTC #1 lore raw

PATCH 1/30 usb: dwc2: Deprecate g-use-dma binding

Add a vendor prefix and make the name more consistent by renaming it to "snps,gadget-dma-enable".

Signed-off-by John Youn <[email protected]>

---
 Documentation/devicetree/bindings/usb/dwc2.txt | 5 ++++-
 arch/arm/boot/dts/rk3036.dtsi                  | 2 +-
 arch/arm/boot/dts/rk3288.dtsi                  | 2 +-
 arch/arm/boot/dts/rk3xxx.dtsi                  | 2 +-
 arch/arm64/boot/dts/hisilicon/hi6220.dtsi      | 2 +-
 arch/arm64/boot/dts/rockchip/rk3368.dtsi       | 2 +-
 drivers/usb/dwc2/params.c                      | 9 ++++++++-
 drivers/usb/dwc2/pci.c                         | 2 +-
 8 files changed, 18 insertions(+), 8 deletions(-)

Documentation/devicetree/bindings/usb/dwc2.txt +4 -1

index 9472111..389a461 100644
@@ -26,11 +26,14 @@ Refer to phy/phy-bindings.txt for generic phy consumer properties
 - dr_mode: shall be one of "host", "peripheral" and "otg"
   Refer to usb/generic.txt
 - snps,host-dma-disable: disable host DMA mode.
-- g-use-dma: enable dma usage in gadget driver.
+- snps,gadget-dma-enable: enable gadget DMA mode.
 - g-rx-fifo-size: size of rx fifo size in gadget mode.
 - g-np-tx-fifo-size: size of non-periodic tx fifo size in gadget mode.
 - g-tx-fifo-size: size of periodic tx fifo per endpoint (except ep0) in gadget mode.
 
+Deprecated properties:
+- g-use-dma: Use "snps,gadget-dma-enable" instead.
+
 Example:
 
         usb at 101c0000 {

arch/arm/boot/dts/rk3036.dtsi +1 -1

index a935523..2604d2d 100644
@@ -204,7 +204,7 @@
 		g-np-tx-fifo-size = <16>;
 		g-rx-fifo-size = <275>;
 		g-tx-fifo-size = <256 128 128 64 64 32>;
-		g-use-dma;
+		snps,gadget-dma-enable;
 		status = "disabled";
 	};

arch/arm/boot/dts/rk3288.dtsi +1 -1

index 17ec2e2..c0db4ae 100644
@@ -596,7 +596,7 @@
 		g-np-tx-fifo-size = <16>;
 		g-rx-fifo-size = <275>;
 		g-tx-fifo-size = <256 128 128 64 64 32>;
-		g-use-dma;
+		snps,gadget-dma-enable;
 		phys = <&usbphy0>;
 		phy-names = "usb2-phy";
 		status = "disabled";

arch/arm/boot/dts/rk3xxx.dtsi +1 -1

index e15beb3..c96d622 100644
@@ -181,7 +181,7 @@
 		g-np-tx-fifo-size = <16>;
 		g-rx-fifo-size = <275>;
 		g-tx-fifo-size = <256 128 128 64 64 32>;
-		g-use-dma;
+		snps,gadget-dma-enable;
 		phys = <&usbphy0>;
 		phy-names = "usb2-phy";
 		status = "disabled";

arch/arm64/boot/dts/hisilicon/hi6220.dtsi +1 -1

index 17839db..fe441f7 100644
@@ -747,7 +747,7 @@
 			clocks = <&sys_ctrl HI6220_USBOTG_HCLK>;
 			clock-names = "otg";
 			dr_mode = "otg";
-			g-use-dma;
+			snps,gadget-dma-enable;
 			g-rx-fifo-size = <512>;
 			g-np-tx-fifo-size = <128>;
 			g-tx-fifo-size = <128 128 128 128 128 128>;

arch/arm64/boot/dts/rockchip/rk3368.dtsi +1 -1

index 0fcb214..6b44544 100644
@@ -537,7 +537,7 @@
 		g-np-tx-fifo-size = <16>;
 		g-rx-fifo-size = <275>;
 		g-tx-fifo-size = <256 128 128 64 64 32>;
-		g-use-dma;
+		snps,gadget-dma-enable;
 		status = "disabled";
 	};

drivers/usb/dwc2/params.c +8 -1

index 2eb79e8..aeece91 100644
@@ -1161,10 +1161,17 @@ static void dwc2_set_parameters(struct dwc2_hsotg *hsotg,
 	    (hsotg->dr_mode == USB_DR_MODE_OTG)) {
 		dev_dbg(hsotg->dev, "Setting peripheral device properties\n");
 
-		dwc2_set_param_bool(hsotg, &p->g_dma, true, "g-use-dma",
+		dwc2_set_param_bool(hsotg, &p->g_dma, true,
+				    "snps,gadget-dma-enable",
 				    false, false,
 				    dma_capable);
 
+		/* Check the deprecated property. */
+		if (!p->g_dma)
+			dwc2_set_param_bool(hsotg, &p->g_dma, true, "g-use-dma",
+					    false, false,
+					    dma_capable);
+
 		/*
 		 * The values for g_rx_fifo_size (2048) and
 		 * g_np_tx_fifo_size (1024) come from the legacy s3c

drivers/usb/dwc2/pci.c +1 -1

index b3f3b58..46a9d2b 100644
@@ -67,7 +67,7 @@ static int dwc2_pci_quirks(struct pci_dev *pdev, struct platform_device *dwc2)
 	if (pdev->vendor == PCI_VENDOR_ID_SYNOPSYS &&
 	    pdev->device == PCI_PRODUCT_ID_HAPS_HSOTG) {
 		struct property_entry properties[] = {
-			PROPERTY_ENTRY_BOOL("g-use-dma"),
+			PROPERTY_ENTRY_BOOL("snps,gadget-dma-enable"),
 			{ },
 		};

Signature · 1 line

2.10.0

Felipe Balbi

2016-11-08 09:12 UTC #2 lore raw

PATCH 1/30 usb: dwc2: Deprecate g-use-dma binding

Hi,

Quoted 20 lines · John Youn

Add a vendor prefix and make the name more consistent by renaming it to "snps,gadget-dma-enable".

Signed-off-by John Youn <[email protected]>

---
 Documentation/devicetree/bindings/usb/dwc2.txt | 5 ++++-
 arch/arm/boot/dts/rk3036.dtsi                  | 2 +-
 arch/arm/boot/dts/rk3288.dtsi                  | 2 +-
 arch/arm/boot/dts/rk3xxx.dtsi                  | 2 +-
 arch/arm64/boot/dts/hisilicon/hi6220.dtsi      | 2 +-
 arch/arm64/boot/dts/rockchip/rk3368.dtsi       | 2 +-
 drivers/usb/dwc2/params.c                      | 9 ++++++++-
 drivers/usb/dwc2/pci.c                         | 2 +-
 8 files changed, 18 insertions(+), 8 deletions(-)

Documentation/devicetree/bindings/usb/dwc2.txt +0 -0

index 9472111..389a461 100644

Documentation/devicetree/bindings/usb/dwc2.txt Refer to phy/phy-bindings.txt for generic phy consumer properties · line 29

Quoted 5 lines

Documentation/devicetree/bindings/usb/dwc2.txt +1 -1

@@ -26,11 +26,14 @@ Refer to phy/phy-bindings.txt for generic phy consumer properties
 - dr_mode: shall be one of "host", "peripheral" and "otg"
   Refer to usb/generic.txt
 - snps,host-dma-disable: disable host DMA mode.
-- g-use-dma: enable dma usage in gadget driver.
+- snps,gadget-dma-enable: enable gadget DMA mode.

I don't see why you even have this binding. Looking through the code, you have:

#define GHWCFG2_SLAVE_ONLY_ARCH 0
#define GHWCFG2_EXT_DMA_ARCH 1
#define GHWCFG2_INT_DMA_ARCH 2

void dwc2_set_param_dma_enable(struct dwc2_hsotg *hsotg, int val)

{
	int valid = 1;

	if (val > 0 && hsotg->hw_params.arch == GHWCFG2_SLAVE_ONLY_ARCH)
		valid = 0;
	if (val < 0)
		valid = 0;

	if (!valid) {
		if (val >= 0)
			dev_err(hsotg->dev,
				"%d invalid for dma_enable parameter. Check HW configuration.\n",
				val);
		val = hsotg->hw_params.arch != GHWCFG2_SLAVE_ONLY_ARCH;
		dev_dbg(hsotg->dev, "Setting dma_enable to %d\n", val);
	}

	hsotg->core_params->dma_enable = val;
}

which seems to hint that DMA support is discoverable. If there is DMA, why would disable it?

Signature · 8 lines

balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 800 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20161108/28908c8d/attachment-0001.sig>

John Youn

2016-11-08 17:48 UTC #3 lore raw

PATCH 1/30 usb: dwc2: Deprecate g-use-dma binding

Quoted 58 lines · Felipe Balbi

Hi,
Quoted 20 lines · John Youn
Add a vendor prefix and make the name more consistent by renaming it to "snps,gadget-dma-enable".
Signed-off-by John Youn <[email protected]>
---
 Documentation/devicetree/bindings/usb/dwc2.txt | 5 ++++-
 arch/arm/boot/dts/rk3036.dtsi                  | 2 +-
 arch/arm/boot/dts/rk3288.dtsi                  | 2 +-
 arch/arm/boot/dts/rk3xxx.dtsi                  | 2 +-
 arch/arm64/boot/dts/hisilicon/hi6220.dtsi      | 2 +-
 arch/arm64/boot/dts/rockchip/rk3368.dtsi       | 2 +-
 drivers/usb/dwc2/params.c                      | 9 ++++++++-
 drivers/usb/dwc2/pci.c                         | 2 +-
 8 files changed, 18 insertions(+), 8 deletions(-)
Documentation/devicetree/bindings/usb/dwc2.txt +0 -0
index 9472111..389a461 100644
Documentation/devicetree/bindings/usb/dwc2.txt Refer to phy/phy-bindings.txt for generic phy consumer properties · line 29
Quoted 5 lines
Documentation/devicetree/bindings/usb/dwc2.txt +1 -1
@@ -26,11 +26,14 @@ Refer to phy/phy-bindings.txt for generic phy consumer properties
 - dr_mode: shall be one of "host", "peripheral" and "otg"
   Refer to usb/generic.txt
 - snps,host-dma-disable: disable host DMA mode.
-- g-use-dma: enable dma usage in gadget driver.
+- snps,gadget-dma-enable: enable gadget DMA mode.
I don't see why you even have this binding. Looking through the code, you have:
#define GHWCFG2_SLAVE_ONLY_ARCH 0
#define GHWCFG2_EXT_DMA_ARCH 1
#define GHWCFG2_INT_DMA_ARCH 2
void dwc2_set_param_dma_enable(struct dwc2_hsotg *hsotg, int val)
{
	int valid = 1;

	if (val > 0 && hsotg->hw_params.arch == GHWCFG2_SLAVE_ONLY_ARCH)
		valid = 0;
	if (val < 0)
		valid = 0;

	if (!valid) {
		if (val >= 0)
			dev_err(hsotg->dev,
				"%d invalid for dma_enable parameter. Check HW configuration.\n",
				val);
		val = hsotg->hw_params.arch != GHWCFG2_SLAVE_ONLY_ARCH;
		dev_dbg(hsotg->dev, "Setting dma_enable to %d\n", val);
	}

	hsotg->core_params->dma_enable = val;
}

Quoted 3 lines

which seems to hint that DMA support is discoverable. If there is DMA, why would disable it?

Yes that's the case and I would prefer to make it discoverable and enabled by default.

But the legacy behavior has always been like this because DMA was never fully implemented in the gadget driver and it was an opt-in feature. Periodic support was only added recently.

What do you think about enabling it by default now? I think most platforms already use DMA.

We would still need a "disable" binding for IP validation purposes at least.

Regards,
John

Felipe Balbi

2016-11-09 07:53 UTC #4 lore raw

PATCH 1/30 usb: dwc2: Deprecate g-use-dma binding

Hi,

Quoted 63 lines · John Youn

Quoted 58 lines · Felipe Balbi
Hi,
Quoted 20 lines · John Youn
Add a vendor prefix and make the name more consistent by renaming it to "snps,gadget-dma-enable".
Signed-off-by John Youn <[email protected]>
---
 Documentation/devicetree/bindings/usb/dwc2.txt | 5 ++++-
 arch/arm/boot/dts/rk3036.dtsi                  | 2 +-
 arch/arm/boot/dts/rk3288.dtsi                  | 2 +-
 arch/arm/boot/dts/rk3xxx.dtsi                  | 2 +-
 arch/arm64/boot/dts/hisilicon/hi6220.dtsi      | 2 +-
 arch/arm64/boot/dts/rockchip/rk3368.dtsi       | 2 +-
 drivers/usb/dwc2/params.c                      | 9 ++++++++-
 drivers/usb/dwc2/pci.c                         | 2 +-
 8 files changed, 18 insertions(+), 8 deletions(-)
Documentation/devicetree/bindings/usb/dwc2.txt +0 -0
index 9472111..389a461 100644
Documentation/devicetree/bindings/usb/dwc2.txt Refer to phy/phy-bindings.txt for generic phy consumer properties · line 29
Quoted 5 lines
Documentation/devicetree/bindings/usb/dwc2.txt +1 -1
@@ -26,11 +26,14 @@ Refer to phy/phy-bindings.txt for generic phy consumer properties
 - dr_mode: shall be one of "host", "peripheral" and "otg"
   Refer to usb/generic.txt
 - snps,host-dma-disable: disable host DMA mode.
-- g-use-dma: enable dma usage in gadget driver.
+- snps,gadget-dma-enable: enable gadget DMA mode.
I don't see why you even have this binding. Looking through the code, you have:
#define GHWCFG2_SLAVE_ONLY_ARCH 0
#define GHWCFG2_EXT_DMA_ARCH 1
#define GHWCFG2_INT_DMA_ARCH 2
void dwc2_set_param_dma_enable(struct dwc2_hsotg *hsotg, int val)
{
	int valid = 1;

	if (val > 0 && hsotg->hw_params.arch == GHWCFG2_SLAVE_ONLY_ARCH)
		valid = 0;
	if (val < 0)
		valid = 0;

	if (!valid) {
		if (val >= 0)
			dev_err(hsotg->dev,
				"%d invalid for dma_enable parameter. Check HW configuration.\n",
				val);
		val = hsotg->hw_params.arch != GHWCFG2_SLAVE_ONLY_ARCH;
		dev_dbg(hsotg->dev, "Setting dma_enable to %d\n", val);
	}

	hsotg->core_params->dma_enable = val;
}
Quoted 3 lines
which seems to hint that DMA support is discoverable. If there is DMA, why would disable it?

Quoted 6 lines

Yes that's the case and I would prefer to make it discoverable and enabled by default.
But the legacy behavior has always been like this because DMA was never fully implemented in the gadget driver and it was an opt-in feature. Periodic support was only added recently.

legacy behavior can be changed if another 'policy' makes more sense. IMHO, whatever can be discovered in runtime, should be enabled by default. That way, we force people to use it and find bugs in certain features.

Quoted 2 lines

What do you think about enabling it by default now? I think most platforms already use DMA.

I think it should be discovered. Drop all these "*-use-dma" bindings because they're not needed if you can probe a register to answer the same question.

Quoted 2 lines

We would still need a "disable" binding for IP validation purposes at least.

Yeah, could be a quirk.

Signature · 8 lines

balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 800 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20161109/0691c4a0/attachment.sig>

John Youn

2016-11-09 18:47 UTC #5 lore raw

PATCH 1/30 usb: dwc2: Deprecate g-use-dma binding

Quoted 70 lines · Felipe Balbi

Hi,
Quoted 66 lines · John Youn
Quoted 58 lines · Felipe Balbi
Hi,
Quoted 20 lines · John Youn
Add a vendor prefix and make the name more consistent by renaming it to "snps,gadget-dma-enable".
Signed-off-by John Youn <[email protected]>
---
 Documentation/devicetree/bindings/usb/dwc2.txt | 5 ++++-
 arch/arm/boot/dts/rk3036.dtsi                  | 2 +-
 arch/arm/boot/dts/rk3288.dtsi                  | 2 +-
 arch/arm/boot/dts/rk3xxx.dtsi                  | 2 +-
 arch/arm64/boot/dts/hisilicon/hi6220.dtsi      | 2 +-
 arch/arm64/boot/dts/rockchip/rk3368.dtsi       | 2 +-
 drivers/usb/dwc2/params.c                      | 9 ++++++++-
 drivers/usb/dwc2/pci.c                         | 2 +-
 8 files changed, 18 insertions(+), 8 deletions(-)
Documentation/devicetree/bindings/usb/dwc2.txt +0 -0
index 9472111..389a461 100644
Documentation/devicetree/bindings/usb/dwc2.txt Refer to phy/phy-bindings.txt for generic phy consumer properties · line 29
Quoted 5 lines
Documentation/devicetree/bindings/usb/dwc2.txt +1 -1
@@ -26,11 +26,14 @@ Refer to phy/phy-bindings.txt for generic phy consumer properties
 - dr_mode: shall be one of "host", "peripheral" and "otg"
   Refer to usb/generic.txt
 - snps,host-dma-disable: disable host DMA mode.
-- g-use-dma: enable dma usage in gadget driver.
+- snps,gadget-dma-enable: enable gadget DMA mode.
I don't see why you even have this binding. Looking through the code, you have:
#define GHWCFG2_SLAVE_ONLY_ARCH 0
#define GHWCFG2_EXT_DMA_ARCH 1
#define GHWCFG2_INT_DMA_ARCH 2
void dwc2_set_param_dma_enable(struct dwc2_hsotg *hsotg, int val)
{
	int valid = 1;

	if (val > 0 && hsotg->hw_params.arch == GHWCFG2_SLAVE_ONLY_ARCH)
		valid = 0;
	if (val < 0)
		valid = 0;

	if (!valid) {
		if (val >= 0)
			dev_err(hsotg->dev,
				"%d invalid for dma_enable parameter. Check HW configuration.\n",
				val);
		val = hsotg->hw_params.arch != GHWCFG2_SLAVE_ONLY_ARCH;
		dev_dbg(hsotg->dev, "Setting dma_enable to %d\n", val);
	}

	hsotg->core_params->dma_enable = val;
}
Quoted 3 lines
which seems to hint that DMA support is discoverable. If there is DMA, why would disable it?
Yes that's the case and I would prefer to make it discoverable and enabled by default.

Quoted 8 lines

Quoted 3 lines
But the legacy behavior has always been like this because DMA was never fully implemented in the gadget driver and it was an opt-in feature. Periodic support was only added recently.
legacy behavior can be changed if another 'policy' makes more sense. IMHO, whatever can be discovered in runtime, should be enabled by default. That way, we force people to use it and find bugs in certain features.

Sounds good to me. I'll make the changes.

Regards,
John

Rob Herring

maintainer

2016-11-14 17:07 UTC #6 lore raw

PATCH 1/30 usb: dwc2: Deprecate g-use-dma binding

In reply to John Youn

Quoted 70 lines · John Youn

Quoted 58 lines · Felipe Balbi
Hi,
Quoted 20 lines · John Youn
Add a vendor prefix and make the name more consistent by renaming it to "snps,gadget-dma-enable".
Signed-off-by John Youn <[email protected]>
---
 Documentation/devicetree/bindings/usb/dwc2.txt | 5 ++++-
 arch/arm/boot/dts/rk3036.dtsi                  | 2 +-
 arch/arm/boot/dts/rk3288.dtsi                  | 2 +-
 arch/arm/boot/dts/rk3xxx.dtsi                  | 2 +-
 arch/arm64/boot/dts/hisilicon/hi6220.dtsi      | 2 +-
 arch/arm64/boot/dts/rockchip/rk3368.dtsi       | 2 +-
 drivers/usb/dwc2/params.c                      | 9 ++++++++-
 drivers/usb/dwc2/pci.c                         | 2 +-
 8 files changed, 18 insertions(+), 8 deletions(-)
Documentation/devicetree/bindings/usb/dwc2.txt +0 -0
index 9472111..389a461 100644
Documentation/devicetree/bindings/usb/dwc2.txt Refer to phy/phy-bindings.txt for generic phy consumer properties · line 29
Quoted 5 lines
Documentation/devicetree/bindings/usb/dwc2.txt +1 -1
@@ -26,11 +26,14 @@ Refer to phy/phy-bindings.txt for generic phy consumer properties
 - dr_mode: shall be one of "host", "peripheral" and "otg"
   Refer to usb/generic.txt
 - snps,host-dma-disable: disable host DMA mode.
-- g-use-dma: enable dma usage in gadget driver.
+- snps,gadget-dma-enable: enable gadget DMA mode.
I don't see why you even have this binding. Looking through the code, you have:
#define GHWCFG2_SLAVE_ONLY_ARCH 0
#define GHWCFG2_EXT_DMA_ARCH 1
#define GHWCFG2_INT_DMA_ARCH 2
void dwc2_set_param_dma_enable(struct dwc2_hsotg *hsotg, int val)
{
	int valid = 1;

	if (val > 0 && hsotg->hw_params.arch == GHWCFG2_SLAVE_ONLY_ARCH)
		valid = 0;
	if (val < 0)
		valid = 0;

	if (!valid) {
		if (val >= 0)
			dev_err(hsotg->dev,
				"%d invalid for dma_enable parameter. Check HW configuration.\n",
				val);
		val = hsotg->hw_params.arch != GHWCFG2_SLAVE_ONLY_ARCH;
		dev_dbg(hsotg->dev, "Setting dma_enable to %d\n", val);
	}

	hsotg->core_params->dma_enable = val;
}
Quoted 3 lines
which seems to hint that DMA support is discoverable. If there is DMA, why would disable it?
Yes that's the case and I would prefer to make it discoverable and enabled by default.
But the legacy behavior has always been like this because DMA was never fully implemented in the gadget driver and it was an opt-in feature. Periodic support was only added recently.

Quoted 5 lines

What do you think about enabling it by default now? I think most platforms already use DMA.
We would still need a "disable" binding for IP validation purposes at least.

You can hack up your kernel for that. You may need a disable for broken h/w perhaps.

Rob

A message that is not in the archive (sent off-list or not yet received): cover.1478558343.git.johnyoun-HKixBCOQz3hWk0Htik3J/[email protected]

John Youn

2016-11-07 22:39 UTC #8 lore raw

PATCH 3/30 usb: dwc2: gadget: Add descriptor DMA binding

From: Vahram Aharonyan <vahrama-HKixBCOQz3hWk0Htik3J/[email protected]>

Add the devicetree binding to enable descriptor DMA and read it in to the corresponding parameter during probe.

Signed-off-by Vahram Aharonyan <vahrama-HKixBCOQz3hWk0Htik3J/[email protected]>

Signed-off-by John Youn <johnyoun-HKixBCOQz3hWk0Htik3J/[email protected]>

---
 Documentation/devicetree/bindings/usb/dwc2.txt |  1 +
 drivers/usb/dwc2/core.h                        |  4 ++++
 drivers/usb/dwc2/gadget.c                      | 11 +++++++++++
 drivers/usb/dwc2/params.c                      |  4 ++++
 4 files changed, 20 insertions(+)

Documentation/devicetree/bindings/usb/dwc2.txt +1 -0

index 389a461..1db9c37 100644
@@ -27,6 +27,7 @@ Refer to phy/phy-bindings.txt for generic phy consumer properties
   Refer to usb/generic.txt
 - snps,host-dma-disable: disable host DMA mode.
 - snps,gadget-dma-enable: enable gadget DMA mode.
+- snps,gadget-dma-desc-enable: enable gadget DMA descriptor mode.
 - g-rx-fifo-size: size of rx fifo size in gadget mode.
 - g-np-tx-fifo-size: size of non-periodic tx fifo size in gadget mode.
 - g-tx-fifo-size: size of periodic tx fifo per endpoint (except ep0) in gadget mode.

drivers/usb/dwc2/core.h +4 -0

index a1075ad..322ffe0 100644
@@ -421,6 +421,9 @@ enum dwc2_ep0_state {
  * @g_dma:              If true, enables dma usage on the device. This
  *                      setting is not auto-detected. It must be
  *                      explicitly enabled (default: false).
+ * @g_dma_desc:         If true, enables descriptor DMA. this
+ *                      setting is not auto-detected. It must be
+ *                      explicitly enabled (default: false).
  * @g_rx_fifo_size:	The periodic rx fifo size for the device, in
  *			DWORDS from 16-32768 (default: 2048 if
  *			possible, otherwise autodetect).

@@ -500,6 +503,7 @@ struct dwc2_core_params {
 
 	/* Gadget parameters */
 	bool g_dma;
+	bool g_dma_desc;
 	u16 g_rx_fifo_size;
 	u16 g_np_tx_fifo_size;
 	u32 g_tx_fifo_size[MAX_EPS_CHANNELS];

drivers/usb/dwc2/gadget.c +11 -0

index 1ba0bfc..4013518 100644
@@ -96,6 +96,17 @@ static inline bool using_dma(struct dwc2_hsotg *hsotg)
 	return hsotg->params.g_dma;
 }
 
+/*
+ * using_desc_dma - return the descriptor DMA status of the driver.
+ * @hsotg: The driver state.
+ *
+ * Return true if we're using descriptor DMA.
+ */
+static inline bool using_desc_dma(struct dwc2_hsotg *hsotg)
+{
+	return hsotg->params.g_dma_desc;
+}
+
 /**
  * dwc2_gadget_incr_frame_num - Increments the targeted frame number.
  * @hs_ep: The endpoint

drivers/usb/dwc2/params.c +4 -0

index aeece91..244ac0b 100644
@@ -1172,6 +1172,10 @@ static void dwc2_set_parameters(struct dwc2_hsotg *hsotg,
 					    false, false,
 					    dma_capable);
 
+		dwc2_set_param_bool(hsotg, &p->g_dma_desc, true,
+				    "snps,gadget-dma-desc-enable",
+				    false, false, !!hw->dma_desc_enable);
+
 		/*
 		 * The values for g_rx_fifo_size (2048) and
 		 * g_np_tx_fifo_size (1024) come from the legacy s3c

Signature · 6 lines

2.10.0

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): e0d302ebcbad32242da84894c173b743b9199f71.1478558343.git.johnyoun-HKixBCOQz3hWk0Htik3J/[email protected]

Felipe Balbi

2016-11-08 09:14 UTC #10 lore raw

Re: [PATCH 03/30] usb: dwc2: gadget: Add descriptor DMA binding

Quoted 19 lines · John Youn

From: Vahram Aharonyan <vahrama-HKixBCOQz3hWk0Htik3J/[email protected]>
Add the devicetree binding to enable descriptor DMA and read it in to the corresponding parameter during probe.
Signed-off-by Vahram Aharonyan <vahrama-HKixBCOQz3hWk0Htik3J/[email protected]>
Signed-off-by John Youn <johnyoun-HKixBCOQz3hWk0Htik3J/[email protected]>
---
 Documentation/devicetree/bindings/usb/dwc2.txt |  1 +
 drivers/usb/dwc2/core.h                        |  4 ++++
 drivers/usb/dwc2/gadget.c                      | 11 +++++++++++
 drivers/usb/dwc2/params.c                      |  4 ++++
 4 files changed, 20 insertions(+)
Documentation/devicetree/bindings/usb/dwc2.txt +0 -0
index 389a461..1db9c37 100644

Documentation/devicetree/bindings/usb/dwc2.txt Refer to phy/phy-bindings.txt for generic phy consumer properties · line 30

Quoted 4 lines

Documentation/devicetree/bindings/usb/dwc2.txt +1 -0

@@ -27,6 +27,7 @@ Refer to phy/phy-bindings.txt for generic phy consumer properties
   Refer to usb/generic.txt
 - snps,host-dma-disable: disable host DMA mode.
 - snps,gadget-dma-enable: enable gadget DMA mode.
+- snps,gadget-dma-desc-enable: enable gadget DMA descriptor mode.

seems to be discoverable as well:

#define GHWCFG4_DESC_DMA_DYN (1 << 31)
#define GHWCFG4_DESC_DMA (1 << 30)

care to comment?

Signature · 1 line

balbi

A message that is not in the archive (sent off-list or not yet received): 87r36mib8z.fsf-VuQAYsv1563Yd54FQh9/[email protected]

John Youn

2016-11-08 22:32 UTC #12 lore raw

Re: [PATCH 03/30] usb: dwc2: gadget: Add descriptor DMA binding

Quoted 28 lines · Felipe Balbi

Quoted 19 lines · John Youn
From: Vahram Aharonyan <vahrama-HKixBCOQz3hWk0Htik3J/[email protected]>
Add the devicetree binding to enable descriptor DMA and read it in to the corresponding parameter during probe.
Signed-off-by Vahram Aharonyan <vahrama-HKixBCOQz3hWk0Htik3J/[email protected]>
Signed-off-by John Youn <johnyoun-HKixBCOQz3hWk0Htik3J/[email protected]>
---
 Documentation/devicetree/bindings/usb/dwc2.txt |  1 +
 drivers/usb/dwc2/core.h                        |  4 ++++
 drivers/usb/dwc2/gadget.c                      | 11 +++++++++++
 drivers/usb/dwc2/params.c                      |  4 ++++
 4 files changed, 20 insertions(+)
Documentation/devicetree/bindings/usb/dwc2.txt +0 -0
index 389a461..1db9c37 100644
Documentation/devicetree/bindings/usb/dwc2.txt Refer to phy/phy-bindings.txt for generic phy consumer properties · line 30
Quoted 4 lines
Documentation/devicetree/bindings/usb/dwc2.txt +1 -0
@@ -27,6 +27,7 @@ Refer to phy/phy-bindings.txt for generic phy consumer properties
   Refer to usb/generic.txt
 - snps,host-dma-disable: disable host DMA mode.
 - snps,gadget-dma-enable: enable gadget DMA mode.
+- snps,gadget-dma-desc-enable: enable gadget DMA descriptor mode.
seems to be discoverable as well:

Quoted 5 lines

#define GHWCFG4_DESC_DMA_DYN (1 << 31)
#define GHWCFG4_DESC_DMA (1 << 30)
care to comment?

This is just following patch 1/30 for consistency.

We can make it discoverable and set automatically as well.

John

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

John Youn

2016-11-07 22:39 UTC #13 lore raw

PATCH 3/30 usb: dwc2: gadget: Add descriptor DMA binding

In reply to a message not in the archive

From: Vahram Aharonyan <vahrama-HKixBCOQz3hWk0Htik3J/[email protected]>

Add the devicetree binding to enable descriptor DMA and read it in to the corresponding parameter during probe.

Signed-off-by Vahram Aharonyan <vahrama-HKixBCOQz3hWk0Htik3J/[email protected]>

Signed-off-by John Youn <johnyoun-HKixBCOQz3hWk0Htik3J/[email protected]>

---
 Documentation/devicetree/bindings/usb/dwc2.txt |  1 +
 drivers/usb/dwc2/core.h                        |  4 ++++
 drivers/usb/dwc2/gadget.c                      | 11 +++++++++++
 drivers/usb/dwc2/params.c                      |  4 ++++
 4 files changed, 20 insertions(+)

Documentation/devicetree/bindings/usb/dwc2.txt +1 -0

index 389a461..1db9c37 100644
@@ -27,6 +27,7 @@ Refer to phy/phy-bindings.txt for generic phy consumer properties
   Refer to usb/generic.txt
 - snps,host-dma-disable: disable host DMA mode.
 - snps,gadget-dma-enable: enable gadget DMA mode.
+- snps,gadget-dma-desc-enable: enable gadget DMA descriptor mode.
 - g-rx-fifo-size: size of rx fifo size in gadget mode.
 - g-np-tx-fifo-size: size of non-periodic tx fifo size in gadget mode.
 - g-tx-fifo-size: size of periodic tx fifo per endpoint (except ep0) in gadget mode.

drivers/usb/dwc2/core.h +4 -0

index a1075ad..322ffe0 100644
@@ -421,6 +421,9 @@ enum dwc2_ep0_state {
  * @g_dma:              If true, enables dma usage on the device. This
  *                      setting is not auto-detected. It must be
  *                      explicitly enabled (default: false).
+ * @g_dma_desc:         If true, enables descriptor DMA. this
+ *                      setting is not auto-detected. It must be
+ *                      explicitly enabled (default: false).
  * @g_rx_fifo_size:	The periodic rx fifo size for the device, in
  *			DWORDS from 16-32768 (default: 2048 if
  *			possible, otherwise autodetect).

@@ -500,6 +503,7 @@ struct dwc2_core_params {
 
 	/* Gadget parameters */
 	bool g_dma;
+	bool g_dma_desc;
 	u16 g_rx_fifo_size;
 	u16 g_np_tx_fifo_size;
 	u32 g_tx_fifo_size[MAX_EPS_CHANNELS];

drivers/usb/dwc2/gadget.c +11 -0

index 1ba0bfc..4013518 100644
@@ -96,6 +96,17 @@ static inline bool using_dma(struct dwc2_hsotg *hsotg)
 	return hsotg->params.g_dma;
 }
 
+/*
+ * using_desc_dma - return the descriptor DMA status of the driver.
+ * @hsotg: The driver state.
+ *
+ * Return true if we're using descriptor DMA.
+ */
+static inline bool using_desc_dma(struct dwc2_hsotg *hsotg)
+{
+	return hsotg->params.g_dma_desc;
+}
+
 /**
  * dwc2_gadget_incr_frame_num - Increments the targeted frame number.
  * @hs_ep: The endpoint

drivers/usb/dwc2/params.c +4 -0

index aeece91..244ac0b 100644
@@ -1172,6 +1172,10 @@ static void dwc2_set_parameters(struct dwc2_hsotg *hsotg,
 					    false, false,
 					    dma_capable);
 
+		dwc2_set_param_bool(hsotg, &p->g_dma_desc, true,
+				    "snps,gadget-dma-desc-enable",
+				    false, false, !!hw->dma_desc_enable);
+
 		/*
 		 * The values for g_rx_fifo_size (2048) and
 		 * g_np_tx_fifo_size (1024) come from the legacy s3c

Signature · 6 lines

2.10.0

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html