misc: tegra-baseband: take wakelock after remote wakeup

Take a wakelock after a remote wakeup event occurs. This is done to
help ensure we do not suspend before the upper layers can handle
incoming data.

Bug 1362837

Change-Id: I7dc4ee43e4443e9ac0635eac179427c2348238c8
Signed-off-by: Neil Patel <neilp@nvidia.com>
Reviewed-on: http://git-master/r/289962
(cherry picked from commit 72fdcc5a7843bf952af79e3aa7020a962935cccb)
Reviewed-on: http://git-master/r/303523
Reviewed-by: Steve Lin <stlin@nvidia.com>

diff --git a/drivers/misc/tegra-baseband/tegra_usb_modem_power.c b/drivers/misc/tegra-baseband/tegra_usb_modem_power.c
index 14baff4b258105882e7a4e2cb3601100903b414b..2a26189cf0b228ed68154b849f3d2dae5a565d79 100644 (file)
--- a/drivers/misc/tegra-baseband/tegra_usb_modem_power.c
+++ b/drivers/misc/tegra-baseband/tegra_usb_modem_power.c
@@ -446,6 +446,27 @@ static int mdm_request_irq(struct tegra_usb_modem *modem,
        return 0;
 }
 
+static void tegra_usb_modem_post_remote_wakeup(void)
+{
+       struct device *dev;
+       struct tegra_usb_modem *modem;
+
+       dev = bus_find_device_by_name(&platform_bus_type, NULL,
+                                       "MDM");
+       if (!dev) {
+               pr_warn("%s unable to find device name\n", __func__);
+               return;
+       }
+
+       modem = dev_get_drvdata(dev);
+
+       mutex_lock(&modem->lock);
+       wake_lock_timeout(&modem->wake_lock, WAKELOCK_TIMEOUT_FOR_REMOTE_WAKE);
+       mutex_unlock(&modem->lock);
+
+       return;
+}
+
 /* load USB host controller */
 static struct platform_device *tegra_usb_host_register(
                                const struct tegra_usb_modem *modem)
@@ -711,6 +732,10 @@ static struct device_attribute *edp_attributes[] = {
        NULL
 };
 
+static struct tegra_usb_phy_platform_ops tegra_usb_modem_platform_ops = {
+       .post_remote_wakeup = tegra_usb_modem_post_remote_wakeup,
+};
+
 static int mdm_init(struct tegra_usb_modem *modem, struct platform_device *pdev)
 {
        struct tegra_usb_modem_power_platform_data *pdata =
@@ -811,6 +836,9 @@ static int mdm_init(struct tegra_usb_modem *modem, struct platform_device *pdev)
                        dev_err(&pdev->dev, "request wake irq error\n");
                        goto error;
                }
+       } else {
+               modem->pdata->tegra_ehci_pdata->ops =
+                                               &tegra_usb_modem_platform_ops;
        }
 
        if (gpio_is_valid(pdata->boot_gpio)) {

diff --git a/include/linux/platform_data/tegra_usb_modem_power.h b/include/linux/platform_data/tegra_usb_modem_power.h
index 1e9d05d3ff90cffd3edb6f73afbe268a7306b8eb..3954f8b9aece334a8ca9b6ff81ec758bc5ae124f 100644 (file)
--- a/include/linux/platform_data/tegra_usb_modem_power.h
+++ b/include/linux/platform_data/tegra_usb_modem_power.h
@@ -50,7 +50,7 @@ struct tegra_usb_modem_power_platform_data {
        int autosuspend_delay;          /* autosuspend delay in milliseconds */
        int short_autosuspend_delay;    /* short autosuspend delay in ms */
        const struct platform_device *tegra_ehci_device; /* USB host device */
-       const struct tegra_usb_platform_data *tegra_ehci_pdata;
+       struct tegra_usb_platform_data *tegra_ehci_pdata;
        struct edp_client *modem_boot_edp_client;
        char *edp_manager_name;
        unsigned int i_breach_ppm;