934199e95d
This is a minor patch to the ppc64 PCI hotplug code; it makes the call to rpaphp_unconfig_pci_adapter() symmetric with respect to the call to rpaphp_config_pci_adapter(). I discussed this with John Rose, who had provided the last round of changes for these functions; he appearently had this patch but somehow failed to mail it out. Tested. (added/removed device). Signed-off-by: Linas Vepstas <linas@austin.ibm.com> drivers/pci/hotplug/rpaphp.h | 3 ++- drivers/pci/hotplug/rpaphp_core.c | 5 ++++- drivers/pci/hotplug/rpaphp_pci.c | 11 +++-------- 3 files changed, 9 insertions(+), 10 deletions(-)
115 lines
3.5 KiB
C
115 lines
3.5 KiB
C
/*
|
|
* PCI Hot Plug Controller Driver for RPA-compliant PPC64 platform.
|
|
*
|
|
* Copyright (C) 2003 Linda Xie <lxie@us.ibm.com>
|
|
*
|
|
* All rights reserved.
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or (at
|
|
* your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE, GOOD TITLE or
|
|
* NON INFRINGEMENT. See the GNU General Public License for more
|
|
* details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*
|
|
* Send feedback to <lxie@us.ibm.com>,
|
|
*
|
|
*/
|
|
|
|
#ifndef _PPC64PHP_H
|
|
#define _PPC64PHP_H
|
|
|
|
#include <linux/pci.h>
|
|
#include "pci_hotplug.h"
|
|
|
|
#define DR_INDICATOR 9002
|
|
#define DR_ENTITY_SENSE 9003
|
|
|
|
#define POWER_ON 100
|
|
#define POWER_OFF 0
|
|
|
|
#define LED_OFF 0
|
|
#define LED_ON 1 /* continuous on */
|
|
#define LED_ID 2 /* slow blinking */
|
|
#define LED_ACTION 3 /* fast blinking */
|
|
|
|
/* Sensor values from rtas_get-sensor */
|
|
#define EMPTY 0 /* No card in slot */
|
|
#define PRESENT 1 /* Card in slot */
|
|
|
|
#define MY_NAME "rpaphp"
|
|
extern int debug;
|
|
#define dbg(format, arg...) \
|
|
do { \
|
|
if (debug) \
|
|
printk(KERN_DEBUG "%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)
|
|
|
|
/* slot states */
|
|
|
|
#define NOT_VALID 3
|
|
#define NOT_CONFIGURED 2
|
|
#define CONFIGURED 1
|
|
#define EMPTY 0
|
|
|
|
/*
|
|
* struct slot - slot information for each *physical* slot
|
|
*/
|
|
struct slot {
|
|
struct list_head rpaphp_slot_list;
|
|
int state;
|
|
u32 index;
|
|
u32 type;
|
|
u32 power_domain;
|
|
char *name;
|
|
char *location;
|
|
struct device_node *dn;
|
|
struct pci_bus *bus;
|
|
struct list_head *pci_devs;
|
|
struct hotplug_slot *hotplug_slot;
|
|
};
|
|
|
|
extern struct hotplug_slot_ops rpaphp_hotplug_slot_ops;
|
|
extern struct list_head rpaphp_slot_head;
|
|
extern int num_slots;
|
|
|
|
/* function prototypes */
|
|
|
|
/* rpaphp_pci.c */
|
|
extern struct pci_bus *rpaphp_find_pci_bus(struct device_node *dn);
|
|
extern int rpaphp_claim_resource(struct pci_dev *dev, int resource);
|
|
extern int rpaphp_enable_pci_slot(struct slot *slot);
|
|
extern int register_pci_slot(struct slot *slot);
|
|
extern int rpaphp_get_pci_adapter_status(struct slot *slot, int is_init, u8 * value);
|
|
|
|
extern int rpaphp_config_pci_adapter(struct pci_bus *bus);
|
|
extern int rpaphp_unconfig_pci_adapter(struct pci_bus *bus);
|
|
|
|
/* rpaphp_core.c */
|
|
extern int rpaphp_add_slot(struct device_node *dn);
|
|
extern int rpaphp_remove_slot(struct slot *slot);
|
|
extern int rpaphp_get_drc_props(struct device_node *dn, int *drc_index,
|
|
char **drc_name, char **drc_type, int *drc_power_domain);
|
|
|
|
/* rpaphp_slot.c */
|
|
extern void dealloc_slot_struct(struct slot *slot);
|
|
extern struct slot *alloc_slot_struct(struct device_node *dn, int drc_index, char *drc_name, int power_domain);
|
|
extern int register_slot(struct slot *slot);
|
|
extern int deregister_slot(struct slot *slot);
|
|
extern int rpaphp_get_power_status(struct slot *slot, u8 * value);
|
|
extern int rpaphp_set_attention_status(struct slot *slot, u8 status);
|
|
|
|
#endif /* _PPC64PHP_H */
|