tegra: host: usb: threadsafe variable update

Make sure that the variables which are likely to be accessed by different
threads to be threadsafe. This fixes the issues related to clock,
which are being updated from different threads.

Bug 857667

Original-Change-Id: Id81c1c654b7c7889fcb213e0e00945614b6fca08
Reviewed-on: http://git-master/r/46591
Reviewed-by: Suresh Mangipudi <smangipudi@nvidia.com>
Tested-by: Suresh Mangipudi <smangipudi@nvidia.com>
Reviewed-by: Ramachandrudu Kandhala <rkandhala@nvidia.com>
Rebase-Id: Rc62bfcbd5986f6c38def3d2f46a12543318dd6e2

diff --git a/drivers/usb/host/ehci-tegra.c b/drivers/usb/host/ehci-tegra.c
index 341a05b94a0f8d41545c0aa7b20b28aba528f7dc..71d823b69be6b3ac7d4dc9a3f7feb46138c5252a 100644 (file)
--- a/drivers/usb/host/ehci-tegra.c
+++ b/drivers/usb/host/ehci-tegra.c
@@ -832,14 +832,14 @@ void clk_timer_callback(unsigned long data)
        struct tegra_ehci_hcd *tegra = (struct tegra_ehci_hcd*) data;
        unsigned long flags;
 
-       spin_lock_irqsave(&tegra->ehci->lock, flags);
-
        if (!timer_pending(&tegra->clk_timer)) {
                clk_disable(tegra->emc_clk);
                clk_disable(tegra->sclk_clk);
+               spin_lock_irqsave(&tegra->ehci->lock, flags);
                tegra->clock_enabled = 0;
+               spin_unlock_irqrestore(&tegra->ehci->lock, flags);
        }
-       spin_unlock_irqrestore(&tegra->ehci->lock, flags);
+
 }
 
 static void clk_timer_work_handler(struct work_struct* clk_timer_work) {
@@ -847,23 +847,26 @@ static void clk_timer_work_handler(struct work_struct* clk_timer_work) {
                                                struct tegra_ehci_hcd, clk_timer_work);
        int ret;
        unsigned long flags;
+       bool clock_enabled;
 
        spin_lock_irqsave(&tegra->ehci->lock, flags);
-       if ((!tegra->clock_enabled)) {
+       clock_enabled = tegra->clock_enabled;
+       spin_unlock_irqrestore(&tegra->ehci->lock, flags);
+       if ((!clock_enabled)) {
                ret = mod_timer(&tegra->clk_timer, jiffies + msecs_to_jiffies(2000));
-
                if (ret)
                        pr_err("tegra_ehci_urb_enqueue timer modify failed \n");
                clk_enable(tegra->emc_clk);
                clk_enable(tegra->sclk_clk);
+               spin_lock_irqsave(&tegra->ehci->lock, flags);
                tegra->clock_enabled = 1;
+               spin_unlock_irqrestore(&tegra->ehci->lock, flags);
        } else {
                if (timer_pending(&tegra->clk_timer)) {
                        mod_timer_pending (&tegra->clk_timer, jiffies
                                                + msecs_to_jiffies(2000));
                }
        }
-       spin_unlock_irqrestore(&tegra->ehci->lock, flags);
 }
 
 static int tegra_ehci_urb_enqueue (
@@ -875,9 +878,12 @@ static int tegra_ehci_urb_enqueue (
        int xfertype;
        int transfer_buffer_length;
        pdata = dev_get_drvdata(hcd->self.controller);
+       struct ehci_hcd *ehci = hcd_to_ehci(hcd);
+       unsigned long flags;
 
        xfertype = usb_endpoint_type(&urb->ep->desc);
        transfer_buffer_length = urb->transfer_buffer_length;
+       spin_lock_irqsave(&ehci->lock,flags);
        /* Turn on the USB busy hints */
        switch (xfertype) {
                case USB_ENDPOINT_XFER_INT:
@@ -898,6 +904,7 @@ static int tegra_ehci_urb_enqueue (
                        /* Do nothing special here */
                break;
        }
+       spin_unlock_irqrestore(&ehci->lock,flags);
        return ehci_urb_enqueue(hcd, urb, mem_flags);
 }