1 files changed, 57 insertions, 137 deletions

diff --git a/drivers/pci/hotplug/pciehp.h b/drivers/pci/hotplug/pciehp.h
index 4fb12fcda563..d19fcae8a7c0 100644
--- a/drivers/pci/hotplug/pciehp.h
+++ b/drivers/pci/hotplug/pciehp.h
@@ -44,15 +44,20 @@ extern int pciehp_poll_time;
 extern int pciehp_debug;
 extern int pciehp_force;
 
-/*#define dbg(format, arg...) do { if (pciehp_debug) printk(KERN_DEBUG "%s: " format, MY_NAME , ## arg); } while (0)*/
-#define dbg(format, arg...) do { if (pciehp_debug) printk("%s: " format, MY_NAME , ## arg); } while (0)
-#define err(format, arg...) printk(KERN_ERR "%s: " format, MY_NAME , ## arg)
-#define info(format, arg...) printk(KERN_INFO "%s: " format, MY_NAME , ## arg)
-#define warn(format, arg...) printk(KERN_WARNING "%s: " format, MY_NAME , ## arg)
-
+#define dbg(format, arg...)                                             \
+        do {                                                            \
+                if (pciehp_debug)                                       \
+                        printk("%s: " format, MY_NAME , ## arg);        \
+        } while (0)
+#define err(format, arg...)                                             \
+        printk(KERN_ERR "%s: " format, MY_NAME , ## arg)
+#define info(format, arg...)                                            \
+        printk(KERN_INFO "%s: " format, MY_NAME , ## arg)
+#define warn(format, arg...)                                            \
+        printk(KERN_WARNING "%s: " format, MY_NAME , ## arg)
 
+#define SLOT_NAME_SIZE 10
 struct slot {
-        struct slot *next;
         u8 bus;
         u8 device;
         u32 number;
@@ -63,6 +68,8 @@ struct slot {
         struct hpc_ops *hpc_ops;
         struct hotplug_slot *hotplug_slot;
         struct list_head        slot_list;
+        char name[SLOT_NAME_SIZE];
+        unsigned long last_emi_toggle;
 };
 
 struct event_info {
@@ -70,34 +77,15 @@ struct event_info {
         u8 hp_slot;
 };
 
-typedef u8(*php_intr_callback_t) (u8 hp_slot, void *instance_id);
-
-struct php_ctlr_state_s {
-        struct php_ctlr_state_s *pnext;
-        struct pci_dev *pci_dev;
-        unsigned int irq;
-        unsigned long flags;                            /* spinlock's */
-        u32 slot_device_offset;
-        u32 num_slots;
-        struct timer_list       int_poll_timer;         /* Added for poll event */
-        php_intr_callback_t     attention_button_callback;
-        php_intr_callback_t     switch_change_callback;
-        php_intr_callback_t     presence_change_callback;
-        php_intr_callback_t     power_fault_callback;
-        void                    *callback_instance_id;
-        struct ctrl_reg         *creg;                          /* Ptr to controller register space */
-};
-
 #define MAX_EVENTS              10
 struct controller {
         struct controller *next;
         struct mutex crit_sect;         /* critical section mutex */
         struct mutex ctrl_lock;         /* controller lock */
-        struct php_ctlr_state_s *hpc_ctlr_handle; /* HPC controller handle */
         int num_slots;                  /* Number of slots on ctlr */
         int slot_num_inc;               /* 1 or -1 */
         struct pci_dev *pci_dev;
-        struct pci_bus *pci_bus;
+        struct list_head slot_list;
         struct event_info event_queue[MAX_EVENTS];
         struct slot *slot;
         struct hpc_ops *hpc_ops;
@@ -112,6 +100,8 @@ struct controller {
         u8 ctrlcap;
         u16 vendor_id;
         u8 cap_base;
+        struct timer_list poll_timer;
+        volatile int cmd_busy;
 };
 
 #define INT_BUTTON_IGNORE               0
@@ -131,8 +121,6 @@ struct controller {
 #define POWERON_STATE                   3
 #define POWEROFF_STATE                  4
 
-#define PCI_TO_PCI_BRIDGE_CLASS         0x00060400
-
 /* Error messages */
 #define INTERLOCK_OPEN                  0x00000002
 #define ADD_NOT_SUPPORTED               0x00000003
@@ -144,10 +132,6 @@ struct controller {
 #define WRONG_BUS_FREQUENCY             0x0000000D
 #define POWER_FAILURE                   0x0000000E
 
-#define REMOVE_NOT_SUPPORTED            0x00000003
-
-#define DISABLE_CARD                    1
-
 /* Field definitions in Slot Capabilities Register */
 #define ATTN_BUTTN_PRSN 0x00000001
 #define PWR_CTRL_PRSN   0x00000002
@@ -155,6 +139,7 @@ struct controller {
 #define ATTN_LED_PRSN   0x00000008
 #define PWR_LED_PRSN    0x00000010
 #define HP_SUPR_RM_SUP  0x00000020
+#define EMI_PRSN        0x00020000
 
 #define ATTN_BUTTN(cap)         (cap & ATTN_BUTTN_PRSN)
 #define POWER_CTRL(cap)         (cap & PWR_CTRL_PRSN)
@@ -162,130 +147,65 @@ struct controller {
 #define ATTN_LED(cap)           (cap & ATTN_LED_PRSN)
 #define PWR_LED(cap)            (cap & PWR_LED_PRSN) 
 #define HP_SUPR_RM(cap)         (cap & HP_SUPR_RM_SUP)
-
-/*
- * error Messages
- */
-#define msg_initialization_err  "Initialization failure, error=%d\n"
-#define msg_button_on           "PCI slot #%s - powering on due to button press.\n"
-#define msg_button_off          "PCI slot #%s - powering off due to button press.\n"
-#define msg_button_cancel       "PCI slot #%s - action canceled due to button press.\n"
-#define msg_button_ignore       "PCI slot #%s - button press ignored.  (action in progress...)\n"
-
-/* controller functions */
-extern int      pciehp_event_start_thread       (void);
-extern void     pciehp_event_stop_thread        (void);
-extern int      pciehp_enable_slot              (struct slot *slot);
-extern int      pciehp_disable_slot             (struct slot *slot);
-
-extern u8       pciehp_handle_attention_button  (u8 hp_slot, void *inst_id);
-extern u8       pciehp_handle_switch_change     (u8 hp_slot, void *inst_id);
-extern u8       pciehp_handle_presence_change   (u8 hp_slot, void *inst_id);
-extern u8       pciehp_handle_power_fault       (u8 hp_slot, void *inst_id);
-/* extern void  long_delay (int delay); */
-
-/* pci functions */
-extern int      pciehp_configure_device         (struct slot *p_slot);
-extern int      pciehp_unconfigure_device       (struct slot *p_slot);
-
-
+#define EMI(cap)                (cap & EMI_PRSN)
+
+extern int pciehp_event_start_thread(void);
+extern void pciehp_event_stop_thread(void);
+extern int pciehp_enable_slot(struct slot *slot);
+extern int pciehp_disable_slot(struct slot *slot);
+extern u8 pciehp_handle_attention_button(u8 hp_slot, struct controller *ctrl);
+extern u8 pciehp_handle_switch_change(u8 hp_slot, struct controller *ctrl);
+extern u8 pciehp_handle_presence_change(u8 hp_slot, struct controller *ctrl);
+extern u8 pciehp_handle_power_fault(u8 hp_slot, struct controller *ctrl);
+extern int pciehp_configure_device(struct slot *p_slot);
+extern int pciehp_unconfigure_device(struct slot *p_slot);
+int pcie_init(struct controller *ctrl, struct pcie_device *dev);
 
 /* Global variables */
 extern struct controller *pciehp_ctrl_list;
 
-/* Inline functions */
-
 static inline struct slot *pciehp_find_slot(struct controller *ctrl, u8 device)
 {
-        struct slot *p_slot, *tmp_slot = NULL;
-
-        p_slot = ctrl->slot;
+        struct slot *slot;
 
-        while (p_slot && (p_slot->device != device)) {
-                tmp_slot = p_slot;
-                p_slot = p_slot->next;
+        list_for_each_entry(slot, &ctrl->slot_list, slot_list) {
+                if (slot->device == device)
+                        return slot;
         }
-        if (p_slot == NULL) {
-                err("ERROR: pciehp_find_slot device=0x%x\n", device);
-                p_slot = tmp_slot;
-        }
-
-        return p_slot;
-}
-
-static inline int wait_for_ctrl_irq(struct controller *ctrl)
-{
-        int retval = 0;
-
-        DECLARE_WAITQUEUE(wait, current);
-
-        add_wait_queue(&ctrl->queue, &wait);
-        if (!pciehp_poll_mode)
-                /* Sleep for up to 1 second */
-                msleep_interruptible(1000);
-        else
-                msleep_interruptible(2500);
-        
-        remove_wait_queue(&ctrl->queue, &wait);
-        if (signal_pending(current))
-                retval =  -EINTR;
-
-        return retval;
-}
-
-#define SLOT_NAME_SIZE 10
 
-static inline void make_slot_name(char *buffer, int buffer_size, struct slot *slot)
-{
-        snprintf(buffer, buffer_size, "%04d_%04d", slot->bus, slot->number);
+        err("%s: slot (device=0x%x) not found\n", __FUNCTION__, device);
+        return NULL;
 }
 
-enum php_ctlr_type {
-        PCI,
-        ISA,
-        ACPI
-};
-
-int pcie_init(struct controller *ctrl, struct pcie_device *dev);
-
-/* This has no meaning for PCI Express, as there is only 1 slot per port */
-int pcie_get_ctlr_slot_config(struct controller *ctrl,
-                int *num_ctlr_slots,
-                int *first_device_num,
-                int *physical_slot_num,
-                u8 *ctrlcap);
-
 struct hpc_ops {
-        int     (*power_on_slot)        (struct slot *slot);
-        int     (*power_off_slot)       (struct slot *slot);
-        int     (*get_power_status)     (struct slot *slot, u8 *status);
-        int     (*get_attention_status) (struct slot *slot, u8 *status);
-        int     (*set_attention_status) (struct slot *slot, u8 status);
-        int     (*get_latch_status)     (struct slot *slot, u8 *status);
-        int     (*get_adapter_status)   (struct slot *slot, u8 *status);
-
-        int     (*get_max_bus_speed)    (struct slot *slot, enum pci_bus_speed *speed);
-        int     (*get_cur_bus_speed)    (struct slot *slot, enum pci_bus_speed *speed);
-
-        int     (*get_max_lnk_width)    (struct slot *slot, enum pcie_link_width *value);
-        int     (*get_cur_lnk_width)    (struct slot *slot, enum pcie_link_width *value);
-        
-        int     (*query_power_fault)    (struct slot *slot);
-        void    (*green_led_on)         (struct slot *slot);
-        void    (*green_led_off)        (struct slot *slot);
-        void    (*green_led_blink)      (struct slot *slot);
-        void    (*release_ctlr)         (struct controller *ctrl);
-        int     (*check_lnk_status)     (struct controller *ctrl);
+        int (*power_on_slot)(struct slot *slot);
+        int (*power_off_slot)(struct slot *slot);
+        int (*get_power_status)(struct slot *slot, u8 *status);
+        int (*get_attention_status)(struct slot *slot, u8 *status);
+        int (*set_attention_status)(struct slot *slot, u8 status);
+        int (*get_latch_status)(struct slot *slot, u8 *status);
+        int (*get_adapter_status)(struct slot *slot, u8 *status);
+        int (*get_emi_status)(struct slot *slot, u8 *status);
+        int (*toggle_emi)(struct slot *slot);
+        int (*get_max_bus_speed)(struct slot *slot, enum pci_bus_speed *speed);
+        int (*get_cur_bus_speed)(struct slot *slot, enum pci_bus_speed *speed);
+        int (*get_max_lnk_width)(struct slot *slot, enum pcie_link_width *val);
+        int (*get_cur_lnk_width)(struct slot *slot, enum pcie_link_width *val);
+        int (*query_power_fault)(struct slot *slot);
+        void (*green_led_on)(struct slot *slot);
+        void (*green_led_off)(struct slot *slot);
+        void (*green_led_blink)(struct slot *slot);
+        void (*release_ctlr)(struct controller *ctrl);
+        int (*check_lnk_status)(struct controller *ctrl);
 };
 
-
 #ifdef CONFIG_ACPI
 #include <acpi/acpi.h>
 #include <acpi/acpi_bus.h>
 #include <acpi/actypes.h>
 #include <linux/pci-acpi.h>
 
-#define pciehp_get_hp_hw_control_from_firmware(dev) \
+#define pciehp_get_hp_hw_control_from_firmware(dev)                     \
         pciehp_acpi_get_hp_hw_control_from_firmware(dev)
 static inline int pciehp_get_hp_params_from_firmware(struct pci_dev *dev,
                         struct hotplug_params *hpp)