Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
[pandora-kernel.git] / drivers / pci / hotplug / shpchp_ctrl.c
index 2411f3b..6bb8473 100644 (file)
@@ -36,7 +36,9 @@
 #include "../pci.h"
 #include "shpchp.h"
 
-static void interrupt_event_handler(void *data);
+static void interrupt_event_handler(struct work_struct *work);
+static int shpchp_enable_slot(struct slot *p_slot);
+static int shpchp_disable_slot(struct slot *p_slot);
 
 static int queue_interrupt_event(struct slot *p_slot, u32 event_type)
 {
@@ -48,16 +50,15 @@ static int queue_interrupt_event(struct slot *p_slot, u32 event_type)
 
        info->event_type = event_type;
        info->p_slot = p_slot;
-       INIT_WORK(&info->work, interrupt_event_handler, info);
+       INIT_WORK(&info->work, interrupt_event_handler);
 
-       queue_work(shpchp_wq, &info->work);
+       schedule_work(&info->work);
 
        return 0;
 }
 
-u8 shpchp_handle_attention_button(u8 hp_slot, void *inst_id)
+u8 shpchp_handle_attention_button(u8 hp_slot, struct controller *ctrl)
 {
-       struct controller *ctrl = (struct controller *) inst_id;
        struct slot *p_slot;
        u32 event_type;
 
@@ -70,36 +71,17 @@ u8 shpchp_handle_attention_button(u8 hp_slot, void *inst_id)
        /*
         *  Button pressed - See if need to TAKE ACTION!!!
         */
-       info("Button pressed on Slot(%d)\n", ctrl->first_slot + hp_slot);
+       info("Button pressed on Slot(%s)\n", p_slot->name);
        event_type = INT_BUTTON_PRESS;
 
-       if ((p_slot->state == BLINKINGON_STATE)
-           || (p_slot->state == BLINKINGOFF_STATE)) {
-               /* Cancel if we are still blinking; this means that we press the
-                * attention again before the 5 sec. limit expires to cancel hot-add
-                * or hot-remove
-                */
-               event_type = INT_BUTTON_CANCEL;
-               info("Button cancel on Slot(%d)\n", ctrl->first_slot + hp_slot);
-       } else if ((p_slot->state == POWERON_STATE)
-                  || (p_slot->state == POWEROFF_STATE)) {
-               /* Ignore if the slot is on power-on or power-off state; this 
-                * means that the previous attention button action to hot-add or
-                * hot-remove is undergoing
-                */
-               event_type = INT_BUTTON_IGNORE;
-               info("Button ignore on Slot(%d)\n", ctrl->first_slot + hp_slot);
-       }
-
        queue_interrupt_event(p_slot, event_type);
 
        return 0;
 
 }
 
-u8 shpchp_handle_switch_change(u8 hp_slot, void *inst_id)
+u8 shpchp_handle_switch_change(u8 hp_slot, struct controller *ctrl)
 {
-       struct controller *ctrl = (struct controller *) inst_id;
        struct slot *p_slot;
        u8 getstatus;
        u32 event_type;
@@ -117,7 +99,7 @@ u8 shpchp_handle_switch_change(u8 hp_slot, void *inst_id)
                /*
                 * Switch opened
                 */
-               info("Latch open on Slot(%d)\n", ctrl->first_slot + hp_slot);
+               info("Latch open on Slot(%s)\n", p_slot->name);
                event_type = INT_SWITCH_OPEN;
                if (p_slot->pwr_save && p_slot->presence_save) {
                        event_type = INT_POWER_FAULT;
@@ -127,7 +109,7 @@ u8 shpchp_handle_switch_change(u8 hp_slot, void *inst_id)
                /*
                 *  Switch closed
                 */
-               info("Latch close on Slot(%d)\n", ctrl->first_slot + hp_slot);
+               info("Latch close on Slot(%s)\n", p_slot->name);
                event_type = INT_SWITCH_CLOSE;
        }
 
@@ -136,9 +118,8 @@ u8 shpchp_handle_switch_change(u8 hp_slot, void *inst_id)
        return 1;
 }
 
-u8 shpchp_handle_presence_change(u8 hp_slot, void *inst_id)
+u8 shpchp_handle_presence_change(u8 hp_slot, struct controller *ctrl)
 {
-       struct controller *ctrl = (struct controller *) inst_id;
        struct slot *p_slot;
        u32 event_type;
 
@@ -155,13 +136,13 @@ u8 shpchp_handle_presence_change(u8 hp_slot, void *inst_id)
                /*
                 * Card Present
                 */
-               info("Card present on Slot(%d)\n", ctrl->first_slot + hp_slot);
+               info("Card present on Slot(%s)\n", p_slot->name);
                event_type = INT_PRESENCE_ON;
        } else {
                /*
                 * Not Present
                 */
-               info("Card not present on Slot(%d)\n", ctrl->first_slot + hp_slot);
+               info("Card not present on Slot(%s)\n", p_slot->name);
                event_type = INT_PRESENCE_OFF;
        }
 
@@ -170,9 +151,8 @@ u8 shpchp_handle_presence_change(u8 hp_slot, void *inst_id)
        return 1;
 }
 
-u8 shpchp_handle_power_fault(u8 hp_slot, void *inst_id)
+u8 shpchp_handle_power_fault(u8 hp_slot, struct controller *ctrl)
 {
-       struct controller *ctrl = (struct controller *) inst_id;
        struct slot *p_slot;
        u32 event_type;
 
@@ -185,14 +165,14 @@ u8 shpchp_handle_power_fault(u8 hp_slot, void *inst_id)
                /*
                 * Power fault Cleared
                 */
-               info("Power fault cleared on Slot(%d)\n", ctrl->first_slot + hp_slot);
+               info("Power fault cleared on Slot(%s)\n", p_slot->name);
                p_slot->status = 0x00;
                event_type = INT_POWER_FAULT_CLEAR;
        } else {
                /*
                 *   Power fault
                 */
-               info("Power fault on Slot(%d)\n", ctrl->first_slot + hp_slot);
+               info("Power fault on Slot(%s)\n", p_slot->name);
                event_type = INT_POWER_FAULT;
                /* set power fault status for this board */
                p_slot->status = 0xFF;
@@ -214,7 +194,8 @@ static int change_bus_speed(struct controller *ctrl, struct slot *p_slot,
 
        dbg("%s: change to speed %d\n", __FUNCTION__, speed);
        if ((rc = p_slot->hpc_ops->set_bus_speed_mode(p_slot, speed))) {
-               err("%s: Issue of set bus speed mode command failed\n", __FUNCTION__);
+               err("%s: Issue of set bus speed mode command failed\n",
+                   __FUNCTION__);
                return WRONG_BUS_FREQUENCY;
        }
        return rc;
@@ -225,33 +206,26 @@ static int fix_bus_speed(struct controller *ctrl, struct slot *pslot,
                enum pci_bus_speed msp)
 { 
        int rc = 0;
-       
-       if (flag != 0) { /* Other slots on the same bus are occupied */
-               if ( asp < bsp ) {
-                       err("%s: speed of bus %x and adapter %x mismatch\n", __FUNCTION__, bsp, asp);
-                       return WRONG_BUS_FREQUENCY;
+
+       /*
+        * If other slots on the same bus are occupied, we cannot
+        * change the bus speed.
+        */
+       if (flag) {
+               if (asp < bsp) {
+                       err("%s: speed of bus %x and adapter %x mismatch\n",
+                           __FUNCTION__, bsp, asp);
+                       rc = WRONG_BUS_FREQUENCY;
                }
+               return rc;
+       }
+
+       if (asp < msp) {
+               if (bsp != asp)
+                       rc = change_bus_speed(ctrl, pslot, asp);
        } else {
-               /* Other slots on the same bus are empty */
-               if (msp == bsp) {
-               /* if adapter_speed >= bus_speed, do nothing */
-                       if (asp < bsp) {
-                               /* 
-                               * Try to lower bus speed to accommodate the adapter if other slots 
-                               * on the same controller are empty
-                               */
-                               if ((rc = change_bus_speed(ctrl, pslot, asp)))
-                                       return rc;
-                       } 
-               } else {
-                       if (asp < msp) {
-                               if ((rc = change_bus_speed(ctrl, pslot, asp)))
-                                       return rc;
-                       } else {
-                               if ((rc = change_bus_speed(ctrl, pslot, msp)))
-                                       return rc;
-                       }
-               }
+               if (bsp != msp)
+                       rc = change_bus_speed(ctrl, pslot, msp);
        }
        return rc;
 }
@@ -268,8 +242,7 @@ static int board_added(struct slot *p_slot)
        u8 hp_slot;
        u8 slots_not_empty = 0;
        int rc = 0;
-       enum pci_bus_speed adapter_speed, bus_speed, max_bus_speed;
-       u8 pi, mode;
+       enum pci_bus_speed asp, bsp, msp;
        struct controller *ctrl = p_slot->ctrl;
 
        hp_slot = p_slot->device - ctrl->slot_device_offset;
@@ -301,109 +274,36 @@ static int board_added(struct slot *p_slot)
                }
        }
  
-       rc = p_slot->hpc_ops->get_adapter_speed(p_slot, &adapter_speed);
-       /* 0 = PCI 33Mhz, 1 = PCI 66 Mhz, 2 = PCI-X 66 PA, 4 = PCI-X 66 ECC, */
-       /* 5 = PCI-X 133 PA, 7 = PCI-X 133 ECC,  0xa = PCI-X 133 Mhz 266, */
-       /* 0xd = PCI-X 133 Mhz 533 */
-       /* This encoding is different from the one used in cur_bus_speed & */
-       /* max_bus_speed */
-
-       if (rc  || adapter_speed == PCI_SPEED_UNKNOWN) {
-               err("%s: Can't get adapter speed or bus mode mismatch\n", __FUNCTION__);
+       rc = p_slot->hpc_ops->get_adapter_speed(p_slot, &asp);
+       if (rc) {
+               err("%s: Can't get adapter speed or bus mode mismatch\n",
+                   __FUNCTION__);
                return WRONG_BUS_FREQUENCY;
        }
 
-       rc = p_slot->hpc_ops->get_cur_bus_speed(p_slot, &bus_speed);
-       if (rc || bus_speed == PCI_SPEED_UNKNOWN) {
+       rc = p_slot->hpc_ops->get_cur_bus_speed(p_slot, &bsp);
+       if (rc) {
                err("%s: Can't get bus operation speed\n", __FUNCTION__);
                return WRONG_BUS_FREQUENCY;
        }
 
-       rc = p_slot->hpc_ops->get_max_bus_speed(p_slot, &max_bus_speed);
-       if (rc || max_bus_speed == PCI_SPEED_UNKNOWN) {
+       rc = p_slot->hpc_ops->get_max_bus_speed(p_slot, &msp);
+       if (rc) {
                err("%s: Can't get max bus operation speed\n", __FUNCTION__);
-               max_bus_speed = bus_speed;
-       }
-
-       if ((rc  = p_slot->hpc_ops->get_prog_int(p_slot, &pi))) {
-               err("%s: Can't get controller programming interface, set it to 1\n", __FUNCTION__);
-               pi = 1;
+               msp = bsp;
        }
 
        /* Check if there are other slots or devices on the same bus */
        if (!list_empty(&ctrl->pci_dev->subordinate->devices))
                slots_not_empty = 1;
 
-       dbg("%s: slots_not_empty %d, pi %d\n", __FUNCTION__, 
-               slots_not_empty, pi);
-       dbg("adapter_speed %d, bus_speed %d, max_bus_speed %d\n", 
-               adapter_speed, bus_speed, max_bus_speed);
+       dbg("%s: slots_not_empty %d, adapter_speed %d, bus_speed %d, "
+           "max_bus_speed %d\n", __FUNCTION__, slots_not_empty, asp,
+           bsp, msp);
 
-       if (pi == 2) {
-               dbg("%s: In PI = %d\n", __FUNCTION__, pi);
-               if ((rc = p_slot->hpc_ops->get_mode1_ECC_cap(p_slot, &mode))) {
-                       err("%s: Can't get Mode1_ECC, set mode to 0\n", __FUNCTION__);
-                       mode = 0;
-               }
-
-               switch (adapter_speed) {
-               case PCI_SPEED_133MHz_PCIX_533:
-               case PCI_SPEED_133MHz_PCIX_266:
-                       if ((bus_speed != adapter_speed) &&
-                          ((rc = fix_bus_speed(ctrl, p_slot, slots_not_empty, adapter_speed, bus_speed, max_bus_speed)))) 
-                               return rc;
-                       break;  
-               case PCI_SPEED_133MHz_PCIX_ECC:
-               case PCI_SPEED_133MHz_PCIX:
-                       if (mode) { /* Bus - Mode 1 ECC */
-                               if ((bus_speed != 0x7) &&
-                                  ((rc = fix_bus_speed(ctrl, p_slot, slots_not_empty, adapter_speed, bus_speed, max_bus_speed)))) 
-                                       return rc;
-                       } else {
-                               if ((bus_speed != 0x4) &&
-                                  ((rc = fix_bus_speed(ctrl, p_slot, slots_not_empty, adapter_speed, bus_speed, max_bus_speed)))) 
-                                       return rc;
-                       }
-                       break;
-               case PCI_SPEED_66MHz_PCIX_ECC:
-               case PCI_SPEED_66MHz_PCIX:
-                       if (mode) { /* Bus - Mode 1 ECC */
-                               if ((bus_speed != 0x5) &&
-                                  ((rc = fix_bus_speed(ctrl, p_slot, slots_not_empty, adapter_speed, bus_speed, max_bus_speed)))) 
-                                       return rc;
-                       } else {
-                               if ((bus_speed != 0x2) &&
-                                  ((rc = fix_bus_speed(ctrl, p_slot, slots_not_empty, adapter_speed, bus_speed, max_bus_speed)))) 
-                                       return rc;
-                       }
-                       break;
-               case PCI_SPEED_66MHz:
-                       if ((bus_speed != 0x1) &&
-                          ((rc = fix_bus_speed(ctrl, p_slot, slots_not_empty, adapter_speed, bus_speed, max_bus_speed)))) 
-                               return rc;
-                       break;  
-               case PCI_SPEED_33MHz:
-                       if (bus_speed > 0x0) {
-                               if (slots_not_empty == 0) {
-                                       if ((rc = change_bus_speed(ctrl, p_slot, adapter_speed)))
-                                               return rc;
-                               } else {
-                                       err("%s: speed of bus %x and adapter %x mismatch\n", __FUNCTION__, bus_speed, adapter_speed);
-                                       return WRONG_BUS_FREQUENCY;
-                               }
-                       }
-                       break;
-               default:
-                       err("%s: speed of bus %x and adapter %x mismatch\n", __FUNCTION__, bus_speed, adapter_speed);
-                       return WRONG_BUS_FREQUENCY;
-               }
-       } else {
-               /* If adpater_speed == bus_speed, nothing to do here */
-               dbg("%s: In PI = %d\n", __FUNCTION__, pi);
-               if ((adapter_speed != bus_speed) &&
-                  ((rc = fix_bus_speed(ctrl, p_slot, slots_not_empty, adapter_speed, bus_speed, max_bus_speed))))
-                               return rc;
-       }
+       rc = fix_bus_speed(ctrl, p_slot, slots_not_empty, asp, bsp, msp);
+       if (rc)
+               return rc;
 
        /* turn on board, blink green LED, turn off Amber LED */
        if ((rc = p_slot->hpc_ops->slot_enable(p_slot))) {
@@ -492,6 +392,11 @@ static int remove_board(struct slot *p_slot)
 }
 
 
+struct pushbutton_work_info {
+       struct slot *p_slot;
+       struct work_struct work;
+};
+
 /**
  * shpchp_pushbutton_thread
  *
@@ -499,22 +404,62 @@ static int remove_board(struct slot *p_slot)
  * Handles all pending events and exits.
  *
  */
-void shpchp_pushbutton_thread(void *data)
+static void shpchp_pushbutton_thread(struct work_struct *work)
 {
-       struct slot *p_slot = data;
-       u8 getstatus;
+       struct pushbutton_work_info *info =
+               container_of(work, struct pushbutton_work_info, work);
+       struct slot *p_slot = info->p_slot;
 
-       p_slot->hpc_ops->get_power_status(p_slot, &getstatus);
-       if (getstatus) {
-               p_slot->state = POWEROFF_STATE;
+       mutex_lock(&p_slot->lock);
+       switch (p_slot->state) {
+       case POWEROFF_STATE:
+               mutex_unlock(&p_slot->lock);
                shpchp_disable_slot(p_slot);
+               mutex_lock(&p_slot->lock);
                p_slot->state = STATIC_STATE;
-       } else {
-               p_slot->state = POWERON_STATE;
+               break;
+       case POWERON_STATE:
+               mutex_unlock(&p_slot->lock);
                if (shpchp_enable_slot(p_slot))
                        p_slot->hpc_ops->green_led_off(p_slot);
+               mutex_lock(&p_slot->lock);
                p_slot->state = STATIC_STATE;
+               break;
+       default:
+               break;
        }
+       mutex_unlock(&p_slot->lock);
+
+       kfree(info);
+}
+
+void queue_pushbutton_work(struct work_struct *work)
+{
+       struct slot *p_slot = container_of(work, struct slot, work.work);
+       struct pushbutton_work_info *info;
+
+       info = kmalloc(sizeof(*info), GFP_KERNEL);
+       if (!info) {
+               err("%s: Cannot allocate memory\n", __FUNCTION__);
+               return;
+       }
+       info->p_slot = p_slot;
+       INIT_WORK(&info->work, shpchp_pushbutton_thread);
+
+       mutex_lock(&p_slot->lock);
+       switch (p_slot->state) {
+       case BLINKINGOFF_STATE:
+               p_slot->state = POWEROFF_STATE;
+               break;
+       case BLINKINGON_STATE:
+               p_slot->state = POWERON_STATE;
+               break;
+       default:
+               goto out;
+       }
+       queue_work(shpchp_wq, &info->work);
+ out:
+       mutex_unlock(&p_slot->lock);
 }
 
 static int update_slot_info (struct slot *slot)
@@ -536,47 +481,75 @@ static int update_slot_info (struct slot *slot)
        return result;
 }
 
-static void interrupt_event_handler(void *data)
+/*
+ * Note: This function must be called with slot->lock held
+ */
+static void handle_button_press_event(struct slot *p_slot)
 {
-       struct event_info *info = data;
-       struct slot *p_slot = info->p_slot;
        u8 getstatus;
 
-       switch (info->event_type) {
-       case INT_BUTTON_CANCEL:
-               dbg("%s: button cancel\n", __FUNCTION__);
-               cancel_delayed_work(&p_slot->work);
-               switch (p_slot->state) {
-               case BLINKINGOFF_STATE:
-                       p_slot->hpc_ops->green_led_on(p_slot);
-                       p_slot->hpc_ops->set_attention_status(p_slot, 0);
-                       break;
-               case BLINKINGON_STATE:
-                       p_slot->hpc_ops->green_led_off(p_slot);
-                       p_slot->hpc_ops->set_attention_status(p_slot, 0);
-                       break;
-               default:
-                       warn("Not a valid state\n");
-                       return;
-               }
-               info(msg_button_cancel, p_slot->number);
-               p_slot->state = STATIC_STATE;
-               break;
-       case INT_BUTTON_PRESS:
-               dbg("%s: Button pressed\n", __FUNCTION__);
+       switch (p_slot->state) {
+       case STATIC_STATE:
                p_slot->hpc_ops->get_power_status(p_slot, &getstatus);
                if (getstatus) {
                        p_slot->state = BLINKINGOFF_STATE;
-                       info(msg_button_off, p_slot->number);
+                       info("PCI slot #%s - powering off due to button "
+                            "press.\n", p_slot->name);
                } else {
                        p_slot->state = BLINKINGON_STATE;
-                       info(msg_button_on, p_slot->number);
+                       info("PCI slot #%s - powering on due to button "
+                            "press.\n", p_slot->name);
                }
                /* blink green LED and turn off amber */
                p_slot->hpc_ops->green_led_blink(p_slot);
                p_slot->hpc_ops->set_attention_status(p_slot, 0);
 
-               queue_delayed_work(shpchp_wq, &p_slot->work, 5*HZ);
+               schedule_delayed_work(&p_slot->work, 5*HZ);
+               break;
+       case BLINKINGOFF_STATE:
+       case BLINKINGON_STATE:
+               /*
+                * Cancel if we are still blinking; this means that we
+                * press the attention again before the 5 sec. limit
+                * expires to cancel hot-add or hot-remove
+                */
+               info("Button cancel on Slot(%s)\n", p_slot->name);
+               dbg("%s: button cancel\n", __FUNCTION__);
+               cancel_delayed_work(&p_slot->work);
+               if (p_slot->state == BLINKINGOFF_STATE)
+                       p_slot->hpc_ops->green_led_on(p_slot);
+               else
+                       p_slot->hpc_ops->green_led_off(p_slot);
+               p_slot->hpc_ops->set_attention_status(p_slot, 0);
+               info("PCI slot #%s - action canceled due to button press\n",
+                    p_slot->name);
+               p_slot->state = STATIC_STATE;
+               break;
+       case POWEROFF_STATE:
+       case POWERON_STATE:
+               /*
+                * Ignore if the slot is on power-on or power-off state;
+                * this means that the previous attention button action
+                * to hot-add or hot-remove is undergoing
+                */
+               info("Button ignore on Slot(%s)\n", p_slot->name);
+               update_slot_info(p_slot);
+               break;
+       default:
+               warn("Not a valid state\n");
+               break;
+       }
+}
+
+static void interrupt_event_handler(struct work_struct *work)
+{
+       struct event_info *info = container_of(work, struct event_info, work);
+       struct slot *p_slot = info->p_slot;
+
+       mutex_lock(&p_slot->lock);
+       switch (info->event_type) {
+       case INT_BUTTON_PRESS:
+               handle_button_press_event(p_slot);
                break;
        case INT_POWER_FAULT:
                dbg("%s: power fault\n", __FUNCTION__);
@@ -587,12 +560,13 @@ static void interrupt_event_handler(void *data)
                update_slot_info(p_slot);
                break;
        }
+       mutex_unlock(&p_slot->lock);
 
        kfree(info);
 }
 
 
-int shpchp_enable_slot (struct slot *p_slot)
+static int shpchp_enable_slot (struct slot *p_slot)
 {
        u8 getstatus = 0;
        int rc, retval = -ENODEV;
@@ -601,17 +575,17 @@ int shpchp_enable_slot (struct slot *p_slot)
        mutex_lock(&p_slot->ctrl->crit_sect);
        rc = p_slot->hpc_ops->get_adapter_status(p_slot, &getstatus);
        if (rc || !getstatus) {
-               info("%s: no adapter on slot(%x)\n", __FUNCTION__, p_slot->number);
+               info("No adapter on slot(%s)\n", p_slot->name);
                goto out;
        }
        rc = p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
        if (rc || getstatus) {
-               info("%s: latch open on slot(%x)\n", __FUNCTION__, p_slot->number);
+               info("Latch open on slot(%s)\n", p_slot->name);
                goto out;
        }
        rc = p_slot->hpc_ops->get_power_status(p_slot, &getstatus);
        if (rc || getstatus) {
-               info("%s: already enabled on slot(%x)\n", __FUNCTION__, p_slot->number);
+               info("Already enabled on slot(%s)\n", p_slot->name);
                goto out;
        }
 
@@ -647,7 +621,7 @@ int shpchp_enable_slot (struct slot *p_slot)
 }
 
 
-int shpchp_disable_slot (struct slot *p_slot)
+static int shpchp_disable_slot (struct slot *p_slot)
 {
        u8 getstatus = 0;
        int rc, retval = -ENODEV;
@@ -660,17 +634,17 @@ int shpchp_disable_slot (struct slot *p_slot)
 
        rc = p_slot->hpc_ops->get_adapter_status(p_slot, &getstatus);
        if (rc || !getstatus) {
-               info("%s: no adapter on slot(%x)\n", __FUNCTION__, p_slot->number);
+               info("No adapter on slot(%s)\n", p_slot->name);
                goto out;
        }
        rc = p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
        if (rc || getstatus) {
-               info("%s: latch open on slot(%x)\n", __FUNCTION__, p_slot->number);
+               info("Latch open on slot(%s)\n", p_slot->name);
                goto out;
        }
        rc = p_slot->hpc_ops->get_power_status(p_slot, &getstatus);
        if (rc || !getstatus) {
-               info("%s: already disabled slot(%x)\n", __FUNCTION__, p_slot->number);
+               info("Already disabled slot(%s)\n", p_slot->name);
                goto out;
        }
 
@@ -681,3 +655,66 @@ int shpchp_disable_slot (struct slot *p_slot)
        return retval;
 }
 
+int shpchp_sysfs_enable_slot(struct slot *p_slot)
+{
+       int retval = -ENODEV;
+
+       mutex_lock(&p_slot->lock);
+       switch (p_slot->state) {
+       case BLINKINGON_STATE:
+               cancel_delayed_work(&p_slot->work);
+       case STATIC_STATE:
+               p_slot->state = POWERON_STATE;
+               mutex_unlock(&p_slot->lock);
+               retval = shpchp_enable_slot(p_slot);
+               mutex_lock(&p_slot->lock);
+               p_slot->state = STATIC_STATE;
+               break;
+       case POWERON_STATE:
+               info("Slot %s is already in powering on state\n",
+                    p_slot->name);
+               break;
+       case BLINKINGOFF_STATE:
+       case POWEROFF_STATE:
+               info("Already enabled on slot %s\n", p_slot->name);
+               break;
+       default:
+               err("Not a valid state on slot %s\n", p_slot->name);
+               break;
+       }
+       mutex_unlock(&p_slot->lock);
+
+       return retval;
+}
+
+int shpchp_sysfs_disable_slot(struct slot *p_slot)
+{
+       int retval = -ENODEV;
+
+       mutex_lock(&p_slot->lock);
+       switch (p_slot->state) {
+       case BLINKINGOFF_STATE:
+               cancel_delayed_work(&p_slot->work);
+       case STATIC_STATE:
+               p_slot->state = POWEROFF_STATE;
+               mutex_unlock(&p_slot->lock);
+               retval = shpchp_disable_slot(p_slot);
+               mutex_lock(&p_slot->lock);
+               p_slot->state = STATIC_STATE;
+               break;
+       case POWEROFF_STATE:
+               info("Slot %s is already in powering off state\n",
+                    p_slot->name);
+               break;
+       case BLINKINGON_STATE:
+       case POWERON_STATE:
+               info("Already disabled on slot %s\n", p_slot->name);
+               break;
+       default:
+               err("Not a valid state on slot %s\n", p_slot->name);
+               break;
+       }
+       mutex_unlock(&p_slot->lock);
+
+       return retval;
+}