dlp_ctrl.c: Adding support for NOP command reception

BZ: 33872

This simple patch is adding support for NOP command reception. It is simply
tracing the NOP command reception and dropping it. Nothing else shall be done
in this case.

It is also reverting the patch preventing the ACWAKE to toggle, and hence the
PM to enter low power modes, in the HSI controller driver.

Change-Id: I113bdfce0dd454e41de88308dc704e1ec9257e88
Signed-off-by: Olivier Stoltz Douchet <olivierx.stoltz-douchet@intel.com>
Reviewed-on: http://android.intel.com:8080/46567
Reviewed-by: Roulliere, Pierre <pierre.roulliere@intel.com>
Reviewed-by: Pillet, VincentX <vincentx.pillet@intel.com>
Reviewed-by: Predon, Frederic <frederic.predon@intel.com>
Reviewed-by: Lebsir, SamiX <samix.lebsir@intel.com>
Tested-by: Lebsir, SamiX <samix.lebsir@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

diff --git a/drivers/hsi/clients/dlp_ctrl.c b/drivers/hsi/clients/dlp_ctrl.c
index fe51302..79d00e7 100644 (file)
--- a/drivers/hsi/clients/dlp_ctrl.c
+++ b/drivers/hsi/clients/dlp_ctrl.c
@@ -600,6 +600,13 @@ static void dlp_ctrl_complete_rx(struct hsi_msg *msg)
        ch_ctx = dlp_drv.channels[hsi_channel];
 
        switch (params.id) {
+
+       case DLP_CMD_NOP:
+               /* Trace then drop the nop command */
+               PTRACE_NO_FUNC("Gotta nop: 0x40%02X%02X%02X\n",
+                               params.data1, params.data2, params.data3);
+               break;
+
        case DLP_CMD_CREDITS:
                if (msg_complete) {
                        unsigned long flags;

diff --git a/drivers/hsi/controllers/intel_mid_hsi.c b/drivers/hsi/controllers/intel_mid_hsi.c
index e0eac6b..b1cfc72 100644 (file)
--- a/drivers/hsi/controllers/intel_mid_hsi.c
+++ b/drivers/hsi/controllers/intel_mid_hsi.c
@@ -35,11 +35,7 @@
 
 /* Set the following to prevent ACWAKE toggling (for debugging). This also
  * disbales power management */
-#ifdef CONFIG_HSI_DLP
-#define PREVENT_ACWAKE_TOGGLING
-#else
 #undef PREVENT_ACWAKE_TOGGLING
-#endif
 
 /* Set the following to allow software workaround of the DMA link listing */
 #define USE_SOFWARE_WORKAROUND_FOR_DMA_LLI