Commit 2178bfad authored by rajesh.shah@intel.com's avatar rajesh.shah@intel.com Committed by Greg Kroah-Hartman

[PATCH] shpchp: remove redundant data structures

State information is currently stored in per-slot as well as
per-pci-function data structures in shpchp. 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: default avatarRajesh Shah <rajesh.shah@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 70b60919
...@@ -52,34 +52,18 @@ extern int shpchp_debug; ...@@ -52,34 +52,18 @@ extern int shpchp_debug;
#define info(format, arg...) printk(KERN_INFO "%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 warn(format, arg...) printk(KERN_WARNING "%s: " format, MY_NAME , ## arg)
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;
u8 pwr_save;
struct pci_dev* pci_dev;
};
#define SLOT_MAGIC 0x67267321 #define SLOT_MAGIC 0x67267321
struct slot { struct slot {
u32 magic; u32 magic;
struct slot *next; struct slot *next;
u8 bus; u8 bus;
u8 device; u8 device;
u16 status;
u32 number; u32 number;
u8 is_a_board; u8 is_a_board;
u8 configured;
u8 state; u8 state;
u8 switch_save;
u8 presence_save; u8 presence_save;
u32 capabilities; u8 pwr_save;
u16 reserved2;
struct timer_list task_event; struct timer_list task_event;
u8 hp_slot; u8 hp_slot;
struct controller *ctrl; struct controller *ctrl;
...@@ -106,19 +90,14 @@ struct controller { ...@@ -106,19 +90,14 @@ struct controller {
struct hpc_ops *hpc_ops; struct hpc_ops *hpc_ops;
wait_queue_head_t queue; /* sleep & wake process */ wait_queue_head_t queue; /* sleep & wake process */
u8 next_event; u8 next_event;
u8 seg;
u8 bus; u8 bus;
u8 device; u8 device;
u8 function; u8 function;
u8 rev;
u8 slot_device_offset; u8 slot_device_offset;
u8 add_support; u8 add_support;
enum pci_bus_speed speed; enum pci_bus_speed speed;
u32 first_slot; /* First physical slot number */ u32 first_slot; /* First physical slot number */
u8 slot_bus; /* Bus where the slots handled by this controller sit */ u8 slot_bus; /* Bus where the slots handled by this controller sit */
u8 push_flag;
u16 ctlrcap;
u16 vendor_id;
}; };
struct hotplug_params { struct hotplug_params {
...@@ -169,13 +148,9 @@ struct hotplug_params { ...@@ -169,13 +148,9 @@ struct hotplug_params {
* error Messages * error Messages
*/ */
#define msg_initialization_err "Initialization failure, error=%d\n" #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_shpc "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 shpcphd mdoule. Upgrade to a newer version of shpchpd\n"
#define msg_button_on "PCI slot #%d - powering on due to button press.\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_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" #define msg_button_cancel "PCI slot #%d - action canceled due to button press.\n"
#define msg_button_ignore "PCI slot #%d - button press ignored. (action in progress...)\n"
/* sysfs functions for the hotplug controller info */ /* sysfs functions for the hotplug controller info */
extern void shpchp_create_ctrl_files (struct controller *ctrl); extern void shpchp_create_ctrl_files (struct controller *ctrl);
...@@ -183,8 +158,6 @@ extern void shpchp_create_ctrl_files (struct controller *ctrl); ...@@ -183,8 +158,6 @@ extern void shpchp_create_ctrl_files (struct controller *ctrl);
/* controller functions */ /* controller functions */
extern int shpchp_event_start_thread(void); extern int shpchp_event_start_thread(void);
extern void shpchp_event_stop_thread(void); extern void shpchp_event_stop_thread(void);
extern struct pci_func *shpchp_slot_create(unsigned char busnumber);
extern struct pci_func *shpchp_slot_find(unsigned char bus, unsigned char device, unsigned char index);
extern int shpchp_enable_slot(struct slot *slot); extern int shpchp_enable_slot(struct slot *slot);
extern int shpchp_disable_slot(struct slot *slot); extern int shpchp_disable_slot(struct slot *slot);
...@@ -195,9 +168,8 @@ extern u8 shpchp_handle_power_fault(u8 hp_slot, void *inst_id); ...@@ -195,9 +168,8 @@ extern u8 shpchp_handle_power_fault(u8 hp_slot, void *inst_id);
/* pci functions */ /* pci functions */
extern int shpchp_save_config(struct controller *ctrl, int busnumber, int num_ctlr_slots, int first_device_num); extern int shpchp_save_config(struct controller *ctrl, int busnumber, int num_ctlr_slots, int first_device_num);
extern int shpchp_save_slot_config(struct controller *ctrl, struct pci_func * new_slot);
extern int shpchp_configure_device(struct slot *p_slot); extern int shpchp_configure_device(struct slot *p_slot);
extern int shpchp_unconfigure_device(struct pci_func* func); extern int shpchp_unconfigure_device(struct slot *p_slot);
extern void get_hp_hw_control_from_firmware(struct pci_dev *dev); extern void get_hp_hw_control_from_firmware(struct pci_dev *dev);
extern void get_hp_params_from_firmware(struct pci_dev *dev, extern void get_hp_params_from_firmware(struct pci_dev *dev,
struct hotplug_params *hpp); struct hotplug_params *hpp);
...@@ -207,7 +179,6 @@ extern int shpchprm_get_physical_slot_number(struct controller *ctrl, ...@@ -207,7 +179,6 @@ extern int shpchprm_get_physical_slot_number(struct controller *ctrl,
/* Global variables */ /* Global variables */
extern struct controller *shpchp_ctrl_list; extern struct controller *shpchp_ctrl_list;
extern struct pci_func *shpchp_slot_list[256];
struct ctrl_reg { struct ctrl_reg {
volatile u32 base_offset; volatile u32 base_offset;
......
...@@ -45,7 +45,6 @@ int shpchp_debug; ...@@ -45,7 +45,6 @@ int shpchp_debug;
int shpchp_poll_mode; int shpchp_poll_mode;
int shpchp_poll_time; int shpchp_poll_time;
struct controller *shpchp_ctrl_list; /* = NULL */ struct controller *shpchp_ctrl_list; /* = NULL */
struct pci_func *shpchp_slot_list[256];
#define DRIVER_VERSION "0.4" #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>" #define DRIVER_AUTHOR "Dan Zink <dan.zink@compaq.com>, Greg Kroah-Hartman <greg@kroah.com>, Dely Sy <dely.l.sy@intel.com>"
...@@ -475,7 +474,6 @@ err_out_none: ...@@ -475,7 +474,6 @@ err_out_none:
static int shpc_start_thread(void) static int shpc_start_thread(void)
{ {
int loop;
int retval = 0; int retval = 0;
dbg("Initialize + Start the notification/polling mechanism \n"); dbg("Initialize + Start the notification/polling mechanism \n");
...@@ -486,20 +484,11 @@ static int shpc_start_thread(void) ...@@ -486,20 +484,11 @@ static int shpc_start_thread(void)
return retval; return retval;
} }
dbg("Initialize slot lists\n");
/* One slot list for each bus in the system */
for (loop = 0; loop < 256; loop++) {
shpchp_slot_list[loop] = NULL;
}
return retval; return retval;
} }
static void __exit unload_shpchpd(void) static void __exit unload_shpchpd(void)
{ {
struct pci_func *next;
struct pci_func *TempSlot;
int loop;
struct controller *ctrl; struct controller *ctrl;
struct controller *tctrl; struct controller *tctrl;
...@@ -519,15 +508,6 @@ static void __exit unload_shpchpd(void) ...@@ -519,15 +508,6 @@ static void __exit unload_shpchpd(void)
kfree(tctrl); kfree(tctrl);
} }
for (loop = 0; loop < 256; loop++) {
next = shpchp_slot_list[loop];
while (next != NULL) {
TempSlot = next;
next = next->next;
kfree(TempSlot);
}
}
/* Stop the notification mechanism */ /* Stop the notification mechanism */
shpchp_event_stop_thread(); shpchp_event_stop_thread();
......
This diff is collapsed.
...@@ -148,20 +148,33 @@ int shpchp_configure_device(struct slot *p_slot) ...@@ -148,20 +148,33 @@ int shpchp_configure_device(struct slot *p_slot)
return 0; return 0;
} }
int shpchp_unconfigure_device(struct pci_func* func) int shpchp_unconfigure_device(struct slot *p_slot)
{ {
int rc = 0; int rc = 0;
int j; int j;
u8 bctl = 0;
dbg("%s: bus/dev/func = %x/%x/%x\n", __FUNCTION__, func->bus, dbg("%s: bus/dev = %x/%x\n", __FUNCTION__, p_slot->bus, p_slot->device);
func->device, func->function);
for (j=0; j<8 ; j++) { for (j=0; j<8 ; j++) {
struct pci_dev* temp = pci_find_slot(func->bus, struct pci_dev* temp = pci_find_slot(p_slot->bus,
(func->device << 3) | j); (p_slot->device << 3) | j);
if (temp) { if (!temp)
pci_remove_bus_device(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);
} }
return rc; return rc;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment