From: qi duan <qi.duan@amlogic.com>
Date: Thu, 23 Aug 2018 08:56:35 +0000 (+0800)
Subject: USB: clean the coverity errors of usb module
X-Git-Tag: khadas-vims-v0.9.6-release~1491
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=31ee44e4b244c5ca218d601cc98719d46232ac4e;p=platform%2Fkernel%2Flinux-amlogic.git

USB: clean the coverity errors of usb module

PD#166793: code defects in usb part

Change-Id: I196d293c9e0147c60dd493fa36f896996bafb312
Signed-off-by: qi duan <qi.duan@amlogic.com>
---

diff --git a/drivers/amlogic/usb/dwc_otg/310/dwc_otg_attr.c b/drivers/amlogic/usb/dwc_otg/310/dwc_otg_attr.c
index 8680a7f..e1aafd7 100644
--- a/drivers/amlogic/usb/dwc_otg/310/dwc_otg_attr.c
+++ b/drivers/amlogic/usb/dwc_otg/310/dwc_otg_attr.c
@@ -673,8 +673,11 @@ static ssize_t peri_sleepm_store(struct device *_dev,
 	uint32_t in = simple_strtoul(buf, NULL, 16);
 
 	s_clock_name = of_get_property(pdev->dev.of_node, "clock-src", NULL);
+	if (!s_clock_name)
+		return 0;
 	cpu_type = of_get_property(pdev->dev.of_node, "cpu-type", NULL);
-
+	if (!cpu_type)
+		return 0;
 	if (!in) {
 		clk_resume_usb(pdev, s_clock_name,
 			(unsigned long)(otg_dev->core_if->usb_peri_reg),
diff --git a/drivers/amlogic/usb/dwc_otg/310/dwc_otg_cil.c b/drivers/amlogic/usb/dwc_otg/310/dwc_otg_cil.c
index b21d3a8..4601a813 100644
--- a/drivers/amlogic/usb/dwc_otg/310/dwc_otg_cil.c
+++ b/drivers/amlogic/usb/dwc_otg/310/dwc_otg_cil.c
@@ -1062,8 +1062,7 @@ int restore_essential_regs(dwc_otg_core_if_t *core_if, int rmode, int is_host)
 				hcfg.d32);
 
 		/* Load restore values for [31:14] bits */
-		pcgcctl.d32 = gr->pcgcctl_local & 0xffffc000;
-		pcgcctl.d32 = gr->pcgcctl_local | 0x00020000;
+		pcgcctl.d32 = ((gr->pcgcctl_local & 0xffffc000) | 0x00020000);
 
 		if (rmode)
 			pcgcctl.b.restoremode = 1;
@@ -1071,8 +1070,7 @@ int restore_essential_regs(dwc_otg_core_if_t *core_if, int rmode, int is_host)
 		dwc_udelay(10);
 
 		/* Load restore values for [31:14] bits and set EssRegRestored bit */
-		pcgcctl.d32 = gr->pcgcctl_local | 0xffffc000;
-		pcgcctl.d32 = gr->pcgcctl_local & 0xffffc000;
+		pcgcctl.d32 = ((gr->pcgcctl_local | 0xffffc000) & 0xffffc000);
 		pcgcctl.b.ess_reg_restored = 1;
 		if (rmode)
 			pcgcctl.b.restoremode = 1;
@@ -1083,8 +1081,7 @@ int restore_essential_regs(dwc_otg_core_if_t *core_if, int rmode, int is_host)
 		DWC_WRITE_REG32(&core_if->dev_if->dev_global_regs->dcfg, dcfg.d32);
 
 		/* Load restore values for [31:14] bits */
-		pcgcctl.d32 = gr->pcgcctl_local & 0xffffc000;
-		pcgcctl.d32 = gr->pcgcctl_local | 0x00020000;
+		pcgcctl.d32 = ((gr->pcgcctl_local & 0xffffc000) | 0x00020000);
 		if (!rmode)
 			pcgcctl.d32 |= 0x208;
 
@@ -1092,8 +1089,7 @@ int restore_essential_regs(dwc_otg_core_if_t *core_if, int rmode, int is_host)
 		dwc_udelay(10);
 
 		/* Load restore values for [31:14] bits */
-		pcgcctl.d32 = gr->pcgcctl_local & 0xffffc000;
-		pcgcctl.d32 = gr->pcgcctl_local | 0x00020000;
+		pcgcctl.d32 = ((gr->pcgcctl_local & 0xffffc000) | 0x00020000);
 		pcgcctl.b.ess_reg_restored = 1;
 		if (!rmode)
 			pcgcctl.d32 |= 0x208;
@@ -2700,6 +2696,8 @@ void hc_xfer_timeout(void *ptr)
 	if (ptr)
 		xfer_info = (hc_xfer_info_t *) ptr;
 
+	if (!xfer_info)
+		return;
 	if (!xfer_info->hc) {
 		DWC_ERROR("xfer_info->hc = %p\n", xfer_info->hc);
 		return;
@@ -2728,6 +2726,8 @@ void ep_xfer_timeout(void *ptr)
 	if (ptr)
 		xfer_info = (ep_xfer_info_t *) ptr;
 
+	if (!xfer_info)
+		return;
 	if (!xfer_info->ep) {
 		DWC_ERROR("xfer_info->ep = %p\n", xfer_info->ep);
 		return;
@@ -3364,10 +3364,7 @@ void dwc_otg_ep_activate(dwc_otg_core_if_t *core_if, dwc_ep_t *ep)
 		depctl.b.eptype = ep->type;
 		depctl.b.txfnum = ep->tx_fifo_num;
 
-		if (ep->type == DWC_OTG_EP_TYPE_ISOC)
-			depctl.b.setd0pid = 1;
-		else
-			depctl.b.setd0pid = 1;
+		depctl.b.setd0pid = 1;
 
 		depctl.b.usbactep = 1;
 
@@ -7129,7 +7126,7 @@ void dwc_otg_set_hirdthresh(dwc_otg_core_if_t *core_if, uint32_t val)
 {
 	glpmcfg_data_t lpmcfg;
 
-	if (DWC_OTG_PARAM_TEST(val, 0, 15)) {
+	if (val > 15) {
 		DWC_WARN("Wrong valaue for hird_thres\n");
 		DWC_WARN("hird_thres must be 0-f\n");
 		return ;
diff --git a/drivers/amlogic/usb/dwc_otg/310/dwc_otg_cil_intr.c b/drivers/amlogic/usb/dwc_otg/310/dwc_otg_cil_intr.c
index 3851c68..760c793 100644
--- a/drivers/amlogic/usb/dwc_otg/310/dwc_otg_cil_intr.c
+++ b/drivers/amlogic/usb/dwc_otg/310/dwc_otg_cil_intr.c
@@ -890,7 +890,7 @@ static int32_t dwc_otg_handle_pwrdn_session_change(dwc_otg_core_if_t *core_if)
 			return 1;
 		}
 
-		if ((otg_cap_param != DWC_OTG_CAP_PARAM_HNP_SRP_CAPABLE ||
+		if ((otg_cap_param != DWC_OTG_CAP_PARAM_HNP_SRP_CAPABLE &&
 			 otg_cap_param != DWC_OTG_CAP_PARAM_SRP_ONLY_CAPABLE) &&
 			gpwrdn.b.bsessvld == 0) {
 			/* Save gpwrdn register for further usage if stschng interrupt */
@@ -977,7 +977,7 @@ static int32_t dwc_otg_handle_pwrdn_session_change(dwc_otg_core_if_t *core_if)
  */
 static uint32_t dwc_otg_handle_pwrdn_stschng_intr(dwc_otg_device_t *otg_dev)
 {
-	int retval;
+	int retval = 0;
 	gpwrdn_data_t gpwrdn = {.d32 = 0 };
 	gpwrdn_data_t gpwrdn_temp = {.d32 = 0 };
 	dwc_otg_core_if_t *core_if = otg_dev->core_if;
@@ -1693,12 +1693,12 @@ int32_t dwc_otg_handle_common_intr(void *dev)
 					/* The core will be in ON STATE */
 					core_if->lx_state = DWC_OTG_L0;
 					core_if->xhib = 0;
-
-					DWC_SPINUNLOCK(core_if->lock);
+					if (core_if->lock)
+						DWC_SPINUNLOCK(core_if->lock);
 					if (core_if->pcd_cb && core_if->pcd_cb->resume_wakeup)
 						core_if->pcd_cb->resume_wakeup(core_if->pcd_cb_p);
-
-					DWC_SPINLOCK(core_if->lock);
+					if (core_if->lock)
+						DWC_SPINLOCK(core_if->lock);
 				}
 
 			gintsts.b.restoredone = 1;
diff --git a/drivers/amlogic/usb/dwc_otg/310/dwc_otg_driver.c b/drivers/amlogic/usb/dwc_otg/310/dwc_otg_driver.c
index 042b89f..d4ea816 100644
--- a/drivers/amlogic/usb/dwc_otg/310/dwc_otg_driver.c
+++ b/drivers/amlogic/usb/dwc_otg/310/dwc_otg_driver.c
@@ -1094,12 +1094,14 @@ static int dwc_otg_driver_probe(struct platform_device *pdev)
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	if (!res) {
 		dev_err(&pdev->dev, "missing memory resource\n");
+		DWC_FREE(dwc_otg_device);
 		return -ENODEV;
 	}
 
 	ctrl_reg_addr = devm_ioremap_nocache(&pdev->dev, res->start, resource_size(res));
 	if (!ctrl_reg_addr) {
 		dev_err(&pdev->dev, "ioremap failed\n");
+		DWC_FREE(dwc_otg_device);
 		return -ENOMEM;
 	}
 
@@ -1139,6 +1141,7 @@ static int dwc_otg_driver_probe(struct platform_device *pdev)
 	if (clk_enable_usb(pdev, s_clock_name,
 		(unsigned long)phy_reg_addr, cpu_type, controller_type)) {
 		dev_err(&pdev->dev, "Set dwc_otg PHY clock failed!\n");
+		DWC_FREE(dwc_otg_device);
 		return -ENODEV;
 	}
 
@@ -1431,8 +1434,11 @@ static int dwc2_suspend(struct device *dev)
 	const char *cpu_type = NULL;
 
 	s_clock_name = of_get_property(pdev->dev.of_node, "clock-src", NULL);
+	if (!s_clock_name)
+		return 0;
 	cpu_type = of_get_property(pdev->dev.of_node, "cpu-type", NULL);
-
+	if (!cpu_type)
+		return 0;
 	clk_suspend_usb(pdev, s_clock_name,
 			(unsigned long)(g_dwc_otg_device[pdev->id]->
 				core_if->usb_peri_reg), cpu_type);
@@ -1447,8 +1453,11 @@ static int dwc2_resume(struct device *dev)
 	const char *cpu_type = NULL;
 
 	s_clock_name = of_get_property(pdev->dev.of_node, "clock-src", NULL);
+	if (!s_clock_name)
+		return 0;
 	cpu_type = of_get_property(pdev->dev.of_node, "cpu-type", NULL);
-
+	if (!cpu_type)
+		return 0;
 	clk_resume_usb(pdev, s_clock_name,
 			(unsigned long)(g_dwc_otg_device[pdev->id]->
 				core_if->usb_peri_reg), cpu_type);
diff --git a/drivers/amlogic/usb/dwc_otg/310/dwc_otg_hcd.h b/drivers/amlogic/usb/dwc_otg/310/dwc_otg_hcd.h
index c17ca95..5703235 100644
--- a/drivers/amlogic/usb/dwc_otg/310/dwc_otg_hcd.h
+++ b/drivers/amlogic/usb/dwc_otg/310/dwc_otg_hcd.h
@@ -680,7 +680,11 @@ static inline void dwc_otg_hcd_qtd_remove_and_free(dwc_otg_hcd_t *hcd,
 	dwc_otg_hcd_urb_t *urb;
 	int pipe_type;
 
+	if (!qtd)
+		return;
 	urb = qtd->urb;
+	if (!urb)
+		return;
 	pipe_type = dwc_otg_hcd_get_pipe_type(&urb->pipe_info);
 	dwc_otg_hcd_qtd_remove(hcd, qtd, qh);
 	dwc_otg_hcd_qtd_free(qtd);
diff --git a/drivers/amlogic/usb/dwc_otg/310/dwc_otg_hcd_ddma.c b/drivers/amlogic/usb/dwc_otg/310/dwc_otg_hcd_ddma.c
index b373e9c7..75269e4 100644
--- a/drivers/amlogic/usb/dwc_otg/310/dwc_otg_hcd_ddma.c
+++ b/drivers/amlogic/usb/dwc_otg/310/dwc_otg_hcd_ddma.c
@@ -84,7 +84,7 @@ static int desc_list_alloc(dwc_otg_qh_t *qh)
 	if (!qh->desc_list) {
 		retval = -DWC_E_NO_MEMORY;
 		DWC_ERROR("%s: DMA descriptor list allocation failed\n", __func__);
-
+		return retval;
 	}
 
 	dwc_memset(qh->desc_list, 0x00,
@@ -129,6 +129,7 @@ static int frame_list_alloc(dwc_otg_hcd_t *hcd)
 	if (!hcd->frame_list) {
 		retval = -DWC_E_NO_MEMORY;
 		DWC_ERROR("%s: Frame List allocation failed\n", __func__);
+		return retval;
 	}
 
 	dwc_memset(hcd->frame_list, 0x00, 4 * MAX_FRLIST_EN_NUM);
@@ -975,9 +976,7 @@ static void complete_non_isoc_xfer_ddma(dwc_otg_hcd_t *hcd,
 				hcd->fops->complete(hcd, urb->priv, urb,
 						    urb->status);
 				dwc_otg_hcd_qtd_remove_and_free(hcd, qtd, qh);
-
-				if (failed)
-					goto stop_scan;
+				goto stop_scan;
 			} else if (qh->ep_type == UE_CONTROL) {
 				if (qtd->control_phase == DWC_OTG_CONTROL_SETUP) {
 					if (urb->length > 0)
@@ -1013,8 +1012,10 @@ stop_scan:
 		 */
 		if (halt_status == DWC_OTG_HC_XFER_STALL)
 			qh->data_toggle = DWC_OTG_HC_PID_DATA0;
-		else
-			dwc_otg_hcd_save_data_toggle(hc, hc_regs, qtd);
+		else {
+			if (qtd)
+				dwc_otg_hcd_save_data_toggle(hc, hc_regs, qtd);
+		}
 	}
 
 	if (halt_status == DWC_OTG_HC_XFER_COMPLETE) {
diff --git a/drivers/amlogic/usb/dwc_otg/310/dwc_otg_hcd_linux.c b/drivers/amlogic/usb/dwc_otg/310/dwc_otg_hcd_linux.c
index 43a9c70..2401e27 100644
--- a/drivers/amlogic/usb/dwc_otg/310/dwc_otg_hcd_linux.c
+++ b/drivers/amlogic/usb/dwc_otg/310/dwc_otg_hcd_linux.c
@@ -344,7 +344,7 @@ int hcd_init(struct platform_device *pdev)
 
 	int retval = 0;
 	int irq = 0;
-
+	int tt = 0;
 	DWC_DEBUGPL(DBG_HCD, "DWC OTG HCD INIT\n");
 
 	/*
@@ -353,14 +353,17 @@ int hcd_init(struct platform_device *pdev)
 	 */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)
 	hcd = usb_create_hcd(&dwc_otg_hc_driver, &pdev->dev, pdev->dev.bus_id);
+	tt = 0;
 #else
 	hcd = usb_create_hcd(&dwc_otg_hc_driver, &pdev->dev, dev_name(&pdev->dev));
-	hcd->has_tt = 1;
+	tt = 1;
 #endif
 	if (!hcd) {
 		retval = -ENOMEM;
 		goto error1;
 	}
+	hcd->has_tt = tt;
+
 	hcd->regs = otg_dev->os_dep.base;
 	set_bit(HCD_FLAG_DWC_OTG, &hcd->flags);
 
@@ -569,9 +572,6 @@ static void dump_urb_info(struct urb *urb, char *fn_name)
 		case PIPE_ISOCHRONOUS:
 			pipetype = "ISOCHRONOUS";
 			break;
-		default:
-			pipetype = "UNKNOWN";
-			break;
 		};
 		pipetype;
 	}));
@@ -676,8 +676,6 @@ static int urb_enqueue(struct usb_hcd *hcd,
 	case PIPE_INTERRUPT:
 		ep_type = USB_ENDPOINT_XFER_INT;
 		break;
-	default:
-		DWC_WARN("Wrong ep type\n");
 	}
 
 	dwc_otg_urb = dwc_otg_hcd_urb_alloc(dwc_otg_hcd,
diff --git a/drivers/amlogic/usb/dwc_otg/310/dwc_otg_hcd_queue.c b/drivers/amlogic/usb/dwc_otg/310/dwc_otg_hcd_queue.c
index 3dd3ba7..d3af1b0 100644
--- a/drivers/amlogic/usb/dwc_otg/310/dwc_otg_hcd_queue.c
+++ b/drivers/amlogic/usb/dwc_otg/310/dwc_otg_hcd_queue.c
@@ -88,7 +88,7 @@ void dwc_otg_hcd_qh_free(dwc_otg_hcd_t *hcd, dwc_otg_qh_t *qh)
 
 static uint32_t calc_bus_time(int speed, int is_in, int is_isoc, int bytecount)
 {
-	unsigned long retval;
+	long retval;
 
 	switch (speed) {
 	case USB_SPEED_HIGH:
@@ -138,6 +138,7 @@ static uint32_t calc_bus_time(int speed, int is_in, int is_isoc, int bytecount)
 	default:
 		DWC_WARN("Unknown device speed\n");
 		retval = -1;
+		return retval;
 	}
 
 	return DWC_NS_TO_US(retval);
diff --git a/drivers/amlogic/usb/dwc_otg/310/dwc_otg_pcd.c b/drivers/amlogic/usb/dwc_otg/310/dwc_otg_pcd.c
index a240ef6..4095fb3 100644
--- a/drivers/amlogic/usb/dwc_otg/310/dwc_otg_pcd.c
+++ b/drivers/amlogic/usb/dwc_otg/310/dwc_otg_pcd.c
@@ -1397,7 +1397,7 @@ dwc_otg_pcd_t *dwc_otg_pcd_init(dwc_otg_core_if_t *core_if)
 	return pcd;
 #ifdef DWC_UTE_CFI
 fail:
-#endif
+
 	if (pcd->setup_pkt)
 		DWC_FREE(pcd->setup_pkt);
 	if (pcd->status_buf)
@@ -1409,6 +1409,7 @@ fail:
 	if (pcd)
 		DWC_FREE(pcd);
 	return NULL;
+#endif
 
 }
 
@@ -1609,7 +1610,7 @@ int dwc_otg_pcd_ep_enable(dwc_otg_pcd_t *pcd,
 	num = UE_GET_ADDR(desc->bEndpointAddress);
 	dir = UE_GET_DIR(desc->bEndpointAddress);
 
-	if (!desc->wMaxPacketSize) {
+	if (UGETW(desc->wMaxPacketSize) == 0) {
 		DWC_WARN("bad maxpacketsize\n");
 		retval = -DWC_E_INVALID;
 		goto out;
@@ -2303,6 +2304,7 @@ int dwc_otg_pcd_ep_queue(dwc_otg_pcd_t *pcd, void *ep_handle,
 				DWC_DEBUGPL(DBG_ANY, "ep0: odd state %d\n",
 					    pcd->ep0state);
 				DWC_SPINUNLOCK_IRQRESTORE(pcd->lock, flags);
+				DWC_FREE(req);
 				return -DWC_E_SHUTDOWN;
 			}
 
diff --git a/drivers/amlogic/usb/dwc_otg/310/dwc_otg_pcd_linux.c b/drivers/amlogic/usb/dwc_otg/310/dwc_otg_pcd_linux.c
index 868281f..72276e79 100644
--- a/drivers/amlogic/usb/dwc_otg/310/dwc_otg_pcd_linux.c
+++ b/drivers/amlogic/usb/dwc_otg/310/dwc_otg_pcd_linux.c
@@ -364,10 +364,11 @@ static int ep_queue(struct usb_ep *usb_ep, struct usb_request *usb_req,
 	usb_req->actual = 0;
 
 	ep = ep_from_handle(pcd, usb_ep);
-	if (ep == NULL)
+	if (ep == NULL) {
 		is_isoc_ep = 0;
-	else
-		is_isoc_ep = (ep->dwc_ep.type == DWC_OTG_EP_TYPE_ISOC) ? 1 : 0;
+		return -EINVAL;
+	}
+	is_isoc_ep = (ep->dwc_ep.type == DWC_OTG_EP_TYPE_ISOC) ? 1 : 0;
 
 	if (GET_CORE_IF(pcd)->dma_enable) {
 		struct device *dev = &gadget_wrapper->pcd->otg_dev->os_dep.pldev->dev;
diff --git a/drivers/amlogic/usb/phy/phy-aml-new-usb2-v2.c b/drivers/amlogic/usb/phy/phy-aml-new-usb2-v2.c
index cecb808..a77d5e2 100644
--- a/drivers/amlogic/usb/phy/phy-aml-new-usb2-v2.c
+++ b/drivers/amlogic/usb/phy/phy-aml-new-usb2-v2.c
@@ -200,7 +200,7 @@ static int amlogic_new_usb2_probe(struct platform_device *pdev)
 	int portnum = 0;
 	const void *prop;
 	int i = 0;
-	u32 retval;
+	int retval;
 	u32 pll_setting[8];
 
 	prop = of_get_property(dev->of_node, "portnum", NULL);
diff --git a/drivers/amlogic/usb/phy/phy-aml-new-usb3-v2.c b/drivers/amlogic/usb/phy/phy-aml-new-usb3-v2.c
index 7fa1afd..3f360b5 100644
--- a/drivers/amlogic/usb/phy/phy-aml-new-usb3-v2.c
+++ b/drivers/amlogic/usb/phy/phy-aml-new-usb3-v2.c
@@ -76,10 +76,10 @@ static void set_usb_vbus_power
 {
 	if (is_power_on)
 		/*set vbus on by gpio*/
-		gpiod_direction_output(usb_gd, is_power_on);
+		gpiod_direction_output(usb_gd, 1);
 	else
 		/*set vbus off by gpio first*/
-		gpiod_direction_output(usb_gd, is_power_on);
+		gpiod_direction_output(usb_gd, 0);
 }
 
 static void amlogic_new_set_vbus_power
diff --git a/drivers/amlogic/usb/phy/phy-aml-new-usb3.c b/drivers/amlogic/usb/phy/phy-aml-new-usb3.c
index 31f38d7..89cb303 100644
--- a/drivers/amlogic/usb/phy/phy-aml-new-usb3.c
+++ b/drivers/amlogic/usb/phy/phy-aml-new-usb3.c
@@ -75,10 +75,10 @@ static void set_usb_vbus_power
 {
 	if (is_power_on)
 		/*set vbus on by gpio*/
-		gpiod_direction_output(usb_gd, is_power_on);
+		gpiod_direction_output(usb_gd, 1);
 	else
 		/*set vbus off by gpio first*/
-		gpiod_direction_output(usb_gd, is_power_on);
+		gpiod_direction_output(usb_gd, 0);
 }
 
 static void amlogic_new_set_vbus_power