[PATCH v3 00/12] usb: dwc2/gadget: fix series

[PATCH v3 00/12] usb: dwc2/gadget: fix series

[Robert Baldyga]

Hello,

This patchset contains fixes for dwc2 gadget driver. It touches PHY,
FIFO configuration, initialization sequence and adds many other small fixes.

Best regards
Robert Baldyga
Samsung R&D Institute Poland

Changelog:
v3:
 - use endpoint index instead of FIFO index for EPFIFO
 - extend patch description

v2: https://lkml.org/lkml/2014/7/16/199
 - add patch usb: dwc2/gadget: avoid disabling ep0 
 - fix FIFO flushing when it's assigned to endpoint dynamically
 - write to proper FIFO in s3c_hsotg_write_fifo() function
 - use real FIFO size in kill_all_requests
 - fix comment in s3c_hsotg_init_fifo() function

v1: https://lkml.org/lkml/2014/6/23/67

Andrzej Pietrasiewicz (1):
  usb: dwc2/gadget: Fix comment text

Kamil Debski (3):
  usb: dwc2/gadget: fix phy disable sequence
  usb: dwc2/gadget: fix phy initialization sequence
  usb: dwc2/gadget: move phy bus legth initialization

Marek Szyprowski (5):
  usb: dwc2/gadget: hide some not really needed debug messages
  usb: dwc2/gadget: ensure that all fifos have correct memory buffers
  usb: dwc2/gadget: break infinite loop in endpoint disable code
  usb: dwc2/gadget: do not call disconnect method in pullup
  usb: dwc2/gadget: delay enabling irq once hardware is configured
    properly

Robert Baldyga (3):
  usb: dwc2/gadget: assign TX FIFO dynamically
  usb: dwc2/gadget: disable clock when it's not needed
  usb: dwc2/gadget: avoid disabling ep0

 drivers/usb/dwc2/core.h   |   3 +
 drivers/usb/dwc2/gadget.c | 184 +++++++++++++++++++++++++++-------------------
 2 files changed, 111 insertions(+), 76 deletions(-)

-- 
1.9.1

[PATCH v3 01/12] usb: dwc2/gadget: fix phy disable sequence

[Robert Baldyga]

From: Kamil Debski <k.debski@samsung.com>

When the driver is removed s3c_hsotg_phy_disable is called three times
instead of once. This results in decreasing of the phy reference counter
below zero and thus consecutive inserts of the module fails.

This patch removes calls to s3c_hsotg_phy_disable from s3c_hsotg_remove
and s3c_hsotg_udc_stop.

s3c_hsotg_udc_stop is called from udc-core.c only after
usb_gadget_disconnect, which in turn calls s3c_hsotg_pullup, which
already calls s3c_hsotg_phy_disable.

s3c_hsotg_remove must be called only after udc_stop, so there is no
point in disabling phy once again there.

Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
---
 drivers/usb/dwc2/gadget.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index f3c56a2..ccef3a7 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -2898,8 +2898,6 @@ static int s3c_hsotg_udc_stop(struct usb_gadget *gadget,
 
 	spin_lock_irqsave(&hsotg->lock, flags);
 
-	s3c_hsotg_phy_disable(hsotg);
-
 	if (!driver)
 		hsotg->driver = NULL;
 
@@ -3586,7 +3584,6 @@ static int s3c_hsotg_remove(struct platform_device *pdev)
 		usb_gadget_unregister_driver(hsotg->driver);
 	}
 
-	s3c_hsotg_phy_disable(hsotg);
 	if (hsotg->phy)
 		phy_exit(hsotg->phy);
 	clk_disable_unprepare(hsotg->clk);
-- 
1.9.1

[PATCH v3 02/12] usb: dwc2/gadget: fix phy initialization sequence

[Robert Baldyga]

From: Kamil Debski <k.debski@samsung.com>

In the Generic PHY Framework a NULL phy is considered to be a valid phy
thus the "if (hsotg->phy)" check does not give us the information whether
the Generic PHY Framework is used.

In addition to the above this patch also removes phy_init from probe and
phy_exit from remove. This is not necessary when init/exit is done in the
s3c_hsotg_phy_enable/disable functions.

Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
---
 drivers/usb/dwc2/gadget.c | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index ccef3a7..70eab95 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -2748,13 +2748,14 @@ static void s3c_hsotg_phy_enable(struct s3c_hsotg *hsotg)
 
 	dev_dbg(hsotg->dev, "pdev 0x%p\n", pdev);
 
-	if (hsotg->phy) {
-		phy_init(hsotg->phy);
-		phy_power_on(hsotg->phy);
-	} else if (hsotg->uphy)
+	if (hsotg->uphy)
 		usb_phy_init(hsotg->uphy);
-	else if (hsotg->plat->phy_init)
+	else if (hsotg->plat && hsotg->plat->phy_init)
 		hsotg->plat->phy_init(pdev, hsotg->plat->phy_type);
+	else {
+		phy_init(hsotg->phy);
+		phy_power_on(hsotg->phy);
+	}
 }
 
 /**
@@ -2768,13 +2769,14 @@ static void s3c_hsotg_phy_disable(struct s3c_hsotg *hsotg)
 {
 	struct platform_device *pdev = to_platform_device(hsotg->dev);
 
-	if (hsotg->phy) {
-		phy_power_off(hsotg->phy);
-		phy_exit(hsotg->phy);
-	} else if (hsotg->uphy)
+	if (hsotg->uphy)
 		usb_phy_shutdown(hsotg->uphy);
-	else if (hsotg->plat->phy_exit)
+	else if (hsotg->plat && hsotg->plat->phy_exit)
 		hsotg->plat->phy_exit(pdev, hsotg->plat->phy_type);
+	else {
+		phy_power_off(hsotg->phy);
+		phy_exit(hsotg->phy);
+	}
 }
 
 /**
@@ -3489,9 +3491,6 @@ static int s3c_hsotg_probe(struct platform_device *pdev)
 	if (hsotg->phy && (phy_get_bus_width(phy) == 8))
 		hsotg->phyif = GUSBCFG_PHYIF8;
 
-	if (hsotg->phy)
-		phy_init(hsotg->phy);
-
 	/* usb phy enable */
 	s3c_hsotg_phy_enable(hsotg);
 
@@ -3584,8 +3583,6 @@ static int s3c_hsotg_remove(struct platform_device *pdev)
 		usb_gadget_unregister_driver(hsotg->driver);
 	}
 
-	if (hsotg->phy)
-		phy_exit(hsotg->phy);
 	clk_disable_unprepare(hsotg->clk);
 
 	return 0;
-- 
1.9.1

[PATCH v3 03/12] usb: dwc2/gadget: move phy bus legth initialization

[Robert Baldyga]

From: Kamil Debski <k.debski@samsung.com>

This patch moves the part of code that initializes the PHY bus width.
This results in simpler code and removes the need to check whether
the Generic PHY Framework is used.

Signed-off-by: Kamil Debski <k.debski@samsung.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
---
 drivers/usb/dwc2/gadget.c | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 70eab95..fc27b4c 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -3395,6 +3395,9 @@ static int s3c_hsotg_probe(struct platform_device *pdev)
 		return -ENOMEM;
 	}
 
+	/* Set default UTMI width */
+	hsotg->phyif = GUSBCFG_PHYIF16;
+
 	/*
 	 * Attempt to find a generic PHY, then look for an old style
 	 * USB PHY, finally fall back to pdata
@@ -3413,8 +3416,15 @@ static int s3c_hsotg_probe(struct platform_device *pdev)
 			hsotg->plat = plat;
 		} else
 			hsotg->uphy = uphy;
-	} else
+	} else {
 		hsotg->phy = phy;
+		/*
+		 * If using the generic PHY framework, check if the PHY bus
+		 * width is 8-bit and set the phyif appropriately.
+		 */
+		if (phy_get_bus_width(phy) == 8)
+			hsotg->phyif = GUSBCFG_PHYIF8;
+	}
 
 	hsotg->dev = dev;
 
@@ -3481,16 +3491,6 @@ static int s3c_hsotg_probe(struct platform_device *pdev)
 		goto err_supplies;
 	}
 
-	/* Set default UTMI width */
-	hsotg->phyif = GUSBCFG_PHYIF16;
-
-	/*
-	 * If using the generic PHY framework, check if the PHY bus
-	 * width is 8-bit and set the phyif appropriately.
-	 */
-	if (hsotg->phy && (phy_get_bus_width(phy) == 8))
-		hsotg->phyif = GUSBCFG_PHYIF8;
-
 	/* usb phy enable */
 	s3c_hsotg_phy_enable(hsotg);
 
-- 
1.9.1

[PATCH v3 04/12] usb: dwc2/gadget: Fix comment text

[Robert Baldyga]

From: Andrzej Pietrasiewicz <andrzej.p@samsung.com>

Adjust the debug text to the name of the printed variable.

Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
---
 drivers/usb/dwc2/gadget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index fc27b4c..35b4890 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -2935,7 +2935,7 @@ static int s3c_hsotg_pullup(struct usb_gadget *gadget, int is_on)
 	struct s3c_hsotg *hsotg = to_hsotg(gadget);
 	unsigned long flags = 0;
 
-	dev_dbg(hsotg->dev, "%s: is_in: %d\n", __func__, is_on);
+	dev_dbg(hsotg->dev, "%s: is_on: %d\n", __func__, is_on);
 
 	spin_lock_irqsave(&hsotg->lock, flags);
 	if (is_on) {
-- 
1.9.1

[PATCH v3 05/12] usb: dwc2/gadget: hide some not really needed debug messages

[Robert Baldyga]

From: Marek Szyprowski <m.szyprowski@samsung.com>

Some DWC2/s3c-hsotg debug messages are really useless for typical user,
so hide them behind dev_dbg().

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
---
 drivers/usb/dwc2/gadget.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 35b4890..95b6dcb 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -2568,7 +2568,7 @@ static int s3c_hsotg_ep_disable(struct usb_ep *ep)
 	u32 epctrl_reg;
 	u32 ctrl;
 
-	dev_info(hsotg->dev, "%s(ep %p)\n", __func__, ep);
+	dev_dbg(hsotg->dev, "%s(ep %p)\n", __func__, ep);
 
 	if (ep == &hsotg->eps[0].ep) {
 		dev_err(hsotg->dev, "%s: called for ep0\n", __func__);
@@ -2626,7 +2626,7 @@ static int s3c_hsotg_ep_dequeue(struct usb_ep *ep, struct usb_request *req)
 	struct s3c_hsotg *hs = hs_ep->parent;
 	unsigned long flags;
 
-	dev_info(hs->dev, "ep_dequeue(%p,%p)\n", ep, req);
+	dev_dbg(hs->dev, "ep_dequeue(%p,%p)\n", ep, req);
 
 	spin_lock_irqsave(&hs->lock, flags);
 
-- 
1.9.1

[PATCH v3 06/12] usb: dwc2/gadget: ensure that all fifos have correct memory buffers

[Robert Baldyga]

From: Marek Szyprowski <m.szyprowski@samsung.com>

Print warning if FIFOs are configured in such a way that they don't fit
into the SPRAM available on the s3c hsotg module.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
---
 drivers/usb/dwc2/core.h   |  1 +
 drivers/usb/dwc2/gadget.c | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
index 1efd10c..067390e 100644
--- a/drivers/usb/dwc2/core.h
+++ b/drivers/usb/dwc2/core.h
@@ -194,6 +194,7 @@ struct s3c_hsotg {
 	struct regulator_bulk_data supplies[ARRAY_SIZE(s3c_hsotg_supply_names)];
 
 	u32                     phyif;
+	int			fifo_mem;
 	unsigned int            dedicated_fifos:1;
 	unsigned char           num_of_eps;
 
diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 95b6dcb..21d21de 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -194,6 +194,8 @@ static void s3c_hsotg_init_fifo(struct s3c_hsotg *hsotg)
 	for (ep = 1; ep <= 15; ep++) {
 		val = addr;
 		val |= size << FIFOSIZE_DEPTH_SHIFT;
+		WARN_ONCE(addr + size > hsotg->fifo_mem,
+			  "insufficient fifo memory");
 		addr += size;
 
 		writel(val, hsotg->regs + DPTXFSIZN(ep));
@@ -3030,19 +3032,22 @@ static void s3c_hsotg_initep(struct s3c_hsotg *hsotg,
  */
 static void s3c_hsotg_hw_cfg(struct s3c_hsotg *hsotg)
 {
-	u32 cfg2, cfg4;
+	u32 cfg2, cfg3, cfg4;
 	/* check hardware configuration */
 
 	cfg2 = readl(hsotg->regs + 0x48);
 	hsotg->num_of_eps = (cfg2 >> 10) & 0xF;
 
-	dev_info(hsotg->dev, "EPs:%d\n", hsotg->num_of_eps);
+	cfg3 = readl(hsotg->regs + 0x4C);
+	hsotg->fifo_mem = (cfg3 >> 16);
 
 	cfg4 = readl(hsotg->regs + 0x50);
 	hsotg->dedicated_fifos = (cfg4 >> 25) & 1;
 
-	dev_info(hsotg->dev, "%s fifos\n",
-		 hsotg->dedicated_fifos ? "dedicated" : "shared");
+	dev_info(hsotg->dev, "EPs: %d, %s fifos, %d entries in SPRAM\n",
+		 hsotg->num_of_eps,
+		 hsotg->dedicated_fifos ? "dedicated" : "shared",
+		 hsotg->fifo_mem);
 }
 
 /**
@@ -3495,8 +3500,8 @@ static int s3c_hsotg_probe(struct platform_device *pdev)
 	s3c_hsotg_phy_enable(hsotg);
 
 	s3c_hsotg_corereset(hsotg);
-	s3c_hsotg_init(hsotg);
 	s3c_hsotg_hw_cfg(hsotg);
+	s3c_hsotg_init(hsotg);
 
 	/* hsotg->num_of_eps holds number of EPs other than ep0 */
 
-- 
1.9.1

[PATCH v3 07/12] usb: dwc2/gadget: break infinite loop in endpoint disable code

[Robert Baldyga]

From: Marek Szyprowski <m.szyprowski@samsung.com>

This patch fixes possible freeze caused by infinite loop in interrupt
context.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
---
 drivers/usb/dwc2/gadget.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 21d21de..2220882 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -1652,6 +1652,7 @@ static void s3c_hsotg_txfifo_flush(struct s3c_hsotg *hsotg, unsigned int idx)
 			dev_err(hsotg->dev,
 				"%s: timeout flushing fifo (GRSTCTL=%08x)\n",
 				__func__, val);
+			break;
 		}
 
 		udelay(1);
-- 
1.9.1

[PATCH v3 08/12] usb: dwc2/gadget: do not call disconnect method in pullup

[Robert Baldyga]

From: Marek Szyprowski <m.szyprowski@samsung.com>

This leads to potential spinlock recursion in composite framework, other
udc drivers also don't call it directly from pullup method.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
---
 drivers/usb/dwc2/gadget.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 2220882..def4900 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -2945,7 +2945,6 @@ static int s3c_hsotg_pullup(struct usb_gadget *gadget, int is_on)
 		s3c_hsotg_phy_enable(hsotg);
 		s3c_hsotg_core_init(hsotg);
 	} else {
-		s3c_hsotg_disconnect(hsotg);
 		s3c_hsotg_phy_disable(hsotg);
 	}
 
-- 
1.9.1

[PATCH v3 09/12] usb: dwc2/gadget: delay enabling irq once hardware is configured properly

[Robert Baldyga]

From: Marek Szyprowski <m.szyprowski@samsung.com>

This patch fixes kernel panic/interrupt storm/etc issues if bootloader
left s3c-hsotg module in enabled state. Now interrupt handler is enabled
only after proper configuration of hardware registers.

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
---
 drivers/usb/dwc2/gadget.c | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index def4900..3435711 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -3459,13 +3459,6 @@ static int s3c_hsotg_probe(struct platform_device *pdev)
 
 	hsotg->irq = ret;
 
-	ret = devm_request_irq(&pdev->dev, hsotg->irq, s3c_hsotg_irq, 0,
-				dev_name(dev), hsotg);
-	if (ret < 0) {
-		dev_err(dev, "cannot claim IRQ\n");
-		goto err_clk;
-	}
-
 	dev_info(dev, "regs %p, irq %d\n", hsotg->regs, hsotg->irq);
 
 	hsotg->gadget.max_speed = USB_SPEED_HIGH;
@@ -3503,6 +3496,17 @@ static int s3c_hsotg_probe(struct platform_device *pdev)
 	s3c_hsotg_hw_cfg(hsotg);
 	s3c_hsotg_init(hsotg);
 
+	ret = devm_request_irq(&pdev->dev, hsotg->irq, s3c_hsotg_irq, 0,
+				dev_name(dev), hsotg);
+	if (ret < 0) {
+		s3c_hsotg_phy_disable(hsotg);
+		clk_disable_unprepare(hsotg->clk);
+		regulator_bulk_disable(ARRAY_SIZE(hsotg->supplies),
+				       hsotg->supplies);
+		dev_err(dev, "cannot claim IRQ\n");
+		goto err_clk;
+	}
+
 	/* hsotg->num_of_eps holds number of EPs other than ep0 */
 
 	if (hsotg->num_of_eps == 0) {
-- 
1.9.1

[PATCH v3 10/12] usb: dwc2/gadget: assign TX FIFO dynamically

[Robert Baldyga]

Because we have not enough memory to have each TX FIFO of size at least
3072 bytes (the maximum single packet size with 3 transactions per
microframe), we create four FIFOs of lenght 1024, and four of length
3072 bytes, and assing them to endpoints dynamically according to
maxpacket size value of given endpoint.

Up to now there were initialized 16 TX FIFOs, but we use only 8 IN
endpoints, so we can split available memory for 8 FIFOs to have more
memory for each one.

It needed to do some small modifications in few places in code, because
there was assumption that TX FIFO numbers assigned to endpoints are the
same as the endpoint numbers, which is not true since we have dynamic
FIFO assigning.

Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
---
 drivers/usb/dwc2/core.h   |  2 ++
 drivers/usb/dwc2/gadget.c | 80 +++++++++++++++++++++++++++++------------------
 2 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/drivers/usb/dwc2/core.h b/drivers/usb/dwc2/core.h
index 067390e..3b4bd4c 100644
--- a/drivers/usb/dwc2/core.h
+++ b/drivers/usb/dwc2/core.h
@@ -139,6 +139,7 @@ struct s3c_hsotg_ep {
 	unsigned int            last_load;
 	unsigned int            fifo_load;
 	unsigned short          fifo_size;
+	unsigned short		fifo_index;
 
 	unsigned char           dir_in;
 	unsigned char           index;
@@ -197,6 +198,7 @@ struct s3c_hsotg {
 	int			fifo_mem;
 	unsigned int            dedicated_fifos:1;
 	unsigned char           num_of_eps;
+	u32			fifo_map;
 
 	struct dentry           *debug_root;
 	struct dentry           *debug_file;
diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 3435711..e74094a 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -184,14 +184,29 @@ static void s3c_hsotg_init_fifo(struct s3c_hsotg *hsotg)
 
 	/* start at the end of the GNPTXFSIZ, rounded up */
 	addr = 2048 + 1024;
-	size = 768;
 
 	/*
-	 * currently we allocate TX FIFOs for all possible endpoints,
-	 * and assume that they are all the same size.
+	 * Because we have not enough memory to have each TX FIFO of size at
+	 * least 3072 bytes (the maximum single packet size), we create four
+	 * FIFOs of lenght 1024, and four of length 3072 bytes, and assing
+	 * them to endpoints dynamically according to maxpacket size value of
+	 * given endpoint.
 	 */
 
-	for (ep = 1; ep <= 15; ep++) {
+	/* 256*4=1024 bytes FIFO length */
+	size = 256;
+	for (ep = 1; ep <= 4; ep++) {
+		val = addr;
+		val |= size << FIFOSIZE_DEPTH_SHIFT;
+		WARN_ONCE(addr + size > hsotg->fifo_mem,
+			  "insufficient fifo memory");
+		addr += size;
+
+		writel(val, hsotg->regs + DPTXFSIZN(ep));
+	}
+	/* 768*4=3072 bytes FIFO length */
+	size = 768;
+	for (ep = 5; ep <= 8; ep++) {
 		val = addr;
 		val |= size << FIFOSIZE_DEPTH_SHIFT;
 		WARN_ONCE(addr + size > hsotg->fifo_mem,
@@ -1835,7 +1850,7 @@ static void s3c_hsotg_epint(struct s3c_hsotg *hsotg, unsigned int idx,
 		if (dir_in) {
 			int epctl = readl(hsotg->regs + epctl_reg);
 
-			s3c_hsotg_txfifo_flush(hsotg, idx);
+			s3c_hsotg_txfifo_flush(hsotg, hs_ep->fifo_index);
 
 			if ((epctl & DXEPCTL_STALL) &&
 				(epctl & DXEPCTL_EPTYPE_BULK)) {
@@ -1984,6 +1999,7 @@ static void kill_all_requests(struct s3c_hsotg *hsotg,
 			      int result, bool force)
 {
 	struct s3c_hsotg_req *req, *treq;
+	unsigned size;
 
 	list_for_each_entry_safe(req, treq, &ep->queue, queue) {
 		/*
@@ -1997,9 +2013,11 @@ static void kill_all_requests(struct s3c_hsotg *hsotg,
 		s3c_hsotg_complete_request(hsotg, ep, req,
 					   result);
 	}
-	if(hsotg->dedicated_fifos)
-		if ((readl(hsotg->regs + DTXFSTS(ep->index)) & 0xffff) * 4 < 3072)
-			s3c_hsotg_txfifo_flush(hsotg, ep->index);
+	if (!hsotg->dedicated_fifos)
+		return;
+	size = (readl(hsotg->regs + DTXFSTS(ep->index)) & 0xffff) * 4;
+	if (size < ep->fifo_size)
+		s3c_hsotg_txfifo_flush(hsotg, ep->fifo_index);
 }
 
 /**
@@ -2440,6 +2458,7 @@ static int s3c_hsotg_ep_enable(struct usb_ep *ep,
 	u32 epctrl;
 	u32 mps;
 	int dir_in;
+	int i, val, size;
 	int ret = 0;
 
 	dev_dbg(hsotg->dev,
@@ -2512,17 +2531,8 @@ static int s3c_hsotg_ep_enable(struct usb_ep *ep,
 		break;
 
 	case USB_ENDPOINT_XFER_INT:
-		if (dir_in) {
-			/*
-			 * Allocate our TxFNum by simply using the index
-			 * of the endpoint for the moment. We could do
-			 * something better if the host indicates how
-			 * many FIFOs we are expecting to use.
-			 */
-
+		if (dir_in)
 			hs_ep->periodic = 1;
-			epctrl |= DXEPCTL_TXFNUM(index);
-		}
 
 		epctrl |= DXEPCTL_EPTYPE_INTERRUPT;
 		break;
@@ -2536,8 +2546,25 @@ static int s3c_hsotg_ep_enable(struct usb_ep *ep,
 	 * if the hardware has dedicated fifos, we must give each IN EP
 	 * a unique tx-fifo even if it is non-periodic.
 	 */
-	if (dir_in && hsotg->dedicated_fifos)
-		epctrl |= DXEPCTL_TXFNUM(index);
+	if (dir_in && hsotg->dedicated_fifos) {
+		size = hs_ep->ep.maxpacket*hs_ep->mc;
+		for (i = 1; i <= 8; ++i) {
+			if (hsotg->fifo_map & (1<<i))
+				continue;
+			val = readl(hsotg->regs + DPTXFSIZN(i));
+			val = (val >> FIFOSIZE_DEPTH_SHIFT)*4;
+			if (val < size)
+				continue;
+			hsotg->fifo_map |= 1<<i;
+
+			epctrl |= DXEPCTL_TXFNUM(i);
+			hs_ep->fifo_index = i;
+			hs_ep->fifo_size = val;
+			break;
+		}
+		if (i == 8)
+			return -ENOMEM;
+	}
 
 	/* for non control endpoints, set PID to D0 */
 	if (index)
@@ -2584,6 +2611,9 @@ static int s3c_hsotg_ep_disable(struct usb_ep *ep)
 	/* terminate all requests with shutdown */
 	kill_all_requests(hsotg, hs_ep, -ESHUTDOWN, false);
 
+	hsotg->fifo_map &= ~(1<<hs_ep->fifo_index);
+	hs_ep->fifo_index = 0;
+	hs_ep->fifo_size = 0;
 
 	ctrl = readl(hsotg->regs + epctrl_reg);
 	ctrl &= ~DXEPCTL_EPENA;
@@ -2975,7 +3005,6 @@ static void s3c_hsotg_initep(struct s3c_hsotg *hsotg,
 				       struct s3c_hsotg_ep *hs_ep,
 				       int epnum)
 {
-	u32 ptxfifo;
 	char *dir;
 
 	if (epnum == 0)
@@ -3004,15 +3033,6 @@ static void s3c_hsotg_initep(struct s3c_hsotg *hsotg,
 	hs_ep->ep.ops = &s3c_hsotg_ep_ops;
 
 	/*
-	 * Read the FIFO size for the Periodic TX FIFO, even if we're
-	 * an OUT endpoint, we may as well do this if in future the
-	 * code is changed to make each endpoint's direction changeable.
-	 */
-
-	ptxfifo = readl(hsotg->regs + DPTXFSIZN(epnum));
-	hs_ep->fifo_size = FIFOSIZE_DEPTH_GET(ptxfifo) * 4;
-
-	/*
 	 * if we're using dma, we need to set the next-endpoint pointer
 	 * to be something valid.
 	 */
-- 
1.9.1

[PATCH v3 11/12] usb: dwc2/gadget: disable clock when it's not needed

[Robert Baldyga]

When device is stopped or suspended clock is not needed so we
can disable it for this time.

Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
---
 drivers/usb/dwc2/gadget.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index e74094a..11f038e 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -2894,6 +2894,8 @@ static int s3c_hsotg_udc_start(struct usb_gadget *gadget,
 	hsotg->gadget.dev.of_node = hsotg->dev->of_node;
 	hsotg->gadget.speed = USB_SPEED_UNKNOWN;
 
+	clk_enable(hsotg->clk);
+
 	ret = regulator_bulk_enable(ARRAY_SIZE(hsotg->supplies),
 				    hsotg->supplies);
 	if (ret) {
@@ -2942,6 +2944,8 @@ static int s3c_hsotg_udc_stop(struct usb_gadget *gadget,
 
 	regulator_bulk_disable(ARRAY_SIZE(hsotg->supplies), hsotg->supplies);
 
+	clk_disable(hsotg->clk);
+
 	return 0;
 }
 
@@ -2973,8 +2977,10 @@ static int s3c_hsotg_pullup(struct usb_gadget *gadget, int is_on)
 	spin_lock_irqsave(&hsotg->lock, flags);
 	if (is_on) {
 		s3c_hsotg_phy_enable(hsotg);
+		clk_enable(hsotg->clk);
 		s3c_hsotg_core_init(hsotg);
 	} else {
+		clk_disable(hsotg->clk);
 		s3c_hsotg_phy_disable(hsotg);
 	}
 
@@ -3640,6 +3646,7 @@ static int s3c_hsotg_suspend(struct platform_device *pdev, pm_message_t state)
 
 		ret = regulator_bulk_disable(ARRAY_SIZE(hsotg->supplies),
 					     hsotg->supplies);
+		clk_disable(hsotg->clk);
 	}
 
 	return ret;
@@ -3654,6 +3661,8 @@ static int s3c_hsotg_resume(struct platform_device *pdev)
 	if (hsotg->driver) {
 		dev_info(hsotg->dev, "resuming usb gadget %s\n",
 			 hsotg->driver->driver.name);
+
+		clk_enable(hsotg->clk);
 		ret = regulator_bulk_enable(ARRAY_SIZE(hsotg->supplies),
 				      hsotg->supplies);
 	}
-- 
1.9.1

[PATCH v3 12/12] usb: dwc2/gadget: avoid disabling ep0

[Robert Baldyga]

Endpoint 0 should not be disabled, so we start loop counter from number 1.

Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
---
 drivers/usb/dwc2/gadget.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/usb/dwc2/gadget.c b/drivers/usb/dwc2/gadget.c
index 11f038e..cc31088 100644
--- a/drivers/usb/dwc2/gadget.c
+++ b/drivers/usb/dwc2/gadget.c
@@ -2930,7 +2930,7 @@ static int s3c_hsotg_udc_stop(struct usb_gadget *gadget,
 		return -ENODEV;
 
 	/* all endpoints should be shutdown */
-	for (ep = 0; ep < hsotg->num_of_eps; ep++)
+	for (ep = 1; ep < hsotg->num_of_eps; ep++)
 		s3c_hsotg_ep_disable(&hsotg->eps[ep].ep);
 
 	spin_lock_irqsave(&hsotg->lock, flags);
-- 
1.9.1

RE: [PATCH v3 00/12] usb: dwc2/gadget: fix series

[Paul Zimmerman]

> From: Robert Baldyga [mailto:r.baldyga@samsung.com]
> Sent: Friday, July 18, 2014 4:39 AM
> 
> This patchset contains fixes for dwc2 gadget driver. It touches PHY,
> FIFO configuration, initialization sequence and adds many other small fixes.
> 
> Best regards
> Robert Baldyga
> Samsung R&D Institute Poland
> 
> Changelog:
> v3:
>  - use endpoint index instead of FIFO index for EPFIFO
>  - extend patch description
> 
> v2: https://lkml.org/lkml/2014/7/16/199
>  - add patch usb: dwc2/gadget: avoid disabling ep0
>  - fix FIFO flushing when it's assigned to endpoint dynamically
>  - write to proper FIFO in s3c_hsotg_write_fifo() function
>  - use real FIFO size in kill_all_requests
>  - fix comment in s3c_hsotg_init_fifo() function
> 
> v1: https://lkml.org/lkml/2014/6/23/67
> 
> Andrzej Pietrasiewicz (1):
>   usb: dwc2/gadget: Fix comment text
> 
> Kamil Debski (3):
>   usb: dwc2/gadget: fix phy disable sequence
>   usb: dwc2/gadget: fix phy initialization sequence
>   usb: dwc2/gadget: move phy bus legth initialization
> 
> Marek Szyprowski (5):
>   usb: dwc2/gadget: hide some not really needed debug messages
>   usb: dwc2/gadget: ensure that all fifos have correct memory buffers
>   usb: dwc2/gadget: break infinite loop in endpoint disable code
>   usb: dwc2/gadget: do not call disconnect method in pullup
>   usb: dwc2/gadget: delay enabling irq once hardware is configured
>     properly
> 
> Robert Baldyga (3):
>   usb: dwc2/gadget: assign TX FIFO dynamically
>   usb: dwc2/gadget: disable clock when it's not needed
>   usb: dwc2/gadget: avoid disabling ep0
> 
>  drivers/usb/dwc2/core.h   |   3 +
>  drivers/usb/dwc2/gadget.c | 184 +++++++++++++++++++++++++++-------------------
>  2 files changed, 111 insertions(+), 76 deletions(-)

For the entire series:

Acked-by: Paul Zimmerman <paulz@synopsys.com>

RE: [PATCH v3 00/12] usb: dwc2/gadget: fix series

[Paul Zimmerman]

> From: Paul Zimmerman
> Sent: Friday, July 18, 2014 12:19 PM
> 
> > From: Robert Baldyga [mailto:r.baldyga@samsung.com]
> > Sent: Friday, July 18, 2014 4:39 AM
> >
> > This patchset contains fixes for dwc2 gadget driver. It touches PHY,
> > FIFO configuration, initialization sequence and adds many other small fixes.
> >
> > Best regards
> > Robert Baldyga
> > Samsung R&D Institute Poland
> >
> > Changelog:
> > v3:
> >  - use endpoint index instead of FIFO index for EPFIFO
> >  - extend patch description
> >
> > v2: https://lkml.org/lkml/2014/7/16/199
> >  - add patch usb: dwc2/gadget: avoid disabling ep0
> >  - fix FIFO flushing when it's assigned to endpoint dynamically
> >  - write to proper FIFO in s3c_hsotg_write_fifo() function
> >  - use real FIFO size in kill_all_requests
> >  - fix comment in s3c_hsotg_init_fifo() function
> >
> > v1: https://lkml.org/lkml/2014/6/23/67
> >
> > Andrzej Pietrasiewicz (1):
> >   usb: dwc2/gadget: Fix comment text
> >
> > Kamil Debski (3):
> >   usb: dwc2/gadget: fix phy disable sequence
> >   usb: dwc2/gadget: fix phy initialization sequence
> >   usb: dwc2/gadget: move phy bus legth initialization
> >
> > Marek Szyprowski (5):
> >   usb: dwc2/gadget: hide some not really needed debug messages
> >   usb: dwc2/gadget: ensure that all fifos have correct memory buffers
> >   usb: dwc2/gadget: break infinite loop in endpoint disable code
> >   usb: dwc2/gadget: do not call disconnect method in pullup
> >   usb: dwc2/gadget: delay enabling irq once hardware is configured properly
> >
> > Robert Baldyga (3):
> >   usb: dwc2/gadget: assign TX FIFO dynamically
> >   usb: dwc2/gadget: disable clock when it's not needed
> >   usb: dwc2/gadget: avoid disabling ep0
> >
> >  drivers/usb/dwc2/core.h   |   3 +
> >  drivers/usb/dwc2/gadget.c | 184 +++++++++++++++++++++++++++-------------------
> >  2 files changed, 111 insertions(+), 76 deletions(-)
> 
> For the entire series:
> 
> Acked-by: Paul Zimmerman <paulz@synopsys.com>

Hi Greg,

I don't see this series from Robert in your tree yet. Is it still in
your queue, or should Robert resend it?

-- 
Paul

Re: [PATCH v3 00/12] usb: dwc2/gadget: fix series

[gregkh]

On Mon, Aug 04, 2014 at 06:58:23PM +0000, Paul Zimmerman wrote:
> > From: Paul Zimmerman
> > Sent: Friday, July 18, 2014 12:19 PM
> > 
> > > From: Robert Baldyga [mailto:r.baldyga@samsung.com]
> > > Sent: Friday, July 18, 2014 4:39 AM
> > >
> > > This patchset contains fixes for dwc2 gadget driver. It touches PHY,
> > > FIFO configuration, initialization sequence and adds many other small fixes.
> > >
> > > Best regards
> > > Robert Baldyga
> > > Samsung R&D Institute Poland
> > >
> > > Changelog:
> > > v3:
> > >  - use endpoint index instead of FIFO index for EPFIFO
> > >  - extend patch description
> > >
> > > v2: https://lkml.org/lkml/2014/7/16/199
> > >  - add patch usb: dwc2/gadget: avoid disabling ep0
> > >  - fix FIFO flushing when it's assigned to endpoint dynamically
> > >  - write to proper FIFO in s3c_hsotg_write_fifo() function
> > >  - use real FIFO size in kill_all_requests
> > >  - fix comment in s3c_hsotg_init_fifo() function
> > >
> > > v1: https://lkml.org/lkml/2014/6/23/67
> > >
> > > Andrzej Pietrasiewicz (1):
> > >   usb: dwc2/gadget: Fix comment text
> > >
> > > Kamil Debski (3):
> > >   usb: dwc2/gadget: fix phy disable sequence
> > >   usb: dwc2/gadget: fix phy initialization sequence
> > >   usb: dwc2/gadget: move phy bus legth initialization
> > >
> > > Marek Szyprowski (5):
> > >   usb: dwc2/gadget: hide some not really needed debug messages
> > >   usb: dwc2/gadget: ensure that all fifos have correct memory buffers
> > >   usb: dwc2/gadget: break infinite loop in endpoint disable code
> > >   usb: dwc2/gadget: do not call disconnect method in pullup
> > >   usb: dwc2/gadget: delay enabling irq once hardware is configured properly
> > >
> > > Robert Baldyga (3):
> > >   usb: dwc2/gadget: assign TX FIFO dynamically
> > >   usb: dwc2/gadget: disable clock when it's not needed
> > >   usb: dwc2/gadget: avoid disabling ep0
> > >
> > >  drivers/usb/dwc2/core.h   |   3 +
> > >  drivers/usb/dwc2/gadget.c | 184 +++++++++++++++++++++++++++-------------------
> > >  2 files changed, 111 insertions(+), 76 deletions(-)
> > 
> > For the entire series:
> > 
> > Acked-by: Paul Zimmerman <paulz@synopsys.com>
> 
> Hi Greg,
> 
> I don't see this series from Robert in your tree yet. Is it still in
> your queue, or should Robert resend it?

I thought this was coming in from Felipe's tree, sorry.  It's too late
for 3.17-rc1, I just sent out those patches to Linus.

If someone wants me to take a patch series, please be explicit and say
something like "Greg please take these in your tree", otherwise it is
very easy to get lost in my inbox...

greg k-h

RE: [PATCH v3 00/12] usb: dwc2/gadget: fix series

[Paul Zimmerman]

> From: gregkh@linuxfoundation.org [mailto:gregkh@linuxfoundation.org]
> Sent: Monday, August 04, 2014 12:11 PM
> 
> On Mon, Aug 04, 2014 at 06:58:23PM +0000, Paul Zimmerman wrote:
> > > From: Paul Zimmerman
> > > Sent: Friday, July 18, 2014 12:19 PM
> > >
> > > > From: Robert Baldyga [mailto:r.baldyga@samsung.com]
> > > > Sent: Friday, July 18, 2014 4:39 AM
> > > >
> > > > This patchset contains fixes for dwc2 gadget driver. It touches PHY,
> > > > FIFO configuration, initialization sequence and adds many other small fixes.
> > > >
> > > > Best regards
> > > > Robert Baldyga
> > > > Samsung R&D Institute Poland
> > > >
> > > > Changelog:
> > > > v3:
> > > >  - use endpoint index instead of FIFO index for EPFIFO
> > > >  - extend patch description
> > > >
> > > > v2: https://lkml.org/lkml/2014/7/16/199
> > > >  - add patch usb: dwc2/gadget: avoid disabling ep0
> > > >  - fix FIFO flushing when it's assigned to endpoint dynamically
> > > >  - write to proper FIFO in s3c_hsotg_write_fifo() function
> > > >  - use real FIFO size in kill_all_requests
> > > >  - fix comment in s3c_hsotg_init_fifo() function
> > > >
> > > > v1: https://lkml.org/lkml/2014/6/23/67
> > > >
> > > > Andrzej Pietrasiewicz (1):
> > > >   usb: dwc2/gadget: Fix comment text
> > > >
> > > > Kamil Debski (3):
> > > >   usb: dwc2/gadget: fix phy disable sequence
> > > >   usb: dwc2/gadget: fix phy initialization sequence
> > > >   usb: dwc2/gadget: move phy bus legth initialization
> > > >
> > > > Marek Szyprowski (5):
> > > >   usb: dwc2/gadget: hide some not really needed debug messages
> > > >   usb: dwc2/gadget: ensure that all fifos have correct memory buffers
> > > >   usb: dwc2/gadget: break infinite loop in endpoint disable code
> > > >   usb: dwc2/gadget: do not call disconnect method in pullup
> > > >   usb: dwc2/gadget: delay enabling irq once hardware is configured properly
> > > >
> > > > Robert Baldyga (3):
> > > >   usb: dwc2/gadget: assign TX FIFO dynamically
> > > >   usb: dwc2/gadget: disable clock when it's not needed
> > > >   usb: dwc2/gadget: avoid disabling ep0
> > > >
> > > >  drivers/usb/dwc2/core.h   |   3 +
> > > >  drivers/usb/dwc2/gadget.c | 184 +++++++++++++++++++++++++++-------------------
> > > >  2 files changed, 111 insertions(+), 76 deletions(-)
> > >
> > > For the entire series:
> > >
> > > Acked-by: Paul Zimmerman <paulz@synopsys.com>
> >
> > Hi Greg,
> >
> > I don't see this series from Robert in your tree yet. Is it still in
> > your queue, or should Robert resend it?
> 
> I thought this was coming in from Felipe's tree, sorry.  It's too late
> for 3.17-rc1, I just sent out those patches to Linus.
> 
> If someone wants me to take a patch series, please be explicit and say
> something like "Greg please take these in your tree", otherwise it is
> very easy to get lost in my inbox...

Ah, OK. I guess that's my fault.

Still, the mainline merge window is open for two weeks, right? Any reason
why you can't still send this series to Linus? I'd hate to see Robert
lose out due to my screwup.

-- 
Paul

Re: [PATCH v3 00/12] usb: dwc2/gadget: fix series

[gregkh]

On Mon, Aug 04, 2014 at 07:53:35PM +0000, Paul Zimmerman wrote:
> > From: gregkh@linuxfoundation.org [mailto:gregkh@linuxfoundation.org]
> > Sent: Monday, August 04, 2014 12:11 PM
> > 
> > On Mon, Aug 04, 2014 at 06:58:23PM +0000, Paul Zimmerman wrote:
> > > > From: Paul Zimmerman
> > > > Sent: Friday, July 18, 2014 12:19 PM
> > > >
> > > > > From: Robert Baldyga [mailto:r.baldyga@samsung.com]
> > > > > Sent: Friday, July 18, 2014 4:39 AM
> > > > >
> > > > > This patchset contains fixes for dwc2 gadget driver. It touches PHY,
> > > > > FIFO configuration, initialization sequence and adds many other small fixes.
> > > > >
> > > > > Best regards
> > > > > Robert Baldyga
> > > > > Samsung R&D Institute Poland
> > > > >
> > > > > Changelog:
> > > > > v3:
> > > > >  - use endpoint index instead of FIFO index for EPFIFO
> > > > >  - extend patch description
> > > > >
> > > > > v2: https://lkml.org/lkml/2014/7/16/199
> > > > >  - add patch usb: dwc2/gadget: avoid disabling ep0
> > > > >  - fix FIFO flushing when it's assigned to endpoint dynamically
> > > > >  - write to proper FIFO in s3c_hsotg_write_fifo() function
> > > > >  - use real FIFO size in kill_all_requests
> > > > >  - fix comment in s3c_hsotg_init_fifo() function
> > > > >
> > > > > v1: https://lkml.org/lkml/2014/6/23/67
> > > > >
> > > > > Andrzej Pietrasiewicz (1):
> > > > >   usb: dwc2/gadget: Fix comment text
> > > > >
> > > > > Kamil Debski (3):
> > > > >   usb: dwc2/gadget: fix phy disable sequence
> > > > >   usb: dwc2/gadget: fix phy initialization sequence
> > > > >   usb: dwc2/gadget: move phy bus legth initialization
> > > > >
> > > > > Marek Szyprowski (5):
> > > > >   usb: dwc2/gadget: hide some not really needed debug messages
> > > > >   usb: dwc2/gadget: ensure that all fifos have correct memory buffers
> > > > >   usb: dwc2/gadget: break infinite loop in endpoint disable code
> > > > >   usb: dwc2/gadget: do not call disconnect method in pullup
> > > > >   usb: dwc2/gadget: delay enabling irq once hardware is configured properly
> > > > >
> > > > > Robert Baldyga (3):
> > > > >   usb: dwc2/gadget: assign TX FIFO dynamically
> > > > >   usb: dwc2/gadget: disable clock when it's not needed
> > > > >   usb: dwc2/gadget: avoid disabling ep0
> > > > >
> > > > >  drivers/usb/dwc2/core.h   |   3 +
> > > > >  drivers/usb/dwc2/gadget.c | 184 +++++++++++++++++++++++++++-------------------
> > > > >  2 files changed, 111 insertions(+), 76 deletions(-)
> > > >
> > > > For the entire series:
> > > >
> > > > Acked-by: Paul Zimmerman <paulz@synopsys.com>
> > >
> > > Hi Greg,
> > >
> > > I don't see this series from Robert in your tree yet. Is it still in
> > > your queue, or should Robert resend it?
> > 
> > I thought this was coming in from Felipe's tree, sorry.  It's too late
> > for 3.17-rc1, I just sent out those patches to Linus.
> > 
> > If someone wants me to take a patch series, please be explicit and say
> > something like "Greg please take these in your tree", otherwise it is
> > very easy to get lost in my inbox...
> 
> Ah, OK. I guess that's my fault.
> 
> Still, the mainline merge window is open for two weeks, right? Any reason
> why you can't still send this series to Linus? I'd hate to see Robert
> lose out due to my screwup.

Patches had to be in my tree for the week _before_ the merge window
opened, to get testing in linux-next.  It's been that way for years,
sorry.

greg k-h