Commit 8352e04e authored by Kenji Kaneshige's avatar Kenji Kaneshige Committed by Greg Kroah-Hartman
Browse files

shpchp: cleanup shpchp.h 



This patch cleans up shpchp.h.

Signed-off-by: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: default avatarKristen Carlson Accardi <kristen.c.accardi@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6f39be2e

drivers/pci/hotplug/shpchp.h

+60 −130
Original line number Diff line number Diff line
@@ -47,11 +47,17 @@ extern int shpchp_poll_time; 
extern int shpchp_debug;

extern struct workqueue_struct *shpchp_wq;



/*#define dbg(format, arg...) do { if (shpchp_debug) printk(KERN_DEBUG "%s: " format, MY_NAME , ## arg); } while (0)*/

#define dbg(format, arg...) do { if (shpchp_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 (shpchp_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 {
@@ -99,13 +105,11 @@ struct controller { 
	struct timer_list poll_timer;

};





/* Define AMD SHPC ID  */

#define PCI_DEVICE_ID_AMD_GOLAM_7450	0x7450 

#define PCI_DEVICE_ID_AMD_POGO_7458	0x7458



/* AMD PCIX bridge registers */



#define PCIX_MEM_BASE_LIMIT_OFFSET	0x1C

#define PCIX_MISCII_OFFSET		0x48

#define PCIX_MISC_BRIDGE_ERRORS_OFFSET	0x80
@@ -140,8 +144,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
@@ -153,37 +155,19 @@ struct controller { 
#define WRONG_BUS_FREQUENCY		0x0000000D

#define POWER_FAILURE			0x0000000E



#define REMOVE_NOT_SUPPORTED		0x00000003



#define DISABLE_CARD			1



/*

 * 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"



/* sysfs functions for the hotplug controller info */

extern int __must_check shpchp_create_ctrl_files(struct controller *ctrl);



extern void shpchp_remove_ctrl_files(struct controller *ctrl);

extern int shpchp_sysfs_enable_slot(struct slot *slot);

extern int shpchp_sysfs_disable_slot(struct slot *slot);



extern u8 shpchp_handle_attention_button(u8 hp_slot, struct controller *ctrl);

extern u8 shpchp_handle_switch_change(u8 hp_slot, struct controller *ctrl);

extern u8 shpchp_handle_presence_change(u8 hp_slot, struct controller *ctrl);

extern u8 shpchp_handle_power_fault(u8 hp_slot, struct controller *ctrl);



/* pci functions */

extern int	shpchp_save_config(struct controller *ctrl, int busnumber, int num_ctlr_slots, int first_device_num);

extern int shpchp_configure_device(struct slot *p_slot);

extern int shpchp_unconfigure_device(struct slot *p_slot);

extern void	shpchp_remove_ctrl_files(struct controller *ctrl);

extern void cleanup_slots(struct controller *ctrl);

extern void queue_pushbutton_work(struct work_struct *work);



extern int shpc_init( struct controller *ctrl, struct pci_dev *pdev);



#ifdef CONFIG_ACPI

static inline int get_hp_params_from_firmware(struct pci_dev *dev,
@@ -217,17 +201,6 @@ struct ctrl_reg { 
	volatile u32 serr_loc;

	volatile u32 serr_intr_enable;

	volatile u32 slot1;

	volatile u32 slot2;

	volatile u32 slot3;

	volatile u32 slot4;

	volatile u32 slot5;

	volatile u32 slot6;

	volatile u32 slot7;

	volatile u32 slot8;

	volatile u32 slot9;

	volatile u32 slot10;

	volatile u32 slot11;

	volatile u32 slot12;

} __attribute__ ((packed));



/* offsets to the controller registers based on the above structure layout */
@@ -245,62 +218,23 @@ enum ctrl_offsets { 
	SERR_LOC	 = offsetof(struct ctrl_reg, serr_loc),

	SERR_INTR_ENABLE = offsetof(struct ctrl_reg, serr_intr_enable),

	SLOT1		 = offsetof(struct ctrl_reg, slot1),

	SLOT2 =		offsetof(struct ctrl_reg, slot2),

	SLOT3 =		offsetof(struct ctrl_reg, slot3),

	SLOT4 =		offsetof(struct ctrl_reg, slot4),

	SLOT5 =		offsetof(struct ctrl_reg, slot5),

	SLOT6 =		offsetof(struct ctrl_reg, slot6),		

	SLOT7 =		offsetof(struct ctrl_reg, slot7),

	SLOT8 =		offsetof(struct ctrl_reg, slot8),

	SLOT9 =		offsetof(struct ctrl_reg, slot9),

	SLOT10 =	offsetof(struct ctrl_reg, slot10),

	SLOT11 =	offsetof(struct ctrl_reg, slot11),

	SLOT12 =	offsetof(struct ctrl_reg, slot12),

};



/* Inline functions to check the sanity of a pointer that is passed to us */

static inline int slot_paranoia_check (struct slot *slot, const char *function)

static inline struct slot *get_slot(struct hotplug_slot *hotplug_slot)

{ 

	if (!slot) {

		dbg("%s - slot == NULL", function);

		return -1;

	}

	if (!slot->hotplug_slot) {

		dbg("%s - slot->hotplug_slot == NULL!", function);

		return -1;

	}

	return 0;

}



static inline struct slot *get_slot (struct hotplug_slot *hotplug_slot, const char *function)

{ 

	struct slot *slot;



	if (!hotplug_slot) {

		dbg("%s - hotplug_slot == NULL\n", function);

		return NULL;

	}



	slot = (struct slot *)hotplug_slot->private;

	if (slot_paranoia_check (slot, function))

                return NULL;

	return slot;

	return hotplug_slot->private;

}



static inline struct slot *shpchp_find_slot(struct controller *ctrl, u8 device)

{

	struct slot *slot;



	if (!ctrl)

		return NULL;



	list_for_each_entry(slot, &ctrl->slot_list, slot_list) {

		if (slot->device == device)

			return slot;

	}



	err("%s: slot (device=0x%x) not found\n", __FUNCTION__, device);



	return NULL;

}
@@ -377,8 +311,6 @@ static inline void amd_pogo_errata_restore_misc_reg(struct slot *p_slot) 
	pci_write_config_dword(p_slot->ctrl->pci_dev, PCIX_MISCII_OFFSET, pcix_misc2_temp);

}



int shpc_init( struct controller *ctrl, struct pci_dev *pdev);



struct hpc_ops {

	int (*power_on_slot)(struct slot *slot);

	int (*slot_enable)(struct slot *slot);
@@ -389,13 +321,11 @@ struct hpc_ops { 
	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_adapter_speed)(struct slot *slot, enum pci_bus_speed *speed);

	int (*get_mode1_ECC_cap)(struct slot *slot, u8 *mode);

	int (*get_prog_int)(struct slot *slot, u8 *prog_int);



	int (*query_power_fault)(struct slot *slot);

	void (*green_led_on)(struct slot *slot);

	void (*green_led_off)(struct slot *slot);

drivers/pci/hotplug/shpchp_core.c

+11 −11
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ void cleanup_slots(struct controller *ctrl) 
 */

static int set_attention_status (struct hotplug_slot *hotplug_slot, u8 status)

{

	struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);

	struct slot *slot = get_slot(hotplug_slot);



	dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
@@ -205,7 +205,7 @@ static int set_attention_status (struct hotplug_slot *hotplug_slot, u8 status) 


static int enable_slot (struct hotplug_slot *hotplug_slot)

{

	struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);

	struct slot *slot = get_slot(hotplug_slot);



	dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
@@ -214,7 +214,7 @@ static int enable_slot (struct hotplug_slot *hotplug_slot) 


static int disable_slot (struct hotplug_slot *hotplug_slot)

{

	struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);

	struct slot *slot = get_slot(hotplug_slot);



	dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
@@ -223,7 +223,7 @@ static int disable_slot (struct hotplug_slot *hotplug_slot) 


static int get_power_status (struct hotplug_slot *hotplug_slot, u8 *value)

{

	struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);

	struct slot *slot = get_slot(hotplug_slot);

	int retval;



	dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
@@ -237,7 +237,7 @@ static int get_power_status (struct hotplug_slot *hotplug_slot, u8 *value) 


static int get_attention_status (struct hotplug_slot *hotplug_slot, u8 *value)

{

	struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);

	struct slot *slot = get_slot(hotplug_slot);

	int retval;



	dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
@@ -251,7 +251,7 @@ static int get_attention_status (struct hotplug_slot *hotplug_slot, u8 *value) 


static int get_latch_status (struct hotplug_slot *hotplug_slot, u8 *value)

{

	struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);

	struct slot *slot = get_slot(hotplug_slot);

	int retval;



	dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
@@ -265,7 +265,7 @@ static int get_latch_status (struct hotplug_slot *hotplug_slot, u8 *value) 


static int get_adapter_status (struct hotplug_slot *hotplug_slot, u8 *value)

{

	struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);

	struct slot *slot = get_slot(hotplug_slot);

	int retval;



	dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
@@ -279,7 +279,7 @@ static int get_adapter_status (struct hotplug_slot *hotplug_slot, u8 *value) 


static int get_address (struct hotplug_slot *hotplug_slot, u32 *value)

{

	struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);

	struct slot *slot = get_slot(hotplug_slot);

	struct pci_bus *bus = slot->ctrl->pci_dev->subordinate;



	dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
@@ -291,7 +291,7 @@ static int get_address (struct hotplug_slot *hotplug_slot, u32 *value) 


static int get_max_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_speed *value)

{

	struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);

	struct slot *slot = get_slot(hotplug_slot);

	int retval;



	dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
@@ -305,7 +305,7 @@ static int get_max_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_sp 


static int get_cur_bus_speed (struct hotplug_slot *hotplug_slot, enum pci_bus_speed *value)

{

	struct slot *slot = get_slot(hotplug_slot, __FUNCTION__);

	struct slot *slot = get_slot(hotplug_slot);

	int retval;



	dbg("%s - physical_slot = %s\n", __FUNCTION__, hotplug_slot->name);
@@ -355,7 +355,7 @@ static int shpc_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	/* Setup the slot information structures */

	rc = init_slots(ctrl);

	if (rc) {

		err(msg_initialization_err, 6);

		err("%s: slot initialization failed\n", SHPC_MODULE_NAME);

		goto err_out_release_ctlr;

	}

drivers/pci/hotplug/shpchp_ctrl.c

+6 −3
Original line number Diff line number Diff line
@@ -493,10 +493,12 @@ static void handle_button_press_event(struct slot *p_slot) 
		p_slot->hpc_ops->get_power_status(p_slot, &getstatus);

		if (getstatus) {

			p_slot->state = BLINKINGOFF_STATE;

			info(msg_button_off, p_slot->name);

			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->name);

			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);
@@ -519,7 +521,8 @@ static void handle_button_press_event(struct slot *p_slot) 
		else

			p_slot->hpc_ops->green_led_off(p_slot);

		p_slot->hpc_ops->set_attention_status(p_slot, 0);

		info(msg_button_cancel, p_slot->name);

		info("PCI slot #%s - action canceled due to button press\n",

		     p_slot->name);

		p_slot->state = STATIC_STATE;

		break;

	case POWEROFF_STATE: