[PATCH linux-next v3 1/4] usb: gadget: udc: atmel: Check fifo configuration values against device tree

[cristian.birsan]

From: Cristian Birsan <cristian.bir...@microchip.com>

Check fifo configuration values against device tree values for endpoint fifo
in auto configuration mode (fifo_mode=0).

Signed-off-by: Cristian Birsan <cristian.bir...@microchip.com>
Acked-by: Nicolas Ferre <nicolas.fe...@microchip.com>
---
 drivers/usb/gadget/udc/atmel_usba_udc.c | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/gadget/udc/atmel_usba_udc.c 
b/drivers/usb/gadget/udc/atmel_usba_udc.c
index 2035906b..a98734a 100644
--- a/drivers/usb/gadget/udc/atmel_usba_udc.c
+++ b/drivers/usb/gadget/udc/atmel_usba_udc.c
@@ -2118,14 +2118,34 @@ static struct usba_ep * atmel_udc_of_init(struct 
platform_device *pdev,
                        dev_err(&pdev->dev, "of_probe: fifo-size error(%d)\n", 
ret);
                        goto err;
                }
-               ep->fifo_size = fifo_mode ? udc->fifo_cfg[i].fifo_size : val;
+               if (fifo_mode) {
+                       if (val < udc->fifo_cfg[i].fifo_size) {
+                               dev_warn(&pdev->dev,
+                                        "Using max fifo-size value from DT\n");
+                               ep->fifo_size = val;
+                       } else {
+                               ep->fifo_size = udc->fifo_cfg[i].fifo_size;
+                       }
+               } else {
+                       ep->fifo_size = val;
+               }
 
                ret = of_property_read_u32(pp, "atmel,nb-banks", &val);
                if (ret) {
                        dev_err(&pdev->dev, "of_probe: nb-banks error(%d)\n", 
ret);
                        goto err;
                }
-               ep->nr_banks = fifo_mode ? udc->fifo_cfg[i].nr_banks : val;
+               if (fifo_mode) {
+                       if (val < udc->fifo_cfg[i].nr_banks) {
+                               dev_warn(&pdev->dev,
+                                        "Using max nb-banks value from DT\n");
+                               ep->nr_banks = val;
+                       } else {
+                               ep->nr_banks = udc->fifo_cfg[i].nr_banks;
+                       }
+               } else {
+                       ep->nr_banks = val;
+               }
 
                ep->can_dma = of_property_read_bool(pp, "atmel,can-dma");
                ep->can_isoc = of_property_read_bool(pp, "atmel,can-isoc");
-- 
2.7.4

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