[PATCH] pciehp: remove redundant data structures
authorrajesh.shah@intel.com <rajesh.shah@intel.com>
Tue, 1 Nov 2005 00:20:08 +0000 (16:20 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 11 Nov 2005 00:09:14 +0000 (16:09 -0800)
State information is currently stored in per-slot as well as
per-pci-function data structures in pciehp. There's a lot of
overlap in the information kept, and some of it is never used.
This patch consolidates the state information to per-slot and
eliminates unused data structures. The biggest change is to
eliminate the pci_func structure and the code around managing
its lists.

Signed-off-by: Rajesh Shah <rajesh.shah@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/pci/hotplug/pciehp.h
drivers/pci/hotplug/pciehp_core.c
drivers/pci/hotplug/pciehp_ctrl.c
drivers/pci/hotplug/pciehp_pci.c

index e9c09566f851e8ca191c25fec7f9cdbcb1a33c99..3e17e3d4dd65b0de53d96494c80f0ac7bd515d05 100644 (file)
@@ -56,25 +56,11 @@ struct hotplug_params {
        u8 enable_perr;
 };
 
-struct pci_func {
-       struct pci_func *next;
-       u8 bus;
-       u8 device;
-       u8 function;
-       u8 is_a_board;
-       u16 status;
-       u8 configured;
-       u8 switch_save;
-       u8 presence_save;
-       u16 reserved2;
-       u32 config_space[0x20];
-       struct pci_dev* pci_dev;
-};
-
 struct slot {
        struct slot *next;
        u8 bus;
        u8 device;
+       u16 status;
        u32 number;
        u8 is_a_board;
        u8 configured;
@@ -177,9 +163,6 @@ struct controller {
  * error Messages
  */
 #define msg_initialization_err "Initialization failure, error=%d\n"
-#define msg_HPC_rev_error      "Unsupported revision of the PCI hot plug controller found.\n"
-#define msg_HPC_non_pcie       "The PCI hot plug controller is not supported by this driver.\n"
-#define msg_HPC_not_supported  "This system is not supported by this version of pciephd module. Upgrade to a newer version of pciehpd\n"
 #define msg_button_on          "PCI slot #%d - powering on due to button press.\n"
 #define msg_button_off         "PCI slot #%d - powering off due to button press.\n"
 #define msg_button_cancel      "PCI slot #%d - action canceled due to button press.\n"
@@ -188,8 +171,6 @@ struct controller {
 /* controller functions */
 extern int     pciehp_event_start_thread       (void);
 extern void    pciehp_event_stop_thread        (void);
-extern struct  pci_func *pciehp_slot_create    (unsigned char busnumber);
-extern struct  pci_func *pciehp_slot_find      (unsigned char bus, unsigned char device, unsigned char index);
 extern int     pciehp_enable_slot              (struct slot *slot);
 extern int     pciehp_disable_slot             (struct slot *slot);
 
@@ -200,12 +181,8 @@ extern u8  pciehp_handle_power_fault       (u8 hp_slot, void *inst_id);
 /* extern void long_delay (int delay); */
 
 /* pci functions */
-extern int     pciehp_set_irq                  (u8 bus_num, u8 dev_num, u8 int_pin, u8 irq_num);
-/*extern int   pciehp_get_bus_dev              (struct controller *ctrl, u8 *bus_num, u8 *dev_num, struct slot *slot);*/
-extern int     pciehp_save_config              (struct controller *ctrl, int busnumber, int num_ctlr_slots, int first_device_num);
-extern int     pciehp_save_slot_config         (struct controller *ctrl, struct pci_func * new_slot);
-extern int     pciehp_configure_device         (struct slot *ctrl);
-extern int     pciehp_unconfigure_device       (struct pci_func* func);
+extern int     pciehp_configure_device         (struct slot *p_slot);
+extern int     pciehp_unconfigure_device       (struct slot *p_slot);
 extern int     get_hp_hw_control_from_firmware(struct pci_dev *dev);
 extern void    get_hp_params_from_firmware(struct pci_dev *dev,
                struct hotplug_params *hpp);
@@ -214,7 +191,6 @@ extern void get_hp_params_from_firmware(struct pci_dev *dev,
 
 /* Global variables */
 extern struct controller *pciehp_ctrl_list;
-extern struct pci_func *pciehp_slot_list[256];
 
 /* Inline functions */
 
index e20cf8e42bd969c6f3aee9a88808d674135b5f9c..be608563e8b61c07b3015f4b503e02880f267b08 100644 (file)
@@ -46,7 +46,6 @@ int pciehp_debug;
 int pciehp_poll_mode;
 int pciehp_poll_time;
 struct controller *pciehp_ctrl_list;
-struct pci_func *pciehp_slot_list[256];
 
 #define DRIVER_VERSION "0.4"
 #define DRIVER_AUTHOR  "Dan Zink <dan.zink@compaq.com>, Greg Kroah-Hartman <greg@kroah.com>, Dely Sy <dely.l.sy@intel.com>"
@@ -422,15 +421,6 @@ static int pciehp_probe(struct pcie_device *dev, const struct pcie_port_service_
        first_device_num = ctrl->slot_device_offset;
        num_ctlr_slots = ctrl->num_slots; 
 
-       /* Store PCI Config Space for all devices on this bus */
-       dbg("%s: Before calling pciehp_save_config, ctrl->bus %x,ctrl->slot_bus %x\n", 
-               __FUNCTION__,ctrl->bus, ctrl->slot_bus);
-       rc = pciehp_save_config(ctrl, ctrl->slot_bus, num_ctlr_slots, first_device_num);
-       if (rc) {
-               err("%s: unable to save PCI configuration data, error %d\n", __FUNCTION__, rc);
-               goto err_out_free_ctrl_bus;
-       }
-
        ctrl->add_support = 1;
        
        /* Setup the slot information structures */
@@ -491,7 +481,6 @@ err_out_none:
 
 static int pcie_start_thread(void)
 {
-       int loop;
        int retval = 0;
        
        dbg("Initialize + Start the notification/polling mechanism \n");
@@ -502,20 +491,11 @@ static int pcie_start_thread(void)
                return retval;
        }
 
-       dbg("Initialize slot lists\n");
-       /* One slot list for each bus in the system */
-       for (loop = 0; loop < 256; loop++) {
-               pciehp_slot_list[loop] = NULL;
-       }
-
        return retval;
 }
 
 static void __exit unload_pciehpd(void)
 {
-       struct pci_func *next;
-       struct pci_func *TempSlot;
-       int loop;
        struct controller *ctrl;
        struct controller *tctrl;
 
@@ -534,15 +514,6 @@ static void __exit unload_pciehpd(void)
                kfree(tctrl);
        }
 
-       for (loop = 0; loop < 256; loop++) {
-               next = pciehp_slot_list[loop];
-               while (next != NULL) {
-                       TempSlot = next;
-                       next = next->next;
-                       kfree(TempSlot);
-               }
-       }
-
        /* Stop the notification mechanism */
        pciehp_event_stop_thread();
 
index d07d4194bc29740a895c81fde0703a1957a77276..b60e4973289c89406d4c6066d1caf6809687d08a 100644 (file)
@@ -55,19 +55,16 @@ u8 pciehp_handle_attention_button(u8 hp_slot, void *inst_id)
        struct slot *p_slot;
        u8 rc = 0;
        u8 getstatus;
-       struct pci_func *func;
        struct event_info *taskInfo;
 
        /* Attention Button Change */
        dbg("pciehp:  Attention button interrupt received.\n");
        
-       func = pciehp_slot_find(ctrl->slot_bus, (hp_slot + ctrl->slot_device_offset), 0);
-
        /* This is the structure that tells the worker thread what to do */
        taskInfo = &(ctrl->event_queue[ctrl->next_event]);
        p_slot = pciehp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
 
-       p_slot->hpc_ops->get_adapter_status(p_slot, &(func->presence_save));
+       p_slot->hpc_ops->get_adapter_status(p_slot, &(p_slot->presence_save));
        p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
        
        ctrl->next_event = (ctrl->next_event + 1) % 10;
@@ -112,14 +109,11 @@ u8 pciehp_handle_switch_change(u8 hp_slot, void *inst_id)
        struct slot *p_slot;
        u8 rc = 0;
        u8 getstatus;
-       struct pci_func *func;
        struct event_info *taskInfo;
 
        /* Switch Change */
        dbg("pciehp:  Switch interrupt received.\n");
 
-       func = pciehp_slot_find(ctrl->slot_bus, (hp_slot + ctrl->slot_device_offset), 0);
-
        /* This is the structure that tells the worker thread
         * what to do
         */
@@ -129,7 +123,7 @@ u8 pciehp_handle_switch_change(u8 hp_slot, void *inst_id)
 
        rc++;
        p_slot = pciehp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
-       p_slot->hpc_ops->get_adapter_status(p_slot, &(func->presence_save));
+       p_slot->hpc_ops->get_adapter_status(p_slot, &(p_slot->presence_save));
        p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
 
        if (getstatus) {
@@ -137,14 +131,14 @@ u8 pciehp_handle_switch_change(u8 hp_slot, void *inst_id)
                 * Switch opened
                 */
                info("Latch open on Slot(%d)\n", ctrl->first_slot + hp_slot);
-               func->switch_save = 0;
+               p_slot->switch_save = 0;
                taskInfo->event_type = INT_SWITCH_OPEN;
        } else {
                /*
                 *  Switch closed
                 */
                info("Latch close on Slot(%d)\n", ctrl->first_slot + hp_slot);
-               func->switch_save = 0x10;
+               p_slot->switch_save = 0x10;
                taskInfo->event_type = INT_SWITCH_CLOSE;
        }
 
@@ -159,14 +153,11 @@ u8 pciehp_handle_presence_change(u8 hp_slot, void *inst_id)
        struct controller *ctrl = (struct controller *) inst_id;
        struct slot *p_slot;
        u8 rc = 0;
-       struct pci_func *func;
        struct event_info *taskInfo;
 
        /* Presence Change */
        dbg("pciehp:  Presence/Notify input change.\n");
 
-       func = pciehp_slot_find(ctrl->slot_bus, (hp_slot + ctrl->slot_device_offset), 0);
-
        /* This is the structure that tells the worker thread
         * what to do
         */
@@ -180,8 +171,8 @@ u8 pciehp_handle_presence_change(u8 hp_slot, void *inst_id)
        /* Switch is open, assume a presence change
         * Save the presence state
         */
-       p_slot->hpc_ops->get_adapter_status(p_slot, &(func->presence_save));
-       if (func->presence_save) {
+       p_slot->hpc_ops->get_adapter_status(p_slot, &(p_slot->presence_save));
+       if (p_slot->presence_save) {
                /*
                 * Card Present
                 */
@@ -206,14 +197,11 @@ u8 pciehp_handle_power_fault(u8 hp_slot, void *inst_id)
        struct controller *ctrl = (struct controller *) inst_id;
        struct slot *p_slot;
        u8 rc = 0;
-       struct pci_func *func;
        struct event_info *taskInfo;
 
        /* power fault */
        dbg("pciehp:  Power fault interrupt received.\n");
 
-       func = pciehp_slot_find(ctrl->slot_bus, (hp_slot + ctrl->slot_device_offset), 0);
-
        /* this is the structure that tells the worker thread
         * what to do
         */
@@ -229,7 +217,7 @@ u8 pciehp_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);
-               func->status = 0x00;
+               p_slot->status = 0x00;
                taskInfo->event_type = INT_POWER_FAULT_CLEAR;
        } else {
                /*
@@ -238,7 +226,7 @@ u8 pciehp_handle_power_fault(u8 hp_slot, void *inst_id)
                info("Power fault on Slot(%d)\n", ctrl->first_slot + hp_slot);
                taskInfo->event_type = INT_POWER_FAULT;
                /* set power fault status for this board */
-               func->status = 0xFF;
+               p_slot->status = 0xFF;
                info("power fault bit %x set\n", hp_slot);
        }
        if (rc)
@@ -247,187 +235,6 @@ u8 pciehp_handle_power_fault(u8 hp_slot, void *inst_id)
        return rc;
 }
 
-/**
- * pciehp_slot_create - Creates a node and adds it to the proper bus.
- * @busnumber - bus where new node is to be located
- *
- * Returns pointer to the new node or NULL if unsuccessful
- */
-struct pci_func *pciehp_slot_create(u8 busnumber)
-{
-       struct pci_func *new_slot;
-       struct pci_func *next;
-       dbg("%s: busnumber %x\n", __FUNCTION__, busnumber);
-       new_slot = kmalloc(sizeof(struct pci_func), GFP_KERNEL);
-
-       if (new_slot == NULL)
-               return new_slot;
-
-       memset(new_slot, 0, sizeof(struct pci_func));
-
-       new_slot->next = NULL;
-       new_slot->configured = 1;
-
-       if (pciehp_slot_list[busnumber] == NULL) {
-               pciehp_slot_list[busnumber] = new_slot;
-       } else {
-               next = pciehp_slot_list[busnumber];
-               while (next->next != NULL)
-                       next = next->next;
-               next->next = new_slot;
-       }
-       return new_slot;
-}
-
-
-/**
- * slot_remove - Removes a node from the linked list of slots.
- * @old_slot: slot to remove
- *
- * Returns 0 if successful, !0 otherwise.
- */
-static int slot_remove(struct pci_func * old_slot)
-{
-       struct pci_func *next;
-
-       if (old_slot == NULL)
-               return 1;
-
-       next = pciehp_slot_list[old_slot->bus];
-
-       if (next == NULL)
-               return 1;
-
-       if (next == old_slot) {
-               pciehp_slot_list[old_slot->bus] = old_slot->next;
-               kfree(old_slot);
-               return 0;
-       }
-
-       while ((next->next != old_slot) && (next->next != NULL)) {
-               next = next->next;
-       }
-
-       if (next->next == old_slot) {
-               next->next = old_slot->next;
-               kfree(old_slot);
-               return 0;
-       } else
-               return 2;
-}
-
-
-/**
- * bridge_slot_remove - Removes a node from the linked list of slots.
- * @bridge: bridge to remove
- *
- * Returns 0 if successful, !0 otherwise.
- */
-static int bridge_slot_remove(struct pci_func *bridge)
-{
-       u8 subordinateBus, secondaryBus;
-       u8 tempBus;
-       struct pci_func *next;
-
-       if (bridge == NULL)
-               return 1;
-
-       secondaryBus = (bridge->config_space[0x06] >> 8) & 0xFF;
-       subordinateBus = (bridge->config_space[0x06] >> 16) & 0xFF;
-
-       for (tempBus = secondaryBus; tempBus <= subordinateBus; tempBus++) {
-               next = pciehp_slot_list[tempBus];
-
-               while (!slot_remove(next)) {
-                       next = pciehp_slot_list[tempBus];
-               }
-       }
-
-       next = pciehp_slot_list[bridge->bus];
-
-       if (next == NULL) {
-               return 1;
-       }
-
-       if (next == bridge) {
-               pciehp_slot_list[bridge->bus] = bridge->next;
-               kfree(bridge);
-               return 0;
-       }
-
-       while ((next->next != bridge) && (next->next != NULL)) {
-               next = next->next;
-       }
-
-       if (next->next == bridge) {
-               next->next = bridge->next;
-               kfree(bridge);
-               return 0;
-       } else
-               return 2;
-}
-
-
-/**
- * pciehp_slot_find - Looks for a node by bus, and device, multiple functions accessed
- * @bus: bus to find
- * @device: device to find
- * @index: is 0 for first function found, 1 for the second...
- *
- * Returns pointer to the node if successful, %NULL otherwise.
- */
-struct pci_func *pciehp_slot_find(u8 bus, u8 device, u8 index)
-{
-       int found = -1;
-       struct pci_func *func;
-
-       func = pciehp_slot_list[bus];
-       dbg("%s: bus %x device %x index %x\n",
-               __FUNCTION__, bus, device, index);
-       if (func != NULL) {
-               dbg("%s: func-> bus %x device %x function %x pci_dev %p\n",
-                       __FUNCTION__, func->bus, func->device, func->function,
-                       func->pci_dev);
-       } else
-               dbg("%s: func == NULL\n", __FUNCTION__);
-
-       if ((func == NULL) || ((func->device == device) && (index == 0)))
-               return func;
-
-       if (func->device == device)
-               found++;
-
-       while (func->next != NULL) {
-               func = func->next;
-
-               dbg("%s: In while loop, func-> bus %x device %x function %x pci_dev %p\n",
-                       __FUNCTION__, func->bus, func->device, func->function,
-                       func->pci_dev);
-               if (func->device == device)
-                       found++;
-               dbg("%s: while loop, found %d, index %d\n", __FUNCTION__,
-                       found, index);
-
-               if ((found == index) || (func->function == index)) {
-                       dbg("%s: Found bus %x dev %x func %x\n", __FUNCTION__,
-                                       func->bus, func->device, func->function);
-                       return func;
-               }
-       }
-
-       return NULL;
-}
-
-static int is_bridge(struct pci_func * func)
-{
-       /* Check the header type */
-       if (((func->config_space[0x03] >> 16) & 0xFF) == 0x01)
-               return 1;
-       else
-               return 0;
-}
-
-
 /* The following routines constitute the bulk of the 
    hotplug controller logic
  */
@@ -472,17 +279,16 @@ static void set_slot_off(struct controller *ctrl, struct slot * pslot)
  * Configures board
  *
  */
-static u32 board_added(struct pci_func * func, struct controller * ctrl)
+static u32 board_added(struct slot *p_slot)
 {
        u8 hp_slot;
        u32 temp_register = 0xFFFFFFFF;
        u32 rc = 0;
-       struct slot *p_slot;
+       struct controller *ctrl = p_slot->ctrl;
 
-       p_slot = pciehp_find_slot(ctrl, func->device);
-       hp_slot = func->device - ctrl->slot_device_offset;
+       hp_slot = p_slot->device - ctrl->slot_device_offset;
 
-       dbg("%s: func->device, slot_offset, hp_slot = %d, %d ,%d\n", __FUNCTION__, func->device, ctrl->slot_device_offset, hp_slot);
+       dbg("%s: p_slot->device, slot_offset, hp_slot = %d, %d ,%d\n", __FUNCTION__, p_slot->device, ctrl->slot_device_offset, hp_slot);
 
        /* Wait for exclusive access to hardware */
        down(&ctrl->crit_sect);
@@ -522,15 +328,15 @@ static u32 board_added(struct pci_func * func, struct controller * ctrl)
                return rc;
        }
 
-       dbg("%s: func status = %x\n", __FUNCTION__, func->status);
+       dbg("%s: slot status = %x\n", __FUNCTION__, p_slot->status);
 
        /* Check for a power fault */
-       if (func->status == 0xFF) {
+       if (p_slot->status == 0xFF) {
                /* power fault occurred, but it was benign */
                temp_register = 0xFFFFFFFF;
                dbg("%s: temp register set to %x by power fault\n", __FUNCTION__, temp_register);
                rc = POWER_FAILURE;
-               func->status = 0;
+               p_slot->status = 0;
                goto err_exit;
        }
 
@@ -541,10 +347,9 @@ static u32 board_added(struct pci_func * func, struct controller * ctrl)
                goto err_exit;
        }
 
-       pciehp_save_slot_config(ctrl, func);
-       func->status = 0;
-       func->switch_save = 0x10;
-       func->is_a_board = 0x01;
+       p_slot->status = 0;
+       p_slot->switch_save = 0x10;
+       p_slot->is_a_board = 0x01;
 
        /*
         * Some PCI Express root ports require fixup after hot-plug operation.
@@ -575,30 +380,27 @@ err_exit:
  * remove_board - Turns off slot and LED's
  *
  */
-static u32 remove_board(struct pci_func *func, struct controller *ctrl)
+static u32 remove_board(struct slot *p_slot)
 {
        u8 device;
        u8 hp_slot;
        u32 rc;
-       struct slot *p_slot;
-
-       if (func == NULL)
-               return 1;
+       struct controller *ctrl = p_slot->ctrl;
 
-       if (pciehp_unconfigure_device(func))
+       if (pciehp_unconfigure_device(p_slot))
                return 1;
 
-       device = func->device;
+       device = p_slot->device;
 
-       hp_slot = func->device - ctrl->slot_device_offset;
+       hp_slot = p_slot->device - ctrl->slot_device_offset;
        p_slot = pciehp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
 
        dbg("In %s, hp_slot = %d\n", __FUNCTION__, hp_slot);
 
        /* Change status to shutdown */
-       if (func->is_a_board)
-               func->status = 0x01;
-       func->configured = 0;
+       if (p_slot->is_a_board)
+               p_slot->status = 0x01;
+       p_slot->configured = 0;
 
        /* Wait for exclusive access to hardware */
        down(&ctrl->crit_sect);
@@ -626,35 +428,8 @@ static u32 remove_board(struct pci_func *func, struct controller *ctrl)
        /* Done with exclusive hardware access */
        up(&ctrl->crit_sect);
 
-       if (ctrl->add_support) {
-               while (func) {
-                       if (is_bridge(func)) {
-                               dbg("PCI Bridge Hot-Remove s:b:d:f(%02x:%02x:%02x:%02x)\n", 
-                                       ctrl->seg, func->bus, func->device, func->function);
-                               bridge_slot_remove(func);
-                       } else {
-                               dbg("PCI Function Hot-Remove s:b:d:f(%02x:%02x:%02x:%02x)\n", 
-                                       ctrl->seg, func->bus, func->device, func->function);
-                               slot_remove(func);
-                       }
-
-                       func = pciehp_slot_find(ctrl->slot_bus, device, 0);
-               }
-
-               /* Setup slot structure with entry for empty slot */
-               func = pciehp_slot_create(ctrl->slot_bus);
-
-               if (func == NULL) {
-                       return 1;
-               }
-
-               func->bus = ctrl->slot_bus;
-               func->device = device;
-               func->function = 0;
-               func->configured = 0;
-               func->switch_save = 0x10;
-               func->is_a_board = 0;
-       }
+       p_slot->switch_save = 0x10;
+       p_slot->is_a_board = 0;
 
        return 0;
 }
@@ -851,7 +626,6 @@ static void interrupt_event_handler(struct controller *ctrl)
 {
        int loop = 0;
        int change = 1;
-       struct pci_func *func;
        u8 hp_slot;
        u8 getstatus;
        struct slot *p_slot;
@@ -863,11 +637,9 @@ static void interrupt_event_handler(struct controller *ctrl)
                        if (ctrl->event_queue[loop].event_type != 0) {
                                hp_slot = ctrl->event_queue[loop].hp_slot;
 
-                               func = pciehp_slot_find(ctrl->slot_bus, (hp_slot + ctrl->slot_device_offset), 0);
-
                                p_slot = pciehp_find_slot(ctrl, hp_slot + ctrl->slot_device_offset);
 
-                               dbg("hp_slot %d, func %p, p_slot %p\n", hp_slot, func, p_slot);
+                               dbg("hp_slot %d, p_slot %p\n", hp_slot, p_slot);
 
                                if (ctrl->event_queue[loop].event_type == INT_BUTTON_CANCEL) {
                                        dbg("button cancel\n");
@@ -1015,13 +787,6 @@ int pciehp_enable_slot(struct slot *p_slot)
 {
        u8 getstatus = 0;
        int rc;
-       struct pci_func *func;
-
-       func = pciehp_slot_find(p_slot->bus, p_slot->device, 0);
-       if (!func) {
-               dbg("%s: Error! slot NULL\n", __FUNCTION__);
-               return 1;
-       }
 
        /* Check to see if (latch closed, card present, power off) */
        down(&p_slot->ctrl->crit_sect);
@@ -1051,45 +816,21 @@ int pciehp_enable_slot(struct slot *p_slot)
        }
        up(&p_slot->ctrl->crit_sect);
 
-       slot_remove(func);
-
-       func = pciehp_slot_create(p_slot->bus);
-       if (func == NULL)
-               return 1;
-
-       func->bus = p_slot->bus;
-       func->device = p_slot->device;
-       func->function = 0;
-       func->configured = 0;
-       func->is_a_board = 1;
+       p_slot->configured = 0;
+       p_slot->is_a_board = 1;
 
        /* We have to save the presence info for these slots */
-       p_slot->hpc_ops->get_adapter_status(p_slot, &(func->presence_save));
+       p_slot->hpc_ops->get_adapter_status(p_slot, &(p_slot->presence_save));
        p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
-       func->switch_save = !getstatus? 0x10:0;
+       p_slot->switch_save = !getstatus? 0x10:0;
 
-       rc = board_added(func, p_slot->ctrl);
+       rc = board_added(p_slot);
        if (rc) {
-               if (is_bridge(func))
-                       bridge_slot_remove(func);
-               else
-                       slot_remove(func);
-
-               /* Setup slot structure with entry for empty slot */
-               func = pciehp_slot_create(p_slot->bus);
-               if (func == NULL)
-                       return 1;       /* Out of memory */
-
-               func->bus = p_slot->bus;
-               func->device = p_slot->device;
-               func->function = 0;
-               func->configured = 0;
-               func->is_a_board = 1;
-
                /* We have to save the presence info for these slots */
-               p_slot->hpc_ops->get_adapter_status(p_slot, &(func->presence_save));
+               p_slot->hpc_ops->get_adapter_status(p_slot,
+                               &(p_slot->presence_save));
                p_slot->hpc_ops->get_latch_status(p_slot, &getstatus);
-               func->switch_save = !getstatus? 0x10:0;
+               p_slot->switch_save = !getstatus? 0x10:0;
        }
 
        if (p_slot)
@@ -1101,14 +842,8 @@ int pciehp_enable_slot(struct slot *p_slot)
 
 int pciehp_disable_slot(struct slot *p_slot)
 {
-       u8 class_code, header_type, BCR;
-       u8 index = 0;
        u8 getstatus = 0;
-       u32 rc = 0;
        int ret = 0;
-       unsigned int devfn;
-       struct pci_bus *pci_bus = p_slot->ctrl->pci_dev->subordinate;
-       struct pci_func *func;
 
        if (!p_slot->ctrl)
                return 1;
@@ -1145,54 +880,8 @@ int pciehp_disable_slot(struct slot *p_slot)
 
        up(&p_slot->ctrl->crit_sect);
 
-       func = pciehp_slot_find(p_slot->bus, p_slot->device, index++);
-
-       /* Make sure there are no video controllers here
-        * for all func of p_slot
-        */
-       while (func && !rc) {
-               pci_bus->number = func->bus;
-               devfn = PCI_DEVFN(func->device, func->function);
-
-               /* Check the Class Code */
-               rc = pci_bus_read_config_byte (pci_bus, devfn, 0x0B, &class_code);
-               if (rc)
-                       return rc;
-
-               if (class_code == PCI_BASE_CLASS_DISPLAY) {
-                       /* Display/Video adapter (not supported) */
-                       rc = REMOVE_NOT_SUPPORTED;
-               } else {
-                       /* See if it's a bridge */
-                       rc = pci_bus_read_config_byte (pci_bus, devfn, PCI_HEADER_TYPE, &header_type);
-                       if (rc)
-                               return rc;
-
-                       /* If it's a bridge, check the VGA Enable bit */
-                       if ((header_type & 0x7F) == PCI_HEADER_TYPE_BRIDGE) {
-                               rc = pci_bus_read_config_byte (pci_bus, devfn, PCI_BRIDGE_CONTROL, &BCR);
-                               if (rc)
-                                       return rc;
-
-                               /* If the VGA Enable bit is set, remove isn't supported */
-                               if (BCR & PCI_BRIDGE_CTL_VGA) {
-                                       rc = REMOVE_NOT_SUPPORTED;
-                               }
-                       }
-               }
-
-               func = pciehp_slot_find(p_slot->bus, p_slot->device, index++);
-       }
-
-       func = pciehp_slot_find(p_slot->bus, p_slot->device, 0);
-       if ((func != NULL) && !rc) {
-               rc = remove_board(func, p_slot->ctrl);
-       } else if (!rc)
-               rc = 1;
-
-       if (p_slot)
-               update_slot_info(p_slot);
-
-       return rc;
+       ret = remove_board(p_slot);
+       update_slot_info(p_slot);
+       return ret;
 }
 
index db59a06ab0b437dd3a675820afcfb227f5037ec4..1d185c1bc77ab80a0607dd6452e1dfde61fe05bf 100644 (file)
@@ -101,346 +101,41 @@ int pciehp_configure_device(struct slot *p_slot)
        return 0;
 }
 
-int pciehp_unconfigure_device(struct pci_func* func) 
+int pciehp_unconfigure_device(struct slot *p_slot)
 {
        int rc = 0;
        int j;
-       struct pci_bus *pbus;
+       u8 bctl = 0;
 
-       dbg("%s: bus/dev/func = %x/%x/%x\n", __FUNCTION__, func->bus,
-                               func->device, func->function);
-       pbus = func->pci_dev->bus;
+       dbg("%s: bus/dev = %x/%x\n", __FUNCTION__, p_slot->bus,
+                               p_slot->device);
 
        for (j=0; j<8 ; j++) {
-               struct pci_dev* temp = pci_find_slot(func->bus,
-                               (func->device << 3) | j);
-               if (temp) {
-                       pci_remove_bus_device(temp);
+               struct pci_dev* temp = pci_find_slot(p_slot->bus,
+                               (p_slot->device << 3) | j);
+               if (!temp)
+                       continue;
+               if ((temp->class >> 16) == PCI_BASE_CLASS_DISPLAY) {
+                       err("Cannot remove display device %s\n",
+                                       pci_name(temp));
+                       continue;
+               }
+               if (temp->hdr_type == PCI_HEADER_TYPE_BRIDGE) {
+                       pci_read_config_byte(temp, PCI_BRIDGE_CONTROL, &bctl);
+                       if (bctl & PCI_BRIDGE_CTL_VGA) {
+                               err("Cannot remove display device %s\n",
+                                               pci_name(temp));
+                               continue;
+                       }
                }
+               pci_remove_bus_device(temp);
        }
        /* 
         * Some PCI Express root ports require fixup after hot-plug operation.
         */
        if (pcie_mch_quirk) 
-               pci_fixup_device(pci_fixup_final, pbus->self);
+               pci_fixup_device(pci_fixup_final, p_slot->ctrl->pci_dev);
        
        return rc;
 }
 
-/*
- * pciehp_save_config
- *
- * Reads configuration for all slots in a PCI bus and saves info.
- *
- * Note:  For non-hot plug busses, the slot # saved is the device #
- *
- * returns 0 if success
- */
-int pciehp_save_config(struct controller *ctrl, int busnumber, int num_ctlr_slots, int first_device_num)
-{
-       int rc;
-       u8 class_code;
-       u8 header_type;
-       u32 ID;
-       u8 secondary_bus;
-       struct pci_func *new_slot;
-       int sub_bus;
-       int max_functions;
-       int function;
-       u8 DevError;
-       int device = 0;
-       int cloop = 0;
-       int stop_it;
-       int index;
-       int is_hot_plug = num_ctlr_slots || first_device_num;
-       struct pci_bus lpci_bus, *pci_bus;
-       int FirstSupported, LastSupported;
-
-       dbg("%s: Enter\n", __FUNCTION__);
-
-       memcpy(&lpci_bus, ctrl->pci_dev->subordinate, sizeof(lpci_bus));
-       pci_bus = &lpci_bus;
-
-       dbg("%s: num_ctlr_slots = %d, first_device_num = %d\n", __FUNCTION__,
-                               num_ctlr_slots, first_device_num);
-
-       /*   Decide which slots are supported */
-       if (is_hot_plug) {
-               /*********************************
-                *  is_hot_plug is the slot mask
-                *********************************/
-               FirstSupported = first_device_num;
-               LastSupported = FirstSupported + num_ctlr_slots - 1;
-       } else {
-               FirstSupported = 0;
-               LastSupported = 0x1F;
-       }
-
-       dbg("FirstSupported = %d, LastSupported = %d\n", FirstSupported,
-                                       LastSupported);
-
-       /*   Save PCI configuration space for all devices in supported slots */
-       dbg("%s: pci_bus->number = %x\n", __FUNCTION__, pci_bus->number);
-       pci_bus->number = busnumber;
-       dbg("%s: bus = %x, dev = %x\n", __FUNCTION__, busnumber, device);
-       for (device = FirstSupported; device <= LastSupported; device++) {
-               ID = 0xFFFFFFFF;
-               rc = pci_bus_read_config_dword(pci_bus, PCI_DEVFN(device, 0),
-                                       PCI_VENDOR_ID, &ID);
-
-               if (ID != 0xFFFFFFFF) {   /*  device in slot */
-                       dbg("%s: ID = %x\n", __FUNCTION__, ID);
-                       rc = pci_bus_read_config_byte(pci_bus, PCI_DEVFN(device, 0),
-                                       0x0B, &class_code);
-                       if (rc)
-                               return rc;
-
-                       rc = pci_bus_read_config_byte(pci_bus, PCI_DEVFN(device, 0),
-                                       PCI_HEADER_TYPE, &header_type);
-                       if (rc)
-                               return rc;
-
-                       dbg("class_code = %x, header_type = %x\n", class_code, header_type);
-
-                       /* If multi-function device, set max_functions to 8 */
-                       if (header_type & 0x80)
-                               max_functions = 8;
-                       else
-                               max_functions = 1;
-
-                       function = 0;
-
-                       do {
-                               DevError = 0;
-                               dbg("%s: In do loop\n", __FUNCTION__);
-
-                               if ((header_type & 0x7F) == PCI_HEADER_TYPE_BRIDGE) {   /* P-P Bridge */
-                                       /* Recurse the subordinate bus
-                                        * get the subordinate bus number
-                                        */
-                                       rc = pci_bus_read_config_byte(pci_bus,
-                                               PCI_DEVFN(device, function), 
-                                               PCI_SECONDARY_BUS, &secondary_bus);
-                                       if (rc) {
-                                               return rc;
-                                       } else {
-                                               sub_bus = (int) secondary_bus;
-
-                                               /* Save secondary bus cfg spc with this recursive call. */
-                                               rc = pciehp_save_config(ctrl, sub_bus, 0, 0);
-                                               if (rc)
-                                                       return rc;
-                                       }
-                               }
-
-                               index = 0;
-                               new_slot = pciehp_slot_find(busnumber, device, index++);
-
-                               dbg("%s: new_slot = %p bus %x dev %x fun %x\n",
-                               __FUNCTION__, new_slot, busnumber, device, index-1);
-
-                               while (new_slot && (new_slot->function != (u8) function)) {
-                                       new_slot = pciehp_slot_find(busnumber, device, index++);
-                                       dbg("%s: while loop, new_slot = %p bus %x dev %x fun %x\n",
-                                       __FUNCTION__, new_slot, busnumber, device, index-1);
-                               }
-                               if (!new_slot) {
-                                       /* Setup slot structure. */
-                                       new_slot = pciehp_slot_create(busnumber);
-                                       dbg("%s: if, new_slot = %p bus %x dev %x fun %x\n",
-                                       __FUNCTION__, new_slot, busnumber, device, function);
-
-                                       if (new_slot == NULL)
-                                               return(1);
-                               }
-
-                               new_slot->bus = (u8) busnumber;
-                               new_slot->device = (u8) device;
-                               new_slot->function = (u8) function;
-                               new_slot->is_a_board = 1;
-                               new_slot->switch_save = 0x10;
-                               /* In case of unsupported board */
-                               new_slot->status = DevError;
-                               new_slot->pci_dev = pci_find_slot(new_slot->bus,
-                                       (new_slot->device << 3) | new_slot->function);
-                               dbg("new_slot->pci_dev = %p\n", new_slot->pci_dev);
-
-                               for (cloop = 0; cloop < 0x20; cloop++) {
-                                       rc = pci_bus_read_config_dword(pci_bus,
-                                               PCI_DEVFN(device, function),
-                                               cloop << 2, 
-                                               (u32 *) &(new_slot->config_space [cloop]));
-                                       /* dbg("new_slot->config_space[%x] = %x\n",
-                                               cloop, new_slot->config_space[cloop]); */
-                                       if (rc)
-                                               return rc;
-                               }
-
-                               function++;
-
-                               stop_it = 0;
-
-                               /*  this loop skips to the next present function
-                                *  reading in Class Code and Header type.
-                                */
-
-                               while ((function < max_functions)&&(!stop_it)) {
-                                       dbg("%s: In while loop \n", __FUNCTION__);
-                                       rc = pci_bus_read_config_dword(pci_bus,
-                                                       PCI_DEVFN(device, function),
-                                                       PCI_VENDOR_ID, &ID);
-
-                                       if (ID == 0xFFFFFFFF) {  /* nothing there. */
-                                               function++;
-                                               dbg("Nothing there\n");
-                                       } else {  /* Something there */
-                                               rc = pci_bus_read_config_byte(pci_bus,
-                                                       PCI_DEVFN(device, function),
-                                                       0x0B, &class_code);
-                                               if (rc)
-                                                       return rc;
-
-                                               rc = pci_bus_read_config_byte(pci_bus,
-                                                       PCI_DEVFN(device, function),
-                                                       PCI_HEADER_TYPE, &header_type);
-                                               if (rc)
-                                                       return rc;
-
-                                               dbg("class_code = %x, header_type = %x\n", class_code, header_type);
-                                               stop_it++;
-                                       }
-                               }
-
-                       } while (function < max_functions);
-                       /* End of IF (device in slot?) */
-               } else if (is_hot_plug) {
-                       /* Setup slot structure with entry for empty slot */
-                       new_slot = pciehp_slot_create(busnumber);
-
-                       if (new_slot == NULL) {
-                               return(1);
-                       }
-                       dbg("new_slot = %p, bus = %x, dev = %x, fun = %x\n", new_slot,
-                               new_slot->bus, new_slot->device, new_slot->function);
-
-                       new_slot->bus = (u8) busnumber;
-                       new_slot->device = (u8) device;
-                       new_slot->function = 0;
-                       new_slot->is_a_board = 0;
-                       new_slot->presence_save = 0;
-                       new_slot->switch_save = 0;
-               }
-       }                       /* End of FOR loop */
-
-       dbg("%s: Exit\n", __FUNCTION__);
-       return(0);
-}
-
-
-/*
- * pciehp_save_slot_config
- *
- * Saves configuration info for all PCI devices in a given slot
- * including subordinate busses.
- *
- * returns 0 if success
- */
-int pciehp_save_slot_config(struct controller *ctrl, struct pci_func * new_slot)
-{
-       int rc;
-       u8 class_code;
-       u8 header_type;
-       u32 ID;
-       u8 secondary_bus;
-       int sub_bus;
-       int max_functions;
-       int function;
-       int cloop = 0;
-       int stop_it;
-       struct pci_bus lpci_bus, *pci_bus;
-       memcpy(&lpci_bus, ctrl->pci_dev->subordinate, sizeof(lpci_bus));
-       pci_bus = &lpci_bus;
-       pci_bus->number = new_slot->bus;
-
-       ID = 0xFFFFFFFF;
-
-       pci_bus_read_config_dword(pci_bus, PCI_DEVFN(new_slot->device, 0),
-                                       PCI_VENDOR_ID, &ID);
-
-       if (ID != 0xFFFFFFFF) {   /*  device in slot */
-               pci_bus_read_config_byte(pci_bus, PCI_DEVFN(new_slot->device, 0),
-                                       0x0B, &class_code);
-
-               pci_bus_read_config_byte(pci_bus, PCI_DEVFN(new_slot->device, 0),
-                                       PCI_HEADER_TYPE, &header_type);
-
-               if (header_type & 0x80) /* Multi-function device */
-                       max_functions = 8;
-               else
-                       max_functions = 1;
-
-               function = 0;
-
-               do {
-                       if ((header_type & 0x7F) == PCI_HEADER_TYPE_BRIDGE) {     /* PCI-PCI Bridge */
-                               /*  Recurse the subordinate bus */
-                               pci_bus_read_config_byte(pci_bus,
-                                       PCI_DEVFN(new_slot->device, function), 
-                                       PCI_SECONDARY_BUS, &secondary_bus);
-
-                               sub_bus = (int) secondary_bus;
-
-                               /* Save the config headers for the secondary bus. */
-                               rc = pciehp_save_config(ctrl, sub_bus, 0, 0);
-
-                               if (rc)
-                                       return rc;
-
-                       }       /* End of IF */
-
-                       new_slot->status = 0;
-
-                       for (cloop = 0; cloop < 0x20; cloop++) {
-                               pci_bus_read_config_dword(pci_bus,
-                                       PCI_DEVFN(new_slot->device, function), 
-                                       cloop << 2,
-                                       (u32 *) &(new_slot->config_space [cloop]));
-                       }
-
-                       function++;
-
-                       stop_it = 0;
-
-                       /*  this loop skips to the next present function
-                        *  reading in the Class Code and the Header type.
-                        */
-
-                       while ((function < max_functions) && (!stop_it)) {
-                               pci_bus_read_config_dword(pci_bus,
-                                       PCI_DEVFN(new_slot->device, function),
-                                       PCI_VENDOR_ID, &ID);
-
-                               if (ID == 0xFFFFFFFF) {  /* nothing there. */
-                                       function++;
-                               } else {  /* Something there */
-                                       pci_bus_read_config_byte(pci_bus,
-                                               PCI_DEVFN(new_slot->device, function),
-                                               0x0B, &class_code);
-
-                                       pci_bus_read_config_byte(pci_bus,
-                                               PCI_DEVFN(new_slot->device, function),
-                                               PCI_HEADER_TYPE, &header_type);
-
-                                       stop_it++;
-                               }
-                       }
-
-               } while (function < max_functions);
-       }                       /* End of IF (device in slot?) */
-       else {
-               return 2;
-       }
-
-       return 0;
-}
-