Revert "mfld-pmu: [REVERT ME] Ignoring UART0/1/2 on CVT platform to avoid BT Hang."

BZ: 28022

Also remove 2 useless CVT defines (USB_DEVICE_ID, SPI1_DEVICE_ID).

This reverts commit 17c26d156ad40a2347c059b7ac74694df501b00e.

Change-Id: I5618142dc1d2a0813e2e93f22fd949e1bb05df23
Signed-off-by: Philippe Skowronski <philippe.skowronski@intel.com>
Reviewed-on: http://android.intel.com:8080/39577
Reviewed-by: Martin, LoicX <loicx.martin@intel.com>
Reviewed-by: Mansoor, Illyas <illyas.mansoor@intel.com>
Tested-by: Chotard, Celine <celine.chotard@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

diff --git a/arch/x86/platform/intel-mid/mfld-pmu.c b/arch/x86/platform/intel-mid/mfld-pmu.c
index 3ba5c5d..7528bdd 100644 (file)
--- a/arch/x86/platform/intel-mid/mfld-pmu.c
+++ b/arch/x86/platform/intel-mid/mfld-pmu.c
@@ -1596,23 +1596,6 @@ err:
 EXPORT_SYMBOL(pmu_set_lss01_to_d0i0_atomic);
 
 /**
-* FIXME:: device_causing_hang - Checks Devices which are causing the platform Hang
-* at boot time on RTPM Enabling.
-*
-*/
-static inline bool device_causing_hang(struct pci_dev *pdev)
-{
-       /*
-        * lss 41  -  causing Hang in platform when Bluetooth
-        * is turned ON/OFF (UART0/1/2 are under lss41).
-       */
-       return ((pdev) && (pdev->device) &&
-                       ((pdev->device == UART0_DEVICE_ID) ||
-                       (pdev->device == UART1_DEVICE_ID) ||
-                       (pdev->device == UART2_DEVICE_ID)));
-}
-
-/**
  * pmu_pci_set_power_state - Callback function is used by all the PCI devices
  *                     for a platform  specific device power on/shutdown.
  *
@@ -1631,14 +1614,6 @@ int __ref pmu_pci_set_power_state(struct pci_dev *pdev, pci_power_t state)
        if (unlikely((!pmu_initialized)))
                return 0;
 
-       /* FIXME:: This is to prevent D0ix requests from USB and SPI1 on CVT.
-        * Platform is getting Hanged when these are sending D0ix requests.
-        */
-       if (__intel_mid_cpu_chip == INTEL_MID_CPU_CHIP_CLOVERVIEW) {
-               if (device_causing_hang(pdev))
-                       return 0;
-       }
-
        /* Try to acquire the scu_ready_sem, if not
         * get blocked, until pmu_sc_irq() releases */
        down(&mid_pmu_cxt->scu_ready_sem);

diff --git a/arch/x86/platform/intel-mid/mfld-pmu.h b/arch/x86/platform/intel-mid/mfld-pmu.h
index f9d37a9..7f95626 100644 (file)
--- a/arch/x86/platform/intel-mid/mfld-pmu.h
+++ b/arch/x86/platform/intel-mid/mfld-pmu.h
@@ -150,13 +150,6 @@
 #define MID_PMU_CLV_DRV_DEV_ID                 0x08EC
 #define PMU_DRV_NAME                           "intel_pmu_driver"
 
-/* FIXME:: Avoid CVT platform to Hang on enabling RTPM*/
-#define USB_DEVICE_ID 0xe006
-#define SPI1_DEVICE_ID 0x8e1
-#define UART0_DEVICE_ID 0x8fc
-#define UART1_DEVICE_ID 0x8fd
-#define UART2_DEVICE_ID 0x8fe
-
 #define MID_PCI_INDEX_HASH_BITS                7 /*size 128*/
 #define MID_PCI_INDEX_HASH_SIZE                (1<<MID_PCI_INDEX_HASH_BITS)
 #define MID_PCI_INDEX_HASH_MASK                (MID_PCI_INDEX_HASH_SIZE-1)