PCI: pciehp: ignore undefined bit in link status register
[safe/jmp/linux-2.6] / drivers / pci / hotplug / pciehp_hpc.c
index 6d3f580..22b88cb 100644 (file)
 #include <linux/timer.h>
 #include <linux/pci.h>
 #include <linux/interrupt.h>
+#include <linux/time.h>
 
 #include "../pci.h"
 #include "pciehp.h"
-#ifdef DEBUG
-#define DBG_K_TRACE_ENTRY      ((unsigned int)0x00000001)      /* On function entry */
-#define DBG_K_TRACE_EXIT       ((unsigned int)0x00000002)      /* On function exit */
-#define DBG_K_INFO             ((unsigned int)0x00000004)      /* Info messages */
-#define DBG_K_ERROR            ((unsigned int)0x00000008)      /* Error messages */
-#define DBG_K_TRACE            (DBG_K_TRACE_ENTRY|DBG_K_TRACE_EXIT)
-#define DBG_K_STANDARD         (DBG_K_INFO|DBG_K_ERROR|DBG_K_TRACE)
-/* Redefine this flagword to set debug level */
-#define DEBUG_LEVEL            DBG_K_STANDARD
-
-#define DEFINE_DBG_BUFFER     char __dbg_str_buf[256];
-
-#define DBG_PRINT( dbg_flags, args... )              \
-       do {                                             \
-         if ( DEBUG_LEVEL & ( dbg_flags ) )             \
-         {                                              \
-           int len;                                     \
-           len = sprintf( __dbg_str_buf, "%s:%d: %s: ", \
-                 __FILE__, __LINE__, __FUNCTION__ );    \
-           sprintf( __dbg_str_buf + len, args );        \
-           printk( KERN_NOTICE "%s\n", __dbg_str_buf ); \
-         }                                              \
-       } while (0)
-
-#define DBG_ENTER_ROUTINE      DBG_PRINT (DBG_K_TRACE_ENTRY, "%s", "[Entry]");
-#define DBG_LEAVE_ROUTINE      DBG_PRINT (DBG_K_TRACE_EXIT, "%s", "[Exit]");
-#else
-#define DEFINE_DBG_BUFFER
-#define DBG_ENTER_ROUTINE
-#define DBG_LEAVE_ROUTINE
-#endif                         /* DEBUG */
+
+static atomic_t pciehp_num_controllers = ATOMIC_INIT(0);
 
 struct ctrl_reg {
        u8 cap_id;
@@ -105,34 +77,30 @@ enum ctrl_offsets {
        ROOTCTRL        =       offsetof(struct ctrl_reg, root_ctrl),
        ROOTSTATUS      =       offsetof(struct ctrl_reg, root_status),
 };
-static int pcie_cap_base = 0;          /* Base of the PCI Express capability item structure */ 
-
-#define PCIE_CAP_ID(cb)        ( cb + PCIECAPID )
-#define NXT_CAP_PTR(cb)        ( cb + NXTCAPPTR )
-#define CAP_REG(cb)    ( cb + CAPREG )
-#define DEV_CAP(cb)    ( cb + DEVCAP )
-#define DEV_CTRL(cb)   ( cb + DEVCTRL )
-#define DEV_STATUS(cb) ( cb + DEVSTATUS )
-#define LNK_CAP(cb)    ( cb + LNKCAP )
-#define LNK_CTRL(cb)   ( cb + LNKCTRL )
-#define LNK_STATUS(cb) ( cb + LNKSTATUS )
-#define SLOT_CAP(cb)   ( cb + SLOTCAP )
-#define SLOT_CTRL(cb)  ( cb + SLOTCTRL )
-#define SLOT_STATUS(cb)        ( cb + SLOTSTATUS )
-#define ROOT_CTRL(cb)  ( cb + ROOTCTRL )
-#define ROOT_STATUS(cb)        ( cb + ROOTSTATUS )
-
-#define hp_register_read_word(pdev, reg , value)               \
-       pci_read_config_word(pdev, reg, &value)
-
-#define hp_register_read_dword(pdev, reg , value)              \
-       pci_read_config_dword(pdev, reg, &value)
-#define hp_register_write_word(pdev, reg , value)              \
-       pci_write_config_word(pdev, reg, value)
-
-#define hp_register_dwrite_word(pdev, reg , value)             \
-       pci_write_config_dword(pdev, reg, value)
+
+static inline int pciehp_readw(struct controller *ctrl, int reg, u16 *value)
+{
+       struct pci_dev *dev = ctrl->pci_dev;
+       return pci_read_config_word(dev, ctrl->cap_base + reg, value);
+}
+
+static inline int pciehp_readl(struct controller *ctrl, int reg, u32 *value)
+{
+       struct pci_dev *dev = ctrl->pci_dev;
+       return pci_read_config_dword(dev, ctrl->cap_base + reg, value);
+}
+
+static inline int pciehp_writew(struct controller *ctrl, int reg, u16 value)
+{
+       struct pci_dev *dev = ctrl->pci_dev;
+       return pci_write_config_word(dev, ctrl->cap_base + reg, value);
+}
+
+static inline int pciehp_writel(struct controller *ctrl, int reg, u32 value)
+{
+       struct pci_dev *dev = ctrl->pci_dev;
+       return pci_write_config_dword(dev, ctrl->cap_base + reg, value);
+}
 
 /* Field definitions in PCI Express Capabilities Register */
 #define CAP_VER                        0x000F
@@ -157,14 +125,15 @@ static int pcie_cap_base = 0;             /* Base of the PCI Express capability item struct
 /* Field definitions in Link Capabilities Register */
 #define MAX_LNK_SPEED          0x000F
 #define MAX_LNK_WIDTH          0x03F0
+#define LINK_ACTIVE_REPORTING  0x00100000
 
 /* Link Width Encoding */
 #define LNK_X1         0x01
 #define LNK_X2         0x02
-#define LNK_X4         0x04    
+#define LNK_X4         0x04
 #define LNK_X8         0x08
 #define LNK_X12                0x0C
-#define LNK_X16                0x10    
+#define LNK_X16                0x10
 #define LNK_X32                0x20
 
 /*Field definitions of Link Status Register */
@@ -173,6 +142,7 @@ static int pcie_cap_base = 0;               /* Base of the PCI Express capability item struct
 #define LNK_TRN_ERR    0x0400
 #define        LNK_TRN         0x0800
 #define SLOT_CLK_CONF  0x1000
+#define LINK_ACTIVE    0x2000
 
 /* Field definitions in Slot Capabilities Register */
 #define ATTN_BUTTN_PRSN        0x00000001
@@ -196,6 +166,7 @@ static int pcie_cap_base = 0;               /* Base of the PCI Express capability item struct
 #define ATTN_LED_CTRL                  0x00C0
 #define PWR_LED_CTRL                   0x0300
 #define PWR_CTRL                       0x0400
+#define EMI_CTRL                       0x0800
 
 /* Attention indicator and Power indicator states */
 #define LED_ON         0x01
@@ -206,6 +177,10 @@ static int pcie_cap_base = 0;              /* Base of the PCI Express capability item struct
 #define POWER_ON       0
 #define POWER_OFF      0x0400
 
+/* EMI Status defines */
+#define EMI_DISENGAGED 0
+#define EMI_ENGAGED    1
+
 /* Field definitions in Slot Status Register */
 #define ATTN_BUTTN_PRESSED     0x0001
 #define PWR_FAULT_DETECTED     0x0002
@@ -214,152 +189,260 @@ static int pcie_cap_base = 0;           /* Base of the PCI Express capability item struct
 #define CMD_COMPLETED          0x0010
 #define MRL_STATE              0x0020
 #define PRSN_STATE             0x0040
+#define EMI_STATE              0x0080
+#define EMI_STATUS_BIT         7
 
-static spinlock_t hpc_event_lock;
-
-DEFINE_DBG_BUFFER              /* Debug string buffer for entire HPC defined here */
-static struct php_ctlr_state_s *php_ctlr_list_head; /* HPC state linked list */
-static int ctlr_seq_num = 0;   /* Controller sequence # */
-static spinlock_t list_lock;
-
-static irqreturn_t pcie_isr(int IRQ, void *dev_id);
-
-static void start_int_poll_timer(struct php_ctlr_state_s *php_ctlr, int seconds);
+static irqreturn_t pcie_isr(int irq, void *dev_id);
+static void start_int_poll_timer(struct controller *ctrl, int sec);
 
 /* This is the interrupt polling timeout function. */
-static void int_poll_timeout(unsigned long lphp_ctlr)
+static void int_poll_timeout(unsigned long data)
 {
-       struct php_ctlr_state_s *php_ctlr = (struct php_ctlr_state_s *)lphp_ctlr;
-
-       DBG_ENTER_ROUTINE
-
-       if ( !php_ctlr ) {
-               err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
-               return;
-       }
+       struct controller *ctrl = (struct controller *)data;
 
        /* Poll for interrupt events.  regs == NULL => polling */
-       pcie_isr( 0, (void *)php_ctlr );
-
-       init_timer(&php_ctlr->int_poll_timer);
+       pcie_isr(0, ctrl);
 
+       init_timer(&ctrl->poll_timer);
        if (!pciehp_poll_time)
-               pciehp_poll_time = 2; /* reset timer to poll in 2 secs if user doesn't specify at module installation*/
+               pciehp_poll_time = 2; /* default polling interval is 2 sec */
 
-       start_int_poll_timer(php_ctlr, pciehp_poll_time);  
-       
-       return;
+       start_int_poll_timer(ctrl, pciehp_poll_time);
 }
 
 /* This function starts the interrupt polling timer. */
-static void start_int_poll_timer(struct php_ctlr_state_s *php_ctlr, int seconds)
+static void start_int_poll_timer(struct controller *ctrl, int sec)
 {
-       if (!php_ctlr) {
-               err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
-               return;
+       /* Clamp to sane value */
+       if ((sec <= 0) || (sec > 60))
+               sec = 2;
+
+       ctrl->poll_timer.function = &int_poll_timeout;
+       ctrl->poll_timer.data = (unsigned long)ctrl;
+       ctrl->poll_timer.expires = jiffies + sec * HZ;
+       add_timer(&ctrl->poll_timer);
+}
+
+static inline int pciehp_request_irq(struct controller *ctrl)
+{
+       int retval, irq = ctrl->pcie->irq;
+
+       /* Install interrupt polling timer. Start with 10 sec delay */
+       if (pciehp_poll_mode) {
+               init_timer(&ctrl->poll_timer);
+               start_int_poll_timer(ctrl, 10);
+               return 0;
        }
 
-       if ( ( seconds <= 0 ) || ( seconds > 60 ) )
-               seconds = 2;            /* Clamp to sane value */
+       /* Installs the interrupt handler */
+       retval = request_irq(irq, pcie_isr, IRQF_SHARED, MY_NAME, ctrl);
+       if (retval)
+               ctrl_err(ctrl, "Cannot get irq %d for the hotplug controller\n",
+                        irq);
+       return retval;
+}
+
+static inline void pciehp_free_irq(struct controller *ctrl)
+{
+       if (pciehp_poll_mode)
+               del_timer_sync(&ctrl->poll_timer);
+       else
+               free_irq(ctrl->pcie->irq, ctrl);
+}
+
+static int pcie_poll_cmd(struct controller *ctrl)
+{
+       u16 slot_status;
+       int timeout = 1000;
+
+       if (!pciehp_readw(ctrl, SLOTSTATUS, &slot_status)) {
+               if (slot_status & CMD_COMPLETED) {
+                       pciehp_writew(ctrl, SLOTSTATUS, CMD_COMPLETED);
+                       return 1;
+               }
+       }
+       while (timeout > 0) {
+               msleep(10);
+               timeout -= 10;
+               if (!pciehp_readw(ctrl, SLOTSTATUS, &slot_status)) {
+                       if (slot_status & CMD_COMPLETED) {
+                               pciehp_writew(ctrl, SLOTSTATUS, CMD_COMPLETED);
+                               return 1;
+                       }
+               }
+       }
+       return 0;       /* timeout */
+}
 
-       php_ctlr->int_poll_timer.function = &int_poll_timeout;
-       php_ctlr->int_poll_timer.data = (unsigned long)php_ctlr;    /* Instance data */
-       php_ctlr->int_poll_timer.expires = jiffies + seconds * HZ;
-       add_timer(&php_ctlr->int_poll_timer);
+static void pcie_wait_cmd(struct controller *ctrl, int poll)
+{
+       unsigned int msecs = pciehp_poll_mode ? 2500 : 1000;
+       unsigned long timeout = msecs_to_jiffies(msecs);
+       int rc;
 
-       return;
+       if (poll)
+               rc = pcie_poll_cmd(ctrl);
+       else
+               rc = wait_event_timeout(ctrl->queue, !ctrl->cmd_busy, timeout);
+       if (!rc)
+               ctrl_dbg(ctrl, "Command not completed in 1000 msec\n");
 }
 
-static int pcie_write_cmd(struct slot *slot, u16 cmd)
+/**
+ * pcie_write_cmd - Issue controller command
+ * @ctrl: controller to which the command is issued
+ * @cmd:  command value written to slot control register
+ * @mask: bitmask of slot control register to be modified
+ */
+static int pcie_write_cmd(struct controller *ctrl, u16 cmd, u16 mask)
 {
-       struct php_ctlr_state_s *php_ctlr = slot->ctrl->hpc_ctlr_handle;
        int retval = 0;
        u16 slot_status;
+       u16 slot_ctrl;
 
-       DBG_ENTER_ROUTINE 
-       
-       if (!php_ctlr) {
-               err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
-               return -1;
-       }
+       mutex_lock(&ctrl->ctrl_lock);
 
-       retval = hp_register_read_word(php_ctlr->pci_dev, SLOT_STATUS(slot->ctrl->cap_base), slot_status);
+       retval = pciehp_readw(ctrl, SLOTSTATUS, &slot_status);
        if (retval) {
-                       err("%s : hp_register_read_word SLOT_STATUS failed\n", __FUNCTION__);
-                       return retval;
+               ctrl_err(ctrl, "%s: Cannot read SLOTSTATUS register\n",
+                        __func__);
+               goto out;
+       }
+
+       if (slot_status & CMD_COMPLETED) {
+               if (!ctrl->no_cmd_complete) {
+                       /*
+                        * After 1 sec and CMD_COMPLETED still not set, just
+                        * proceed forward to issue the next command according
+                        * to spec. Just print out the error message.
+                        */
+                       ctrl_dbg(ctrl, "CMD_COMPLETED not clear after 1 sec\n");
+               } else if (!NO_CMD_CMPL(ctrl)) {
+                       /*
+                        * This controller semms to notify of command completed
+                        * event even though it supports none of power
+                        * controller, attention led, power led and EMI.
+                        */
+                       ctrl_dbg(ctrl, "Unexpected CMD_COMPLETED. Need to "
+                                "wait for command completed event.\n");
+                       ctrl->no_cmd_complete = 0;
+               } else {
+                       ctrl_dbg(ctrl, "Unexpected CMD_COMPLETED. Maybe "
+                                "the controller is broken.\n");
                }
-       
-       if ((slot_status & CMD_COMPLETED) == CMD_COMPLETED ) { 
-               /* After 1 sec and CMD_COMPLETED still not set, just proceed forward to issue 
-                  the next command according to spec.  Just print out the error message */
-               dbg("%s : CMD_COMPLETED not clear after 1 sec.\n", __FUNCTION__);
        }
 
-       retval = hp_register_write_word(php_ctlr->pci_dev, SLOT_CTRL(slot->ctrl->cap_base), cmd | CMD_CMPL_INTR_ENABLE);
+       retval = pciehp_readw(ctrl, SLOTCTRL, &slot_ctrl);
        if (retval) {
-               err("%s : hp_register_write_word SLOT_CTRL failed\n", __FUNCTION__);
-               return retval;
+               ctrl_err(ctrl, "%s: Cannot read SLOTCTRL register\n", __func__);
+               goto out;
        }
 
-       DBG_LEAVE_ROUTINE 
+       slot_ctrl &= ~mask;
+       slot_ctrl |= (cmd & mask);
+       ctrl->cmd_busy = 1;
+       smp_mb();
+       retval = pciehp_writew(ctrl, SLOTCTRL, slot_ctrl);
+       if (retval)
+               ctrl_err(ctrl, "Cannot write to SLOTCTRL register\n");
+
+       /*
+        * Wait for command completion.
+        */
+       if (!retval && !ctrl->no_cmd_complete) {
+               int poll = 0;
+               /*
+                * if hotplug interrupt is not enabled or command
+                * completed interrupt is not enabled, we need to poll
+                * command completed event.
+                */
+               if (!(slot_ctrl & HP_INTR_ENABLE) ||
+                   !(slot_ctrl & CMD_CMPL_INTR_ENABLE))
+                       poll = 1;
+                pcie_wait_cmd(ctrl, poll);
+       }
+ out:
+       mutex_unlock(&ctrl->ctrl_lock);
        return retval;
 }
 
-static int hpc_check_lnk_status(struct controller *ctrl)
+static inline int check_link_active(struct controller *ctrl)
 {
-       struct php_ctlr_state_s *php_ctlr = ctrl->hpc_ctlr_handle;
-       u16 lnk_status;
-       int retval = 0;
+       u16 link_status;
 
-       DBG_ENTER_ROUTINE 
+       if (pciehp_readw(ctrl, LNKSTATUS, &link_status))
+               return 0;
+       return !!(link_status & LINK_ACTIVE);
+}
 
-       if (!php_ctlr) {
-               err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
-               return -1;
+static void pcie_wait_link_active(struct controller *ctrl)
+{
+       int timeout = 1000;
+
+       if (check_link_active(ctrl))
+               return;
+       while (timeout > 0) {
+               msleep(10);
+               timeout -= 10;
+               if (check_link_active(ctrl))
+                       return;
        }
-       
-       retval = hp_register_read_word(php_ctlr->pci_dev, LNK_STATUS(ctrl->cap_base), lnk_status);
+       ctrl_dbg(ctrl, "Data Link Layer Link Active not set in 1000 msec\n");
+}
 
+static int hpc_check_lnk_status(struct controller *ctrl)
+{
+       u16 lnk_status;
+       int retval = 0;
+
+        /*
+         * Data Link Layer Link Active Reporting must be capable for
+         * hot-plug capable downstream port. But old controller might
+         * not implement it. In this case, we wait for 1000 ms.
+         */
+        if (ctrl->link_active_reporting){
+                /* Wait for Data Link Layer Link Active bit to be set */
+                pcie_wait_link_active(ctrl);
+                /*
+                 * We must wait for 100 ms after the Data Link Layer
+                 * Link Active bit reads 1b before initiating a
+                 * configuration access to the hot added device.
+                 */
+                msleep(100);
+        } else
+                msleep(1000);
+
+       retval = pciehp_readw(ctrl, LNKSTATUS, &lnk_status);
        if (retval) {
-               err("%s : hp_register_read_word LNK_STATUS failed\n", __FUNCTION__);
+               ctrl_err(ctrl, "Cannot read LNKSTATUS register\n");
                return retval;
        }
 
-       dbg("%s: lnk_status = %x\n", __FUNCTION__, lnk_status);
-       if ( (lnk_status & LNK_TRN) || (lnk_status & LNK_TRN_ERR) || 
-               !(lnk_status & NEG_LINK_WD)) {
-               err("%s : Link Training Error occurs \n", __FUNCTION__);
+       ctrl_dbg(ctrl, "%s: lnk_status = %x\n", __func__, lnk_status);
+       if ((lnk_status & LNK_TRN) || !(lnk_status & NEG_LINK_WD)) {
+               ctrl_err(ctrl, "Link Training Error occurs \n");
                retval = -1;
                return retval;
        }
 
-       DBG_LEAVE_ROUTINE 
        return retval;
 }
 
-
 static int hpc_get_attention_status(struct slot *slot, u8 *status)
 {
-       struct php_ctlr_state_s *php_ctlr = slot->ctrl->hpc_ctlr_handle;
+       struct controller *ctrl = slot->ctrl;
        u16 slot_ctrl;
        u8 atten_led_state;
        int retval = 0;
-       
-       DBG_ENTER_ROUTINE 
-
-       if (!php_ctlr) {
-               err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
-               return -1;
-       }
-
-       retval = hp_register_read_word(php_ctlr->pci_dev, SLOT_CTRL(slot->ctrl->cap_base), slot_ctrl);
 
+       retval = pciehp_readw(ctrl, SLOTCTRL, &slot_ctrl);
        if (retval) {
-               err("%s : hp_register_read_word SLOT_CTRL failed\n", __FUNCTION__);
+               ctrl_err(ctrl, "%s: Cannot read SLOTCTRL register\n", __func__);
                return retval;
        }
 
-       dbg("%s: SLOT_CTRL %x, value read %x\n", __FUNCTION__,SLOT_CTRL(slot->ctrl->cap_base), slot_ctrl);
+       ctrl_dbg(ctrl, "%s: SLOTCTRL %x, value read %x\n",
+                __func__, ctrl->cap_base + SLOTCTRL, slot_ctrl);
 
        atten_led_state = (slot_ctrl & ATTN_LED_CTRL) >> 6;
 
@@ -381,31 +464,23 @@ static int hpc_get_attention_status(struct slot *slot, u8 *status)
                break;
        }
 
-       DBG_LEAVE_ROUTINE 
        return 0;
 }
 
-static int hpc_get_power_status(struct slot * slot, u8 *status)
+static int hpc_get_power_status(struct slot *slot, u8 *status)
 {
-       struct php_ctlr_state_s *php_ctlr = slot->ctrl->hpc_ctlr_handle;
+       struct controller *ctrl = slot->ctrl;
        u16 slot_ctrl;
        u8 pwr_state;
        int     retval = 0;
-       
-       DBG_ENTER_ROUTINE 
-
-       if (!php_ctlr) {
-               err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
-               return -1;
-       }
-
-       retval = hp_register_read_word(php_ctlr->pci_dev, SLOT_CTRL(slot->ctrl->cap_base), slot_ctrl);
 
+       retval = pciehp_readw(ctrl, SLOTCTRL, &slot_ctrl);
        if (retval) {
-               err("%s : hp_register_read_word SLOT_CTRL failed\n", __FUNCTION__);
+               ctrl_err(ctrl, "%s: Cannot read SLOTCTRL register\n", __func__);
                return retval;
        }
-       dbg("%s: SLOT_CTRL %x value read %x\n", __FUNCTION__, SLOT_CTRL(slot->ctrl->cap_base), slot_ctrl);
+       ctrl_dbg(ctrl, "%s: SLOTCTRL %x value read %x\n",
+                __func__, ctrl->cap_base + SLOTCTRL, slot_ctrl);
 
        pwr_state = (slot_ctrl & PWR_CTRL) >> 10;
 
@@ -414,427 +489,270 @@ static int hpc_get_power_status(struct slot * slot, u8 *status)
                *status = 1;
                break;
        case 1:
-               *status = 0;    
+               *status = 0;
                break;
        default:
                *status = 0xFF;
                break;
        }
 
-       DBG_LEAVE_ROUTINE 
        return retval;
 }
 
-
 static int hpc_get_latch_status(struct slot *slot, u8 *status)
 {
-       struct php_ctlr_state_s *php_ctlr = slot->ctrl->hpc_ctlr_handle;
+       struct controller *ctrl = slot->ctrl;
        u16 slot_status;
        int retval = 0;
 
-       DBG_ENTER_ROUTINE 
-
-       if (!php_ctlr) {
-               err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
-               return -1;
-       }
-
-       retval = hp_register_read_word(php_ctlr->pci_dev, SLOT_STATUS(slot->ctrl->cap_base), slot_status);
-
+       retval = pciehp_readw(ctrl, SLOTSTATUS, &slot_status);
        if (retval) {
-               err("%s : hp_register_read_word SLOT_STATUS failed\n", __FUNCTION__);
+               ctrl_err(ctrl, "%s: Cannot read SLOTSTATUS register\n",
+                        __func__);
                return retval;
        }
 
-       *status = (((slot_status & MRL_STATE) >> 5) == 0) ? 0 : 1;  
+       *status = (((slot_status & MRL_STATE) >> 5) == 0) ? 0 : 1;
 
-       DBG_LEAVE_ROUTINE 
        return 0;
 }
 
 static int hpc_get_adapter_status(struct slot *slot, u8 *status)
 {
-       struct php_ctlr_state_s *php_ctlr = slot->ctrl->hpc_ctlr_handle;
+       struct controller *ctrl = slot->ctrl;
        u16 slot_status;
        u8 card_state;
        int retval = 0;
 
-       DBG_ENTER_ROUTINE 
-
-       if (!php_ctlr) {
-               err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
-               return -1;
-       }
-
-       retval = hp_register_read_word(php_ctlr->pci_dev, SLOT_STATUS(slot->ctrl->cap_base), slot_status);
-
+       retval = pciehp_readw(ctrl, SLOTSTATUS, &slot_status);
        if (retval) {
-               err("%s : hp_register_read_word SLOT_STATUS failed\n", __FUNCTION__);
+               ctrl_err(ctrl, "%s: Cannot read SLOTSTATUS register\n",
+                        __func__);
                return retval;
        }
        card_state = (u8)((slot_status & PRSN_STATE) >> 6);
        *status = (card_state == 1) ? 1 : 0;
 
-       DBG_LEAVE_ROUTINE 
        return 0;
 }
 
-static int hpc_query_power_fault(struct slot * slot)
+static int hpc_query_power_fault(struct slot *slot)
 {
-       struct php_ctlr_state_s *php_ctlr = slot->ctrl->hpc_ctlr_handle;
+       struct controller *ctrl = slot->ctrl;
        u16 slot_status;
        u8 pwr_fault;
        int retval = 0;
 
-       DBG_ENTER_ROUTINE 
-
-       if (!php_ctlr) {
-               err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
-               return -1;
-       }
-
-       retval = hp_register_read_word(php_ctlr->pci_dev, SLOT_STATUS(slot->ctrl->cap_base), slot_status);
-
+       retval = pciehp_readw(ctrl, SLOTSTATUS, &slot_status);
        if (retval) {
-               err("%s : Cannot check for power fault\n", __FUNCTION__);
+               ctrl_err(ctrl, "Cannot check for power fault\n");
                return retval;
        }
        pwr_fault = (u8)((slot_status & PWR_FAULT_DETECTED) >> 1);
-       
-       DBG_LEAVE_ROUTINE
+
        return pwr_fault;
 }
 
-static int hpc_set_attention_status(struct slot *slot, u8 value)
+static int hpc_get_emi_status(struct slot *slot, u8 *status)
 {
-       struct php_ctlr_state_s *php_ctlr = slot->ctrl->hpc_ctlr_handle;
-       u16 slot_cmd = 0;
-       u16 slot_ctrl;
-       int rc = 0;
-
-       DBG_ENTER_ROUTINE
+       struct controller *ctrl = slot->ctrl;
+       u16 slot_status;
+       int retval = 0;
 
-       if (!php_ctlr) {
-               err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
-               return -1;
+       retval = pciehp_readw(ctrl, SLOTSTATUS, &slot_status);
+       if (retval) {
+               ctrl_err(ctrl, "Cannot check EMI status\n");
+               return retval;
        }
+       *status = (slot_status & EMI_STATE) >> EMI_STATUS_BIT;
 
-       if (slot->hp_slot >= php_ctlr->num_slots) {
-               err("%s: Invalid HPC slot number!\n", __FUNCTION__);
-               return -1;
-       }
-       rc = hp_register_read_word(php_ctlr->pci_dev, SLOT_CTRL(slot->ctrl->cap_base), slot_ctrl);
+       return retval;
+}
 
-       if (rc) {
-               err("%s : hp_register_read_word SLOT_CTRL failed\n", __FUNCTION__);
-               return rc;
-       }
+static int hpc_toggle_emi(struct slot *slot)
+{
+       u16 slot_cmd;
+       u16 cmd_mask;
+       int rc;
 
+       slot_cmd = EMI_CTRL;
+       cmd_mask = EMI_CTRL;
+       rc = pcie_write_cmd(slot->ctrl, slot_cmd, cmd_mask);
+       slot->last_emi_toggle = get_seconds();
+
+       return rc;
+}
+
+static int hpc_set_attention_status(struct slot *slot, u8 value)
+{
+       struct controller *ctrl = slot->ctrl;
+       u16 slot_cmd;
+       u16 cmd_mask;
+       int rc;
+
+       cmd_mask = ATTN_LED_CTRL;
        switch (value) {
                case 0 :        /* turn off */
-                       slot_cmd = (slot_ctrl & ~ATTN_LED_CTRL) | 0x00C0;
+                       slot_cmd = 0x00C0;
                        break;
                case 1:         /* turn on */
-                       slot_cmd = (slot_ctrl & ~ATTN_LED_CTRL) | 0x0040;
+                       slot_cmd = 0x0040;
                        break;
                case 2:         /* turn blink */
-                       slot_cmd = (slot_ctrl & ~ATTN_LED_CTRL) | 0x0080;
+                       slot_cmd = 0x0080;
                        break;
                default:
                        return -1;
        }
-       if (!pciehp_poll_mode)
-               slot_cmd = slot_cmd | HP_INTR_ENABLE; 
+       rc = pcie_write_cmd(ctrl, slot_cmd, cmd_mask);
+       ctrl_dbg(ctrl, "%s: SLOTCTRL %x write cmd %x\n",
+                __func__, ctrl->cap_base + SLOTCTRL, slot_cmd);
 
-       pcie_write_cmd(slot, slot_cmd);
-       dbg("%s: SLOT_CTRL %x write cmd %x\n", __FUNCTION__, SLOT_CTRL(slot->ctrl->cap_base), slot_cmd);
-       
-       DBG_LEAVE_ROUTINE
        return rc;
 }
 
-
 static void hpc_set_green_led_on(struct slot *slot)
 {
-       struct php_ctlr_state_s *php_ctlr = slot->ctrl->hpc_ctlr_handle;
+       struct controller *ctrl = slot->ctrl;
        u16 slot_cmd;
-       u16 slot_ctrl;
-       int rc = 0;
-               
-       DBG_ENTER_ROUTINE
-
-       if (!php_ctlr) {
-               err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
-               return ;
-       }
-
-       if (slot->hp_slot >= php_ctlr->num_slots) {
-               err("%s: Invalid HPC slot number!\n", __FUNCTION__);
-               return ;
-       }
-
-       rc = hp_register_read_word(php_ctlr->pci_dev, SLOT_CTRL(slot->ctrl->cap_base), slot_ctrl);
+       u16 cmd_mask;
 
-       if (rc) {
-               err("%s : hp_register_read_word SLOT_CTRL failed\n", __FUNCTION__);
-               return;
-       }
-       slot_cmd = (slot_ctrl & ~PWR_LED_CTRL) | 0x0100;
-       if (!pciehp_poll_mode)
-               slot_cmd = slot_cmd | HP_INTR_ENABLE; 
-
-       pcie_write_cmd(slot, slot_cmd);
-
-       dbg("%s: SLOT_CTRL %x write cmd %x\n",__FUNCTION__, SLOT_CTRL(slot->ctrl->cap_base), slot_cmd);
-       DBG_LEAVE_ROUTINE
-       return;
+       slot_cmd = 0x0100;
+       cmd_mask = PWR_LED_CTRL;
+       pcie_write_cmd(ctrl, slot_cmd, cmd_mask);
+       ctrl_dbg(ctrl, "%s: SLOTCTRL %x write cmd %x\n",
+                __func__, ctrl->cap_base + SLOTCTRL, slot_cmd);
 }
 
 static void hpc_set_green_led_off(struct slot *slot)
 {
-       struct php_ctlr_state_s *php_ctlr = slot->ctrl->hpc_ctlr_handle;
+       struct controller *ctrl = slot->ctrl;
        u16 slot_cmd;
-       u16 slot_ctrl;
-       int rc = 0;
-
-       DBG_ENTER_ROUTINE
-
-       if (!php_ctlr) {
-               err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
-               return ;
-       }
+       u16 cmd_mask;
 
-       if (slot->hp_slot >= php_ctlr->num_slots) {
-               err("%s: Invalid HPC slot number!\n", __FUNCTION__);
-               return ;
-       }
-
-       rc = hp_register_read_word(php_ctlr->pci_dev, SLOT_CTRL(slot->ctrl->cap_base), slot_ctrl);
-
-       if (rc) {
-               err("%s : hp_register_read_word SLOT_CTRL failed\n", __FUNCTION__);
-               return;
-       }
-
-       slot_cmd = (slot_ctrl & ~PWR_LED_CTRL) | 0x0300;
-
-       if (!pciehp_poll_mode)
-               slot_cmd = slot_cmd | HP_INTR_ENABLE; 
-       pcie_write_cmd(slot, slot_cmd);
-       dbg("%s: SLOT_CTRL %x write cmd %x\n", __FUNCTION__, SLOT_CTRL(slot->ctrl->cap_base), slot_cmd);
-
-       DBG_LEAVE_ROUTINE
-       return;
+       slot_cmd = 0x0300;
+       cmd_mask = PWR_LED_CTRL;
+       pcie_write_cmd(ctrl, slot_cmd, cmd_mask);
+       ctrl_dbg(ctrl, "%s: SLOTCTRL %x write cmd %x\n",
+                __func__, ctrl->cap_base + SLOTCTRL, slot_cmd);
 }
 
 static void hpc_set_green_led_blink(struct slot *slot)
 {
-       struct php_ctlr_state_s *php_ctlr = slot->ctrl->hpc_ctlr_handle;
+       struct controller *ctrl = slot->ctrl;
        u16 slot_cmd;
-       u16 slot_ctrl;
-       int rc = 0; 
-       
-       DBG_ENTER_ROUTINE
+       u16 cmd_mask;
 
-       if (!php_ctlr) {
-               err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
-               return ;
-       }
-
-       if (slot->hp_slot >= php_ctlr->num_slots) {
-               err("%s: Invalid HPC slot number!\n", __FUNCTION__);
-               return ;
-       }
-
-       rc = hp_register_read_word(php_ctlr->pci_dev, SLOT_CTRL(slot->ctrl->cap_base), slot_ctrl);
-
-       if (rc) {
-               err("%s : hp_register_read_word SLOT_CTRL failed\n", __FUNCTION__);
-               return;
-       }
-
-       slot_cmd = (slot_ctrl & ~PWR_LED_CTRL) | 0x0200;
-
-       if (!pciehp_poll_mode)
-               slot_cmd = slot_cmd | HP_INTR_ENABLE; 
-       pcie_write_cmd(slot, slot_cmd);
-
-       dbg("%s: SLOT_CTRL %x write cmd %x\n",__FUNCTION__, SLOT_CTRL(slot->ctrl->cap_base), slot_cmd);
-       DBG_LEAVE_ROUTINE
-       return;
-}
-
-int pcie_get_ctlr_slot_config(struct controller *ctrl,
-       int *num_ctlr_slots,    /* number of slots in this HPC; only 1 in PCIE  */      
-       int *first_device_num,  /* PCI dev num of the first slot in this PCIE   */
-       int *physical_slot_num, /* phy slot num of the first slot in this PCIE  */
-       u8 *ctrlcap)
-{
-       struct php_ctlr_state_s *php_ctlr = ctrl->hpc_ctlr_handle;
-       u32 slot_cap;
-       int rc = 0;
-       
-       DBG_ENTER_ROUTINE 
-
-       if (!php_ctlr) {
-               err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
-               return -1;
-       }
-
-       *first_device_num = 0;
-       *num_ctlr_slots = 1; 
-
-       rc = hp_register_read_dword(php_ctlr->pci_dev, SLOT_CAP(ctrl->cap_base), slot_cap);
-
-       if (rc) {
-               err("%s : hp_register_read_dword SLOT_CAP failed\n", __FUNCTION__);
-               return -1;
-       }
-       
-       *physical_slot_num = slot_cap >> 19;
-       dbg("%s: PSN %d \n", __FUNCTION__, *physical_slot_num);
-       
-       *ctrlcap = slot_cap & 0x0000007f;
-
-       DBG_LEAVE_ROUTINE 
-       return 0;
-}
-
-static void hpc_release_ctlr(struct controller *ctrl)
-{
-       struct php_ctlr_state_s *php_ctlr = ctrl->hpc_ctlr_handle;
-       struct php_ctlr_state_s *p, *p_prev;
-
-       DBG_ENTER_ROUTINE 
-
-       if (!php_ctlr) {
-               err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
-               return ;
-       }
-
-       if (pciehp_poll_mode) {
-           del_timer(&php_ctlr->int_poll_timer);
-       } else {        
-               if (php_ctlr->irq) {
-                       free_irq(php_ctlr->irq, ctrl);
-                       php_ctlr->irq = 0;
-               }
-       }
-       if (php_ctlr->pci_dev) 
-               php_ctlr->pci_dev = NULL;
-
-       spin_lock(&list_lock);
-       p = php_ctlr_list_head;
-       p_prev = NULL;
-       while (p) {
-               if (p == php_ctlr) {
-                       if (p_prev)
-                               p_prev->pnext = p->pnext;
-                       else
-                               php_ctlr_list_head = p->pnext;
-                       break;
-               } else {
-                       p_prev = p;
-                       p = p->pnext;
-               }
-       }
-       spin_unlock(&list_lock);
-
-       kfree(php_ctlr);
-
-       DBG_LEAVE_ROUTINE
-                         
+       slot_cmd = 0x0200;
+       cmd_mask = PWR_LED_CTRL;
+       pcie_write_cmd(ctrl, slot_cmd, cmd_mask);
+       ctrl_dbg(ctrl, "%s: SLOTCTRL %x write cmd %x\n",
+                __func__, ctrl->cap_base + SLOTCTRL, slot_cmd);
 }
 
 static int hpc_power_on_slot(struct slot * slot)
 {
-       struct php_ctlr_state_s *php_ctlr = slot->ctrl->hpc_ctlr_handle;
+       struct controller *ctrl = slot->ctrl;
        u16 slot_cmd;
-       u16 slot_ctrl, slot_status;
-
+       u16 cmd_mask;
+       u16 slot_status;
        int retval = 0;
 
-       DBG_ENTER_ROUTINE 
-
-       if (!php_ctlr) {
-               err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
-               return -1;
-       }
-
-       dbg("%s: slot->hp_slot %x\n", __FUNCTION__, slot->hp_slot);
-       if (slot->hp_slot >= php_ctlr->num_slots) {
-               err("%s: Invalid HPC slot number!\n", __FUNCTION__);
-               return -1;
-       }
+       ctrl_dbg(ctrl, "%s: slot->hp_slot %x\n", __func__, slot->hp_slot);
 
        /* Clear sticky power-fault bit from previous power failures */
-       hp_register_read_word(php_ctlr->pci_dev,
-                       SLOT_STATUS(slot->ctrl->cap_base), slot_status);
-       slot_status &= PWR_FAULT_DETECTED;
-       if (slot_status)
-               hp_register_write_word(php_ctlr->pci_dev,
-                       SLOT_STATUS(slot->ctrl->cap_base), slot_status);
-
-       retval = hp_register_read_word(php_ctlr->pci_dev, SLOT_CTRL(slot->ctrl->cap_base), slot_ctrl);
-
+       retval = pciehp_readw(ctrl, SLOTSTATUS, &slot_status);
        if (retval) {
-               err("%s : hp_register_read_word SLOT_CTRL failed\n", __FUNCTION__);
+               ctrl_err(ctrl, "%s: Cannot read SLOTSTATUS register\n",
+                        __func__);
                return retval;
        }
+       slot_status &= PWR_FAULT_DETECTED;
+       if (slot_status) {
+               retval = pciehp_writew(ctrl, SLOTSTATUS, slot_status);
+               if (retval) {
+                       ctrl_err(ctrl,
+                                "%s: Cannot write to SLOTSTATUS register\n",
+                                __func__);
+                       return retval;
+               }
+       }
 
-       slot_cmd = (slot_ctrl & ~PWR_CTRL) | POWER_ON;
-
+       slot_cmd = POWER_ON;
+       cmd_mask = PWR_CTRL;
        /* Enable detection that we turned off at slot power-off time */
-       if (!pciehp_poll_mode)
-               slot_cmd = slot_cmd |
-                          PWR_FAULT_DETECT_ENABLE |
-                          MRL_DETECT_ENABLE |
-                          PRSN_DETECT_ENABLE |
-                          HP_INTR_ENABLE;
+       if (!pciehp_poll_mode) {
+               slot_cmd |= (PWR_FAULT_DETECT_ENABLE | MRL_DETECT_ENABLE |
+                            PRSN_DETECT_ENABLE);
+               cmd_mask |= (PWR_FAULT_DETECT_ENABLE | MRL_DETECT_ENABLE |
+                            PRSN_DETECT_ENABLE);
+       }
 
-       retval = pcie_write_cmd(slot, slot_cmd);
+       retval = pcie_write_cmd(ctrl, slot_cmd, cmd_mask);
 
        if (retval) {
-               err("%s: Write %x command failed!\n", __FUNCTION__, slot_cmd);
+               ctrl_err(ctrl, "Write %x command failed!\n", slot_cmd);
                return -1;
        }
-       dbg("%s: SLOT_CTRL %x write cmd %x\n",__FUNCTION__, SLOT_CTRL(slot->ctrl->cap_base), slot_cmd);
-
-       DBG_LEAVE_ROUTINE
+       ctrl_dbg(ctrl, "%s: SLOTCTRL %x write cmd %x\n",
+                __func__, ctrl->cap_base + SLOTCTRL, slot_cmd);
 
        return retval;
 }
 
-static int hpc_power_off_slot(struct slot * slot)
+static inline int pcie_mask_bad_dllp(struct controller *ctrl)
 {
-       struct php_ctlr_state_s *php_ctlr = slot->ctrl->hpc_ctlr_handle;
-       u16 slot_cmd;
-       u16 slot_ctrl;
-
-       int retval = 0;
+       struct pci_dev *dev = ctrl->pci_dev;
+       int pos;
+       u32 reg;
+
+       pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR);
+       if (!pos)
+               return 0;
+       pci_read_config_dword(dev, pos + PCI_ERR_COR_MASK, &reg);
+       if (reg & PCI_ERR_COR_BAD_DLLP)
+               return 0;
+       reg |= PCI_ERR_COR_BAD_DLLP;
+       pci_write_config_dword(dev, pos + PCI_ERR_COR_MASK, reg);
+       return 1;
+}
 
-       DBG_ENTER_ROUTINE 
+static inline void pcie_unmask_bad_dllp(struct controller *ctrl)
+{
+       struct pci_dev *dev = ctrl->pci_dev;
+       u32 reg;
+       int pos;
 
-       if (!php_ctlr) {
-               err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
-               return -1;
-       }
+       pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR);
+       if (!pos)
+               return;
+       pci_read_config_dword(dev, pos + PCI_ERR_COR_MASK, &reg);
+       if (!(reg & PCI_ERR_COR_BAD_DLLP))
+               return;
+       reg &= ~PCI_ERR_COR_BAD_DLLP;
+       pci_write_config_dword(dev, pos + PCI_ERR_COR_MASK, reg);
+}
 
-       dbg("%s: slot->hp_slot %x\n", __FUNCTION__, slot->hp_slot);
-       slot->hp_slot = 0;
-       if (slot->hp_slot >= php_ctlr->num_slots) {
-               err("%s: Invalid HPC slot number!\n", __FUNCTION__);
-               return -1;
-       }
-       retval = hp_register_read_word(php_ctlr->pci_dev, SLOT_CTRL(slot->ctrl->cap_base), slot_ctrl);
+static int hpc_power_off_slot(struct slot * slot)
+{
+       struct controller *ctrl = slot->ctrl;
+       u16 slot_cmd;
+       u16 cmd_mask;
+       int retval = 0;
+       int changed;
 
-       if (retval) {
-               err("%s : hp_register_read_word SLOT_CTRL failed\n", __FUNCTION__);
-               return retval;
-       }
+       ctrl_dbg(ctrl, "%s: slot->hp_slot %x\n", __func__, slot->hp_slot);
 
-       slot_cmd = (slot_ctrl & ~PWR_CTRL) | POWER_OFF;
+       /*
+        * Set Bad DLLP Mask bit in Correctable Error Mask
+        * Register. This is the workaround against Bad DLLP error
+        * that sometimes happens during turning power off the slot
+        * which conforms to PCI Express 1.0a spec.
+        */
+       changed = pcie_mask_bad_dllp(ctrl);
 
+       slot_cmd = POWER_OFF;
+       cmd_mask = PWR_CTRL;
        /*
         * If we get MRL or presence detect interrupts now, the isr
         * will notice the sticky power-fault bit too and issue power
@@ -842,191 +760,103 @@ static int hpc_power_off_slot(struct slot * slot)
         * of command completions, since the power-fault bit remains on
         * till the slot is powered on again.
         */
-       if (!pciehp_poll_mode)
-               slot_cmd = (slot_cmd &
-                           ~PWR_FAULT_DETECT_ENABLE &
-                           ~MRL_DETECT_ENABLE &
-                           ~PRSN_DETECT_ENABLE) | HP_INTR_ENABLE;
-
-       retval = pcie_write_cmd(slot, slot_cmd);
+       if (!pciehp_poll_mode) {
+               slot_cmd &= ~(PWR_FAULT_DETECT_ENABLE | MRL_DETECT_ENABLE |
+                             PRSN_DETECT_ENABLE);
+               cmd_mask |= (PWR_FAULT_DETECT_ENABLE | MRL_DETECT_ENABLE |
+                            PRSN_DETECT_ENABLE);
+       }
 
+       retval = pcie_write_cmd(ctrl, slot_cmd, cmd_mask);
        if (retval) {
-               err("%s: Write command failed!\n", __FUNCTION__);
-               return -1;
+               ctrl_err(ctrl, "Write command failed!\n");
+               retval = -1;
+               goto out;
        }
-       dbg("%s: SLOT_CTRL %x write cmd %x\n",__FUNCTION__, SLOT_CTRL(slot->ctrl->cap_base), slot_cmd);
-
-       DBG_LEAVE_ROUTINE
+       ctrl_dbg(ctrl, "%s: SLOTCTRL %x write cmd %x\n",
+                __func__, ctrl->cap_base + SLOTCTRL, slot_cmd);
+ out:
+       if (changed)
+               pcie_unmask_bad_dllp(ctrl);
 
        return retval;
 }
 
-static irqreturn_t pcie_isr(int IRQ, void *dev_id)
+static irqreturn_t pcie_isr(int irq, void *dev_id)
 {
-       struct controller *ctrl = NULL;
-       struct php_ctlr_state_s *php_ctlr;
-       u8 schedule_flag = 0;
-       u16 slot_status, intr_detect, intr_loc;
-       u16 temp_word;
-       int hp_slot = 0;        /* only 1 slot per PCI Express port */
-       int rc = 0;
-
-       if (!dev_id)
-               return IRQ_NONE;
-
-       if (!pciehp_poll_mode) { 
-               ctrl = dev_id;
-               php_ctlr = ctrl->hpc_ctlr_handle;
-       } else {
-               php_ctlr = dev_id;
-               ctrl = (struct controller *)php_ctlr->callback_instance_id;
-       }
+       struct controller *ctrl = (struct controller *)dev_id;
+       u16 detected, intr_loc;
+       struct slot *p_slot;
 
-       if (!ctrl) {
-               dbg("%s: dev_id %p ctlr == NULL\n", __FUNCTION__, (void*) dev_id);
-               return IRQ_NONE;
-       }
-       
-       if (!php_ctlr) {
-               dbg("%s: php_ctlr == NULL\n", __FUNCTION__);
-               return IRQ_NONE;
-       }
-
-       rc = hp_register_read_word(php_ctlr->pci_dev, SLOT_STATUS(ctrl->cap_base), slot_status);
-       if (rc) {
-               err("%s : hp_register_read_word SLOT_STATUS failed\n", __FUNCTION__);
-               return IRQ_NONE;
-       }
-
-       intr_detect = ( ATTN_BUTTN_PRESSED | PWR_FAULT_DETECTED | MRL_SENS_CHANGED |
-                                       PRSN_DETECT_CHANGED | CMD_COMPLETED );
-
-       intr_loc = slot_status & intr_detect;
-
-       /* Check to see if it was our interrupt */
-       if ( !intr_loc )
-               return IRQ_NONE;
-
-       dbg("%s: intr_loc %x\n", __FUNCTION__, intr_loc);
-       /* Mask Hot-plug Interrupt Enable */
-       if (!pciehp_poll_mode) {
-               rc = hp_register_read_word(php_ctlr->pci_dev, SLOT_CTRL(ctrl->cap_base), temp_word);
-               if (rc) {
-                       err("%s : hp_register_read_word SLOT_CTRL failed\n", __FUNCTION__);
+       /*
+        * In order to guarantee that all interrupt events are
+        * serviced, we need to re-inspect Slot Status register after
+        * clearing what is presumed to be the last pending interrupt.
+        */
+       intr_loc = 0;
+       do {
+               if (pciehp_readw(ctrl, SLOTSTATUS, &detected)) {
+                       ctrl_err(ctrl, "%s: Cannot read SLOTSTATUS\n",
+                                __func__);
                        return IRQ_NONE;
                }
 
-               dbg("%s: hp_register_read_word SLOT_CTRL with value %x\n", __FUNCTION__, temp_word);
-               temp_word = (temp_word & ~HP_INTR_ENABLE & ~CMD_CMPL_INTR_ENABLE) | 0x00;
-
-               rc = hp_register_write_word(php_ctlr->pci_dev, SLOT_CTRL(ctrl->cap_base), temp_word);
-               if (rc) {
-                       err("%s : hp_register_write_word SLOT_CTRL failed\n", __FUNCTION__);
+               detected &= (ATTN_BUTTN_PRESSED | PWR_FAULT_DETECTED |
+                            MRL_SENS_CHANGED | PRSN_DETECT_CHANGED |
+                            CMD_COMPLETED);
+               intr_loc |= detected;
+               if (!intr_loc)
                        return IRQ_NONE;
-               }
-               
-               rc = hp_register_read_word(php_ctlr->pci_dev, SLOT_STATUS(ctrl->cap_base), slot_status);
-               if (rc) {
-                       err("%s : hp_register_read_word SLOT_STATUS failed\n", __FUNCTION__);
-                       return IRQ_NONE;
-               }
-               dbg("%s: hp_register_read_word SLOT_STATUS with value %x\n", __FUNCTION__, slot_status); 
-               
-               /* Clear command complete interrupt caused by this write */
-               temp_word = 0x1f;
-               rc = hp_register_write_word(php_ctlr->pci_dev, SLOT_STATUS(ctrl->cap_base), temp_word);
-               if (rc) {
-                       err("%s : hp_register_write_word SLOT_STATUS failed\n", __FUNCTION__);
+               if (detected && pciehp_writew(ctrl, SLOTSTATUS, detected)) {
+                       ctrl_err(ctrl, "%s: Cannot write to SLOTSTATUS\n",
+                                __func__);
                        return IRQ_NONE;
                }
-       }
-       
+       } while (detected);
+
+       ctrl_dbg(ctrl, "%s: intr_loc %x\n", __func__, intr_loc);
+
+       /* Check Command Complete Interrupt Pending */
        if (intr_loc & CMD_COMPLETED) {
-               /* 
-                * Command Complete Interrupt Pending 
-                */
-               wake_up_interruptible(&ctrl->queue);
+               ctrl->cmd_busy = 0;
+               smp_mb();
+               wake_up(&ctrl->queue);
        }
 
-       if ((php_ctlr->switch_change_callback) && (intr_loc & MRL_SENS_CHANGED))
-               schedule_flag += php_ctlr->switch_change_callback(
-                       hp_slot, php_ctlr->callback_instance_id);
-       if ((php_ctlr->attention_button_callback) && (intr_loc & ATTN_BUTTN_PRESSED))
-               schedule_flag += php_ctlr->attention_button_callback(
-                       hp_slot, php_ctlr->callback_instance_id);
-       if ((php_ctlr->presence_change_callback) && (intr_loc & PRSN_DETECT_CHANGED))
-               schedule_flag += php_ctlr->presence_change_callback(
-                       hp_slot , php_ctlr->callback_instance_id);
-       if ((php_ctlr->power_fault_callback) && (intr_loc & PWR_FAULT_DETECTED))
-               schedule_flag += php_ctlr->power_fault_callback(
-                       hp_slot, php_ctlr->callback_instance_id);
-
-       /* Clear all events after serving them */
-       temp_word = 0x1F;
-       rc = hp_register_write_word(php_ctlr->pci_dev, SLOT_STATUS(ctrl->cap_base), temp_word);
-       if (rc) {
-               err("%s : hp_register_write_word SLOT_STATUS failed\n", __FUNCTION__);
-               return IRQ_NONE;
-       }
-       /* Unmask Hot-plug Interrupt Enable */
-       if (!pciehp_poll_mode) {
-               rc = hp_register_read_word(php_ctlr->pci_dev, SLOT_CTRL(ctrl->cap_base), temp_word);
-               if (rc) {
-                       err("%s : hp_register_read_word SLOT_CTRL failed\n", __FUNCTION__);
-                       return IRQ_NONE;
-               }
+       if (!(intr_loc & ~CMD_COMPLETED))
+               return IRQ_HANDLED;
 
-               dbg("%s: Unmask Hot-plug Interrupt Enable\n", __FUNCTION__);
-               temp_word = (temp_word & ~HP_INTR_ENABLE) | HP_INTR_ENABLE;
+       p_slot = pciehp_find_slot(ctrl, ctrl->slot_device_offset);
+
+       /* Check MRL Sensor Changed */
+       if (intr_loc & MRL_SENS_CHANGED)
+               pciehp_handle_switch_change(p_slot);
+
+       /* Check Attention Button Pressed */
+       if (intr_loc & ATTN_BUTTN_PRESSED)
+               pciehp_handle_attention_button(p_slot);
+
+       /* Check Presence Detect Changed */
+       if (intr_loc & PRSN_DETECT_CHANGED)
+               pciehp_handle_presence_change(p_slot);
+
+       /* Check Power Fault Detected */
+       if (intr_loc & PWR_FAULT_DETECTED)
+               pciehp_handle_power_fault(p_slot);
 
-               rc = hp_register_write_word(php_ctlr->pci_dev, SLOT_CTRL(ctrl->cap_base), temp_word);
-               if (rc) {
-                       err("%s : hp_register_write_word SLOT_CTRL failed\n", __FUNCTION__);
-                       return IRQ_NONE;
-               }
-       
-               rc = hp_register_read_word(php_ctlr->pci_dev, SLOT_STATUS(ctrl->cap_base), slot_status);
-               if (rc) {
-                       err("%s : hp_register_read_word SLOT_STATUS failed\n", __FUNCTION__);
-                       return IRQ_NONE;
-               }
-               
-               /* Clear command complete interrupt caused by this write */
-               temp_word = 0x1F;
-               rc = hp_register_write_word(php_ctlr->pci_dev, SLOT_STATUS(ctrl->cap_base), temp_word);
-               if (rc) {
-                       err("%s : hp_register_write_word SLOT_STATUS failed\n", __FUNCTION__);
-                       return IRQ_NONE;
-               }
-               dbg("%s: hp_register_write_word SLOT_STATUS with value %x\n", __FUNCTION__, temp_word); 
-       }
-       
        return IRQ_HANDLED;
 }
 
-static int hpc_get_max_lnk_speed (struct slot *slot, enum pci_bus_speed *value)
+static int hpc_get_max_lnk_speed(struct slot *slot, enum pci_bus_speed *value)
 {
-       struct php_ctlr_state_s *php_ctlr = slot->ctrl->hpc_ctlr_handle;
+       struct controller *ctrl = slot->ctrl;
        enum pcie_link_speed lnk_speed;
        u32     lnk_cap;
        int retval = 0;
 
-       DBG_ENTER_ROUTINE 
-
-       if (!php_ctlr) {
-               err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
-               return -1;
-       }
-
-       if (slot->hp_slot >= php_ctlr->num_slots) {
-               err("%s: Invalid HPC slot number!\n", __FUNCTION__);
-               return -1;
-       }
-
-       retval = hp_register_read_dword(php_ctlr->pci_dev, LNK_CAP(slot->ctrl->cap_base), lnk_cap);
-
+       retval = pciehp_readl(ctrl, LNKCAP, &lnk_cap);
        if (retval) {
-               err("%s : hp_register_read_dword  LNK_CAP failed\n", __FUNCTION__);
+               ctrl_err(ctrl, "%s: Cannot read LNKCAP register\n", __func__);
                return retval;
        }
 
@@ -1040,34 +870,22 @@ static int hpc_get_max_lnk_speed (struct slot *slot, enum pci_bus_speed *value)
        }
 
        *value = lnk_speed;
-       dbg("Max link speed = %d\n", lnk_speed);
-       DBG_LEAVE_ROUTINE 
+       ctrl_dbg(ctrl, "Max link speed = %d\n", lnk_speed);
+
        return retval;
 }
 
-static int hpc_get_max_lnk_width (struct slot *slot, enum pcie_link_width *value)
+static int hpc_get_max_lnk_width(struct slot *slot,
+                                enum pcie_link_width *value)
 {
-       struct php_ctlr_state_s *php_ctlr = slot->ctrl->hpc_ctlr_handle;
+       struct controller *ctrl = slot->ctrl;
        enum pcie_link_width lnk_wdth;
        u32     lnk_cap;
        int retval = 0;
 
-       DBG_ENTER_ROUTINE 
-
-       if (!php_ctlr) {
-               err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
-               return -1;
-       }
-
-       if (slot->hp_slot >= php_ctlr->num_slots) {
-               err("%s: Invalid HPC slot number!\n", __FUNCTION__);
-               return -1;
-       }
-
-       retval = hp_register_read_dword(php_ctlr->pci_dev, LNK_CAP(slot->ctrl->cap_base), lnk_cap);
-
+       retval = pciehp_readl(ctrl, LNKCAP, &lnk_cap);
        if (retval) {
-               err("%s : hp_register_read_dword  LNK_CAP failed\n", __FUNCTION__);
+               ctrl_err(ctrl, "%s: Cannot read LNKCAP register\n", __func__);
                return retval;
        }
 
@@ -1102,34 +920,22 @@ static int hpc_get_max_lnk_width (struct slot *slot, enum pcie_link_width *value
        }
 
        *value = lnk_wdth;
-       dbg("Max link width = %d\n", lnk_wdth);
-       DBG_LEAVE_ROUTINE 
+       ctrl_dbg(ctrl, "Max link width = %d\n", lnk_wdth);
+
        return retval;
 }
 
-static int hpc_get_cur_lnk_speed (struct slot *slot, enum pci_bus_speed *value)
+static int hpc_get_cur_lnk_speed(struct slot *slot, enum pci_bus_speed *value)
 {
-       struct php_ctlr_state_s *php_ctlr = slot->ctrl->hpc_ctlr_handle;
+       struct controller *ctrl = slot->ctrl;
        enum pcie_link_speed lnk_speed = PCI_SPEED_UNKNOWN;
        int retval = 0;
        u16 lnk_status;
 
-       DBG_ENTER_ROUTINE 
-
-       if (!php_ctlr) {
-               err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
-               return -1;
-       }
-
-       if (slot->hp_slot >= php_ctlr->num_slots) {
-               err("%s: Invalid HPC slot number!\n", __FUNCTION__);
-               return -1;
-       }
-
-       retval = hp_register_read_word(php_ctlr->pci_dev, LNK_STATUS(slot->ctrl->cap_base), lnk_status);
-
+       retval = pciehp_readw(ctrl, LNKSTATUS, &lnk_status);
        if (retval) {
-               err("%s : hp_register_read_word LNK_STATUS failed\n", __FUNCTION__);
+               ctrl_err(ctrl, "%s: Cannot read LNKSTATUS register\n",
+                        __func__);
                return retval;
        }
 
@@ -1143,37 +949,26 @@ static int hpc_get_cur_lnk_speed (struct slot *slot, enum pci_bus_speed *value)
        }
 
        *value = lnk_speed;
-       dbg("Current link speed = %d\n", lnk_speed);
-       DBG_LEAVE_ROUTINE 
+       ctrl_dbg(ctrl, "Current link speed = %d\n", lnk_speed);
+
        return retval;
 }
 
-static int hpc_get_cur_lnk_width (struct slot *slot, enum pcie_link_width *value)
+static int hpc_get_cur_lnk_width(struct slot *slot,
+                                enum pcie_link_width *value)
 {
-       struct php_ctlr_state_s *php_ctlr = slot->ctrl->hpc_ctlr_handle;
+       struct controller *ctrl = slot->ctrl;
        enum pcie_link_width lnk_wdth = PCIE_LNK_WIDTH_UNKNOWN;
        int retval = 0;
        u16 lnk_status;
 
-       DBG_ENTER_ROUTINE 
-
-       if (!php_ctlr) {
-               err("%s: Invalid HPC controller handle!\n", __FUNCTION__);
-               return -1;
-       }
-
-       if (slot->hp_slot >= php_ctlr->num_slots) {
-               err("%s: Invalid HPC slot number!\n", __FUNCTION__);
-               return -1;
-       }
-
-       retval = hp_register_read_word(php_ctlr->pci_dev, LNK_STATUS(slot->ctrl->cap_base), lnk_status);
-
+       retval = pciehp_readw(ctrl, LNKSTATUS, &lnk_status);
        if (retval) {
-               err("%s : hp_register_read_word LNK_STATUS failed\n", __FUNCTION__);
+               ctrl_err(ctrl, "%s: Cannot read LNKSTATUS register\n",
+                        __func__);
                return retval;
        }
-       
+
        switch ((lnk_status & 0x03F0) >> 4){
        case 0:
                lnk_wdth = PCIE_LNK_WIDTH_RESRV;
@@ -1205,11 +1000,12 @@ static int hpc_get_cur_lnk_width (struct slot *slot, enum pcie_link_width *value
        }
 
        *value = lnk_wdth;
-       dbg("Current link width = %d\n", lnk_wdth);
-       DBG_LEAVE_ROUTINE 
+       ctrl_dbg(ctrl, "Current link width = %d\n", lnk_wdth);
+
        return retval;
 }
 
+static void pcie_release_ctrl(struct controller *ctrl);
 static struct hpc_ops pciehp_hpc_ops = {
        .power_on_slot                  = hpc_power_on_slot,
        .power_off_slot                 = hpc_power_off_slot,
@@ -1218,349 +1014,254 @@ static struct hpc_ops pciehp_hpc_ops = {
        .get_attention_status           = hpc_get_attention_status,
        .get_latch_status               = hpc_get_latch_status,
        .get_adapter_status             = hpc_get_adapter_status,
+       .get_emi_status                 = hpc_get_emi_status,
+       .toggle_emi                     = hpc_toggle_emi,
 
        .get_max_bus_speed              = hpc_get_max_lnk_speed,
        .get_cur_bus_speed              = hpc_get_cur_lnk_speed,
        .get_max_lnk_width              = hpc_get_max_lnk_width,
        .get_cur_lnk_width              = hpc_get_cur_lnk_width,
-       
+
        .query_power_fault              = hpc_query_power_fault,
        .green_led_on                   = hpc_set_green_led_on,
        .green_led_off                  = hpc_set_green_led_off,
        .green_led_blink                = hpc_set_green_led_blink,
-       
-       .release_ctlr                   = hpc_release_ctlr,
+
+       .release_ctlr                   = pcie_release_ctrl,
        .check_lnk_status               = hpc_check_lnk_status,
 };
 
-#ifdef CONFIG_ACPI
-int pciehp_acpi_get_hp_hw_control_from_firmware(struct pci_dev *dev)
+int pcie_enable_notification(struct controller *ctrl)
 {
-       acpi_status status;
-       acpi_handle chandle, handle = DEVICE_ACPI_HANDLE(&(dev->dev));
-       struct pci_dev *pdev = dev;
-       struct pci_bus *parent;
-       struct acpi_buffer string = { ACPI_ALLOCATE_BUFFER, NULL };
+       u16 cmd, mask;
+
+       cmd = PRSN_DETECT_ENABLE;
+       if (ATTN_BUTTN(ctrl))
+               cmd |= ATTN_BUTTN_ENABLE;
+       if (POWER_CTRL(ctrl))
+               cmd |= PWR_FAULT_DETECT_ENABLE;
+       if (MRL_SENS(ctrl))
+               cmd |= MRL_DETECT_ENABLE;
+       if (!pciehp_poll_mode)
+               cmd |= HP_INTR_ENABLE | CMD_CMPL_INTR_ENABLE;
 
-       /*
-        * Per PCI firmware specification, we should run the ACPI _OSC
-        * method to get control of hotplug hardware before using it.
-        * If an _OSC is missing, we look for an OSHP to do the same thing.
-        * To handle different BIOS behavior, we look for _OSC and OSHP
-        * within the scope of the hotplug controller and its parents, upto
-        * the host bridge under which this controller exists.
-        */
-       while (!handle) {
-               /*
-                * This hotplug controller was not listed in the ACPI name
-                * space at all. Try to get acpi handle of parent pci bus.
-                */
-               if (!pdev || !pdev->bus->parent)
-                       break;
-               parent = pdev->bus->parent;
-               dbg("Could not find %s in acpi namespace, trying parent\n",
-                               pci_name(pdev));
-               if (!parent->self)
-                       /* Parent must be a host bridge */
-                       handle = acpi_get_pci_rootbridge_handle(
-                                       pci_domain_nr(parent),
-                                       parent->number);
-               else
-                       handle = DEVICE_ACPI_HANDLE(
-                                       &(parent->self->dev));
-               pdev = parent->self;
-       }
+       mask = PRSN_DETECT_ENABLE | ATTN_BUTTN_ENABLE | MRL_DETECT_ENABLE |
+              PWR_FAULT_DETECT_ENABLE | HP_INTR_ENABLE | CMD_CMPL_INTR_ENABLE;
 
-       while (handle) {
-               acpi_get_name(handle, ACPI_FULL_PATHNAME, &string);
-               dbg("Trying to get hotplug control for %s \n",
-                       (char *)string.pointer);
-               status = pci_osc_control_set(handle,
-                               OSC_PCI_EXPRESS_NATIVE_HP_CONTROL);
-               if (status == AE_NOT_FOUND)
-                       status = acpi_run_oshp(handle);
-               if (ACPI_SUCCESS(status)) {
-                       dbg("Gained control for hotplug HW for pci %s (%s)\n",
-                               pci_name(dev), (char *)string.pointer);
-                       kfree(string.pointer);
-                       return 0;
-               }
-               if (acpi_root_bridge(handle))
-                       break;
-               chandle = handle;
-               status = acpi_get_parent(chandle, &handle);
-               if (ACPI_FAILURE(status))
-                       break;
+       if (pcie_write_cmd(ctrl, cmd, mask)) {
+               ctrl_err(ctrl, "Cannot enable software notification\n");
+               return -1;
        }
-
-       err("Cannot get control of hotplug hardware for pci %s\n",
-                       pci_name(dev));
-
-       kfree(string.pointer);
-       return -1;
+       return 0;
 }
-#endif
-
-
 
-int pcie_init(struct controller * ctrl, struct pcie_device *dev)
+static void pcie_disable_notification(struct controller *ctrl)
 {
-       struct php_ctlr_state_s *php_ctlr, *p;
-       void *instance_id = ctrl;
-       int rc;
-       static int first = 1;
-       u16 temp_word;
-       u16 cap_reg;
-       u16 intr_enable = 0;
-       u32 slot_cap;
-       int cap_base, saved_cap_base;
-       u16 slot_status, slot_ctrl;
-       struct pci_dev *pdev;
-
-       DBG_ENTER_ROUTINE
-       
-       spin_lock_init(&list_lock);     
-       php_ctlr = (struct php_ctlr_state_s *) kmalloc(sizeof(struct php_ctlr_state_s), GFP_KERNEL);
+       u16 mask;
+       mask = PRSN_DETECT_ENABLE | ATTN_BUTTN_ENABLE | MRL_DETECT_ENABLE |
+              PWR_FAULT_DETECT_ENABLE | HP_INTR_ENABLE | CMD_CMPL_INTR_ENABLE;
+       if (pcie_write_cmd(ctrl, 0, mask))
+               ctrl_warn(ctrl, "Cannot disable software notification\n");
+}
 
-       if (!php_ctlr) {        /* allocate controller state data */
-               err("%s: HPC controller memory allocation error!\n", __FUNCTION__);
-               goto abort;
+static int pcie_init_notification(struct controller *ctrl)
+{
+       if (pciehp_request_irq(ctrl))
+               return -1;
+       if (pcie_enable_notification(ctrl)) {
+               pciehp_free_irq(ctrl);
+               return -1;
        }
+       return 0;
+}
 
-       memset(php_ctlr, 0, sizeof(struct php_ctlr_state_s));
-       
-       pdev = dev->port;
-       php_ctlr->pci_dev = pdev;       /* save pci_dev in context */
+static void pcie_shutdown_notification(struct controller *ctrl)
+{
+       pcie_disable_notification(ctrl);
+       pciehp_free_irq(ctrl);
+}
 
-       dbg("%s: hotplug controller vendor id 0x%x device id 0x%x\n",
-                       __FUNCTION__, pdev->vendor, pdev->device);
+static int pcie_init_slot(struct controller *ctrl)
+{
+       struct slot *slot;
 
-       saved_cap_base = pcie_cap_base;
+       slot = kzalloc(sizeof(*slot), GFP_KERNEL);
+       if (!slot)
+               return -ENOMEM;
 
-       if ((cap_base = pci_find_capability(pdev, PCI_CAP_ID_EXP)) == 0) {
-               dbg("%s: Can't find PCI_CAP_ID_EXP (0x10)\n", __FUNCTION__);
-               goto abort_free_ctlr;
-       }
+       slot->hp_slot = 0;
+       slot->ctrl = ctrl;
+       slot->bus = ctrl->pci_dev->subordinate->number;
+       slot->device = ctrl->slot_device_offset + slot->hp_slot;
+       slot->hpc_ops = ctrl->hpc_ops;
+       slot->number = ctrl->first_slot;
+       mutex_init(&slot->lock);
+       INIT_DELAYED_WORK(&slot->work, pciehp_queue_pushbutton_work);
+       list_add(&slot->slot_list, &ctrl->slot_list);
+       return 0;
+}
 
-       ctrl->cap_base = cap_base;
+static void pcie_cleanup_slot(struct controller *ctrl)
+{
+       struct slot *slot;
+       slot = list_first_entry(&ctrl->slot_list, struct slot, slot_list);
+       list_del(&slot->slot_list);
+       cancel_delayed_work(&slot->work);
+       flush_scheduled_work();
+       flush_workqueue(pciehp_wq);
+       kfree(slot);
+}
 
-       dbg("%s: pcie_cap_base %x\n", __FUNCTION__, pcie_cap_base);
+static inline void dbg_ctrl(struct controller *ctrl)
+{
+       int i;
+       u16 reg16;
+       struct pci_dev *pdev = ctrl->pci_dev;
 
-       rc = hp_register_read_word(pdev, CAP_REG(ctrl->cap_base), cap_reg);
-       if (rc) {
-               err("%s : hp_register_read_word CAP_REG failed\n", __FUNCTION__);
-               goto abort_free_ctlr;
-       }
-       dbg("%s: CAP_REG offset %x cap_reg %x\n", __FUNCTION__, CAP_REG(ctrl->cap_base), cap_reg);
+       if (!pciehp_debug)
+               return;
 
-       if (((cap_reg & SLOT_IMPL) == 0) || (((cap_reg & DEV_PORT_TYPE) != 0x0040)
-               && ((cap_reg & DEV_PORT_TYPE) != 0x0060))) {
-               dbg("%s : This is not a root port or the port is not connected to a slot\n", __FUNCTION__);
-               goto abort_free_ctlr;
-       }
+       ctrl_info(ctrl, "Hotplug Controller:\n");
+       ctrl_info(ctrl, "  Seg/Bus/Dev/Func/IRQ : %s IRQ %d\n",
+                 pci_name(pdev), pdev->irq);
+       ctrl_info(ctrl, "  Vendor ID            : 0x%04x\n", pdev->vendor);
+       ctrl_info(ctrl, "  Device ID            : 0x%04x\n", pdev->device);
+       ctrl_info(ctrl, "  Subsystem ID         : 0x%04x\n",
+                 pdev->subsystem_device);
+       ctrl_info(ctrl, "  Subsystem Vendor ID  : 0x%04x\n",
+                 pdev->subsystem_vendor);
+       ctrl_info(ctrl, "  PCIe Cap offset      : 0x%02x\n", ctrl->cap_base);
+       for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
+               if (!pci_resource_len(pdev, i))
+                       continue;
+               ctrl_info(ctrl, "  PCI resource [%d]     : 0x%llx@0x%llx\n",
+                         i, (unsigned long long)pci_resource_len(pdev, i),
+                         (unsigned long long)pci_resource_start(pdev, i));
+       }
+       ctrl_info(ctrl, "Slot Capabilities      : 0x%08x\n", ctrl->slot_cap);
+       ctrl_info(ctrl, "  Physical Slot Number : %d\n", ctrl->first_slot);
+       ctrl_info(ctrl, "  Attention Button     : %3s\n",
+                 ATTN_BUTTN(ctrl) ? "yes" : "no");
+       ctrl_info(ctrl, "  Power Controller     : %3s\n",
+                 POWER_CTRL(ctrl) ? "yes" : "no");
+       ctrl_info(ctrl, "  MRL Sensor           : %3s\n",
+                 MRL_SENS(ctrl)   ? "yes" : "no");
+       ctrl_info(ctrl, "  Attention Indicator  : %3s\n",
+                 ATTN_LED(ctrl)   ? "yes" : "no");
+       ctrl_info(ctrl, "  Power Indicator      : %3s\n",
+                 PWR_LED(ctrl)    ? "yes" : "no");
+       ctrl_info(ctrl, "  Hot-Plug Surprise    : %3s\n",
+                 HP_SUPR_RM(ctrl) ? "yes" : "no");
+       ctrl_info(ctrl, "  EMI Present          : %3s\n",
+                 EMI(ctrl)        ? "yes" : "no");
+       ctrl_info(ctrl, "  Command Completed    : %3s\n",
+                 NO_CMD_CMPL(ctrl) ? "no" : "yes");
+       pciehp_readw(ctrl, SLOTSTATUS, &reg16);
+       ctrl_info(ctrl, "Slot Status            : 0x%04x\n", reg16);
+       pciehp_readw(ctrl, SLOTCTRL, &reg16);
+       ctrl_info(ctrl, "Slot Control           : 0x%04x\n", reg16);
+}
 
-       rc = hp_register_read_dword(php_ctlr->pci_dev, SLOT_CAP(ctrl->cap_base), slot_cap);
-       if (rc) {
-               err("%s : hp_register_read_word CAP_REG failed\n", __FUNCTION__);
-               goto abort_free_ctlr;
-       }
-       dbg("%s: SLOT_CAP offset %x slot_cap %x\n", __FUNCTION__, SLOT_CAP(ctrl->cap_base), slot_cap);
+struct controller *pcie_init(struct pcie_device *dev)
+{
+       struct controller *ctrl;
+       u32 slot_cap, link_cap;
+       struct pci_dev *pdev = dev->port;
 
-       if (!(slot_cap & HP_CAP)) {
-               dbg("%s : This slot is not hot-plug capable\n", __FUNCTION__);
-               goto abort_free_ctlr;
-       }
-       /* For debugging purpose */
-       rc = hp_register_read_word(php_ctlr->pci_dev, SLOT_STATUS(ctrl->cap_base), slot_status);
-       if (rc) {
-               err("%s : hp_register_read_word SLOT_STATUS failed\n", __FUNCTION__);
-               goto abort_free_ctlr;
+       ctrl = kzalloc(sizeof(*ctrl), GFP_KERNEL);
+       if (!ctrl) {
+               dev_err(&dev->device, "%s: Out of memory\n", __func__);
+               goto abort;
        }
-       dbg("%s: SLOT_STATUS offset %x slot_status %x\n", __FUNCTION__, SLOT_STATUS(ctrl->cap_base), slot_status);
+       INIT_LIST_HEAD(&ctrl->slot_list);
 
-       rc = hp_register_read_word(php_ctlr->pci_dev, SLOT_CTRL(ctrl->cap_base), slot_ctrl);
-       if (rc) {
-               err("%s : hp_register_read_word SLOT_CTRL failed\n", __FUNCTION__);
-               goto abort_free_ctlr;
+       ctrl->pcie = dev;
+       ctrl->pci_dev = pdev;
+       ctrl->cap_base = pci_find_capability(pdev, PCI_CAP_ID_EXP);
+       if (!ctrl->cap_base) {
+               ctrl_err(ctrl, "Cannot find PCI Express capability\n");
+               goto abort_ctrl;
        }
-       dbg("%s: SLOT_CTRL offset %x slot_ctrl %x\n", __FUNCTION__, SLOT_CTRL(ctrl->cap_base), slot_ctrl);
-
-       if (first) {
-               spin_lock_init(&hpc_event_lock);
-               first = 0;
+       if (pciehp_readl(ctrl, SLOTCAP, &slot_cap)) {
+               ctrl_err(ctrl, "Cannot read SLOTCAP register\n");
+               goto abort_ctrl;
        }
 
-       for ( rc = 0; rc < DEVICE_COUNT_RESOURCE; rc++)
-               if (pci_resource_len(pdev, rc) > 0)
-                       dbg("pci resource[%d] start=0x%llx(len=0x%llx)\n", rc,
-                           (unsigned long long)pci_resource_start(pdev, rc),
-                           (unsigned long long)pci_resource_len(pdev, rc));
-
-       info("HPC vendor_id %x device_id %x ss_vid %x ss_did %x\n", pdev->vendor, pdev->device, 
-               pdev->subsystem_vendor, pdev->subsystem_device);
-
+       ctrl->slot_cap = slot_cap;
+       ctrl->first_slot = slot_cap >> 19;
+       ctrl->slot_device_offset = 0;
+       ctrl->num_slots = 1;
+       ctrl->hpc_ops = &pciehp_hpc_ops;
        mutex_init(&ctrl->crit_sect);
        mutex_init(&ctrl->ctrl_lock);
-
-       /* setup wait queue */
        init_waitqueue_head(&ctrl->queue);
+       dbg_ctrl(ctrl);
+       /*
+        * Controller doesn't notify of command completion if the "No
+        * Command Completed Support" bit is set in Slot Capability
+        * register or the controller supports none of power
+        * controller, attention led, power led and EMI.
+        */
+       if (NO_CMD_CMPL(ctrl) ||
+           !(POWER_CTRL(ctrl) | ATTN_LED(ctrl) | PWR_LED(ctrl) | EMI(ctrl)))
+           ctrl->no_cmd_complete = 1;
+
+        /* Check if Data Link Layer Link Active Reporting is implemented */
+        if (pciehp_readl(ctrl, LNKCAP, &link_cap)) {
+                ctrl_err(ctrl, "%s: Cannot read LNKCAP register\n", __func__);
+                goto abort_ctrl;
+        }
+        if (link_cap & LINK_ACTIVE_REPORTING) {
+                ctrl_dbg(ctrl, "Link Active Reporting supported\n");
+                ctrl->link_active_reporting = 1;
+        }
+
+       /* Clear all remaining event bits in Slot Status register */
+       if (pciehp_writew(ctrl, SLOTSTATUS, 0x1f))
+               goto abort_ctrl;
+
+       /* Disable sotfware notification */
+       pcie_disable_notification(ctrl);
 
-       /* find the IRQ */
-       php_ctlr->irq = dev->irq;
-
-       /* Save interrupt callback info */
-       php_ctlr->attention_button_callback = pciehp_handle_attention_button;
-       php_ctlr->switch_change_callback = pciehp_handle_switch_change;
-       php_ctlr->presence_change_callback = pciehp_handle_presence_change;
-       php_ctlr->power_fault_callback = pciehp_handle_power_fault;
-       php_ctlr->callback_instance_id = instance_id;
-
-       /* return PCI Controller Info */
-       php_ctlr->slot_device_offset = 0;
-       php_ctlr->num_slots = 1;
-
-       /* Mask Hot-plug Interrupt Enable */
-       rc = hp_register_read_word(pdev, SLOT_CTRL(ctrl->cap_base), temp_word);
-       if (rc) {
-               err("%s : hp_register_read_word SLOT_CTRL failed\n", __FUNCTION__);
-               goto abort_free_ctlr;
-       }
-
-       dbg("%s: SLOT_CTRL %x value read %x\n", __FUNCTION__, SLOT_CTRL(ctrl->cap_base), temp_word);
-       temp_word = (temp_word & ~HP_INTR_ENABLE & ~CMD_CMPL_INTR_ENABLE) | 0x00;
-
-       rc = hp_register_write_word(pdev, SLOT_CTRL(ctrl->cap_base), temp_word);
-       if (rc) {
-               err("%s : hp_register_write_word SLOT_CTRL failed\n", __FUNCTION__);
-               goto abort_free_ctlr;
-       }
-
-       rc = hp_register_read_word(php_ctlr->pci_dev, SLOT_STATUS(ctrl->cap_base), slot_status);
-       if (rc) {
-               err("%s : hp_register_read_word SLOT_STATUS failed\n", __FUNCTION__);
-               goto abort_free_ctlr;
-       }
-
-       temp_word = 0x1F; /* Clear all events */
-       rc = hp_register_write_word(php_ctlr->pci_dev, SLOT_STATUS(ctrl->cap_base), temp_word);
-       if (rc) {
-               err("%s : hp_register_write_word SLOT_STATUS failed\n", __FUNCTION__);
-               goto abort_free_ctlr;
-       }
-
-       if (pciehp_poll_mode)  {/* Install interrupt polling code */
-               /* Install and start the interrupt polling timer */
-               init_timer(&php_ctlr->int_poll_timer);
-               start_int_poll_timer( php_ctlr, 10 );   /* start with 10 second delay */
-       } else {
-               /* Installs the interrupt handler */
-               rc = request_irq(php_ctlr->irq, pcie_isr, IRQF_SHARED, MY_NAME, (void *) ctrl);
-               dbg("%s: request_irq %d for hpc%d (returns %d)\n", __FUNCTION__, php_ctlr->irq, ctlr_seq_num, rc);
-               if (rc) {
-                       err("Can't get irq %d for the hotplug controller\n", php_ctlr->irq);
-                       goto abort_free_ctlr;
-               }
-       }
-
-       dbg("pciehp ctrl b:d:f:irq=0x%x:%x:%x:%x\n", pdev->bus->number,
-               PCI_SLOT(pdev->devfn), PCI_FUNC(pdev->devfn), dev->irq);
-
-       rc = hp_register_read_word(pdev, SLOT_CTRL(ctrl->cap_base), temp_word);
-       if (rc) {
-               err("%s : hp_register_read_word SLOT_CTRL failed\n", __FUNCTION__);
-               goto abort_free_irq;
-       }
-
-       intr_enable = intr_enable | PRSN_DETECT_ENABLE;
-
-       if (ATTN_BUTTN(slot_cap))
-               intr_enable = intr_enable | ATTN_BUTTN_ENABLE;
-       
-       if (POWER_CTRL(slot_cap))
-               intr_enable = intr_enable | PWR_FAULT_DETECT_ENABLE;
-       
-       if (MRL_SENS(slot_cap))
-               intr_enable = intr_enable | MRL_DETECT_ENABLE;
-
-       temp_word = (temp_word & ~intr_enable) | intr_enable; 
-
-       if (pciehp_poll_mode) {
-               temp_word = (temp_word & ~HP_INTR_ENABLE) | 0x0;
-       } else {
-               temp_word = (temp_word & ~HP_INTR_ENABLE) | HP_INTR_ENABLE;
-       }
-
-       /* Unmask Hot-plug Interrupt Enable for the interrupt notification mechanism case */
-       rc = hp_register_write_word(pdev, SLOT_CTRL(ctrl->cap_base), temp_word);
-       if (rc) {
-               err("%s : hp_register_write_word SLOT_CTRL failed\n", __FUNCTION__);
-               goto abort_free_irq;
-       }
-       rc = hp_register_read_word(php_ctlr->pci_dev, SLOT_STATUS(ctrl->cap_base), slot_status);
-       if (rc) {
-               err("%s : hp_register_read_word SLOT_STATUS failed\n", __FUNCTION__);
-               goto abort_disable_intr;
-       }
-       
-       temp_word =  0x1F; /* Clear all events */
-       rc = hp_register_write_word(php_ctlr->pci_dev, SLOT_STATUS(ctrl->cap_base), temp_word);
-       if (rc) {
-               err("%s : hp_register_write_word SLOT_STATUS failed\n", __FUNCTION__);
-               goto abort_disable_intr;
-       }
-       
-       if (pciehp_force) {
-               dbg("Bypassing BIOS check for pciehp use on %s\n",
-                               pci_name(ctrl->pci_dev));
-       } else {
-               rc = pciehp_get_hp_hw_control_from_firmware(ctrl->pci_dev);
-               if (rc)
-                       goto abort_disable_intr;
-       }
-
-       /*  Add this HPC instance into the HPC list */
-       spin_lock(&list_lock);
-       if (php_ctlr_list_head == 0) {
-               php_ctlr_list_head = php_ctlr;
-               p = php_ctlr_list_head;
-               p->pnext = NULL;
-       } else {
-               p = php_ctlr_list_head;
-
-               while (p->pnext)
-                       p = p->pnext;
-
-               p->pnext = php_ctlr;
+       /*
+        * If this is the first controller to be initialized,
+        * initialize the pciehp work queue
+        */
+       if (atomic_add_return(1, &pciehp_num_controllers) == 1) {
+               pciehp_wq = create_singlethread_workqueue("pciehpd");
+               if (!pciehp_wq)
+                       goto abort_ctrl;
        }
-       spin_unlock(&list_lock);
 
-       ctlr_seq_num++;
-       ctrl->hpc_ctlr_handle = php_ctlr;
-       ctrl->hpc_ops = &pciehp_hpc_ops;
+       ctrl_info(ctrl, "HPC vendor_id %x device_id %x ss_vid %x ss_did %x\n",
+                 pdev->vendor, pdev->device, pdev->subsystem_vendor,
+                 pdev->subsystem_device);
 
-       DBG_LEAVE_ROUTINE
-       return 0;
+       if (pcie_init_slot(ctrl))
+               goto abort_ctrl;
 
-       /* We end up here for the many possible ways to fail this API.  */
-abort_disable_intr:
-       rc = hp_register_read_word(pdev, SLOT_CTRL(ctrl->cap_base), temp_word);
-       if (!rc) {
-               temp_word &= ~(intr_enable | HP_INTR_ENABLE);
-               rc = hp_register_write_word(pdev, SLOT_CTRL(ctrl->cap_base), temp_word);
-       }
-       if (rc)
-               err("%s : disabling interrupts failed\n", __FUNCTION__);
+       if (pcie_init_notification(ctrl))
+               goto abort_slot;
 
-abort_free_irq:
-       if (pciehp_poll_mode)
-               del_timer_sync(&php_ctlr->int_poll_timer);
-       else
-               free_irq(php_ctlr->irq, ctrl);
+       return ctrl;
 
-abort_free_ctlr:
-       pcie_cap_base = saved_cap_base;
-       kfree(php_ctlr);
+abort_slot:
+       pcie_cleanup_slot(ctrl);
+abort_ctrl:
+       kfree(ctrl);
 abort:
-       DBG_LEAVE_ROUTINE
-       return -1;
+       return NULL;
+}
+
+void pcie_release_ctrl(struct controller *ctrl)
+{
+       pcie_shutdown_notification(ctrl);
+       pcie_cleanup_slot(ctrl);
+       /*
+        * If this is the last controller to be released, destroy the
+        * pciehp work queue
+        */
+       if (atomic_dec_and_test(&pciehp_num_controllers))
+               destroy_workqueue(pciehp_wq);
+       kfree(ctrl);
 }