bc805a5539
The ACPI-based PCI hotplug (acpiphp) core code need not and really should not execute _PS0 and _PS3 directly for devices it handles. First of all, it is not necessary to put devices into D3 after acpi_bus_trim() has walked through them, because acpi_device_unregister() invoked by it puts each device into D3cold before returning. Thus after disable_device() the slot should be powered down already. Second, calling _PS0 directly on ACPI device objects may not be appropriate, because it may require power resources to be set up in a specific way in advance and that must be taken care of by the ACPI core. Thus modify acpiphp_bus_add() to power up the device using the appropriate interface after it has run acpi_bus_scan() on its handle. After that, the functions executing _PS0 and _PS3, power_on_slot() and power_off_slot(), are not necessary any more, so drop them and update the code calling them accordingly. Also drop the function flags related to device power states, since they aren't useful any more too. Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> Tested-by: Mika Westerberg <mika.westerberg@linux.intel.com>
197 lines
5.3 KiB
C
197 lines
5.3 KiB
C
/*
|
|
* ACPI PCI Hot Plug Controller Driver
|
|
*
|
|
* Copyright (C) 1995,2001 Compaq Computer Corporation
|
|
* Copyright (C) 2001 Greg Kroah-Hartman (greg@kroah.com)
|
|
* Copyright (C) 2001 IBM Corp.
|
|
* Copyright (C) 2002 Hiroshi Aono (h-aono@ap.jp.nec.com)
|
|
* Copyright (C) 2002,2003 Takayoshi Kochi (t-kochi@bq.jp.nec.com)
|
|
* Copyright (C) 2002,2003 NEC Corporation
|
|
* Copyright (C) 2003-2005 Matthew Wilcox (matthew.wilcox@hp.com)
|
|
* Copyright (C) 2003-2005 Hewlett Packard
|
|
*
|
|
* 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 <gregkh@us.ibm.com>,
|
|
* <t-kochi@bq.jp.nec.com>
|
|
*
|
|
*/
|
|
|
|
#ifndef _ACPIPHP_H
|
|
#define _ACPIPHP_H
|
|
|
|
#include <linux/acpi.h>
|
|
#include <linux/mutex.h>
|
|
#include <linux/pci_hotplug.h>
|
|
|
|
#define dbg(format, arg...) \
|
|
do { \
|
|
if (acpiphp_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)
|
|
|
|
struct acpiphp_context;
|
|
struct acpiphp_bridge;
|
|
struct acpiphp_slot;
|
|
|
|
/*
|
|
* struct slot - slot information for each *physical* slot
|
|
*/
|
|
struct slot {
|
|
struct hotplug_slot *hotplug_slot;
|
|
struct acpiphp_slot *acpi_slot;
|
|
struct hotplug_slot_info info;
|
|
unsigned int sun; /* ACPI _SUN (Slot User Number) value */
|
|
};
|
|
|
|
static inline const char *slot_name(struct slot *slot)
|
|
{
|
|
return hotplug_slot_name(slot->hotplug_slot);
|
|
}
|
|
|
|
/*
|
|
* struct acpiphp_bridge - PCI bridge information
|
|
*
|
|
* for each bridge device in ACPI namespace
|
|
*/
|
|
struct acpiphp_bridge {
|
|
struct list_head list;
|
|
struct list_head slots;
|
|
struct kref ref;
|
|
|
|
struct acpiphp_context *context;
|
|
|
|
int nr_slots;
|
|
|
|
/* This bus (host bridge) or Secondary bus (PCI-to-PCI bridge) */
|
|
struct pci_bus *pci_bus;
|
|
|
|
/* PCI-to-PCI bridge device */
|
|
struct pci_dev *pci_dev;
|
|
};
|
|
|
|
|
|
/*
|
|
* struct acpiphp_slot - PCI slot information
|
|
*
|
|
* PCI slot information for each *physical* PCI slot
|
|
*/
|
|
struct acpiphp_slot {
|
|
struct list_head node;
|
|
struct pci_bus *bus;
|
|
struct list_head funcs; /* one slot may have different
|
|
objects (i.e. for each function) */
|
|
struct slot *slot;
|
|
struct mutex crit_sect;
|
|
|
|
u8 device; /* pci device# */
|
|
u32 flags; /* see below */
|
|
};
|
|
|
|
|
|
/*
|
|
* struct acpiphp_func - PCI function information
|
|
*
|
|
* PCI function information for each object in ACPI namespace
|
|
* typically 8 objects per slot (i.e. for each PCI function)
|
|
*/
|
|
struct acpiphp_func {
|
|
struct acpiphp_bridge *parent;
|
|
struct acpiphp_slot *slot;
|
|
|
|
struct list_head sibling;
|
|
|
|
u8 function; /* pci function# */
|
|
u32 flags; /* see below */
|
|
};
|
|
|
|
struct acpiphp_context {
|
|
acpi_handle handle;
|
|
struct acpiphp_func func;
|
|
struct acpiphp_bridge *bridge;
|
|
unsigned int refcount;
|
|
};
|
|
|
|
static inline struct acpiphp_context *func_to_context(struct acpiphp_func *func)
|
|
{
|
|
return container_of(func, struct acpiphp_context, func);
|
|
}
|
|
|
|
static inline acpi_handle func_to_handle(struct acpiphp_func *func)
|
|
{
|
|
return func_to_context(func)->handle;
|
|
}
|
|
|
|
/*
|
|
* struct acpiphp_attention_info - device specific attention registration
|
|
*
|
|
* ACPI has no generic method of setting/getting attention status
|
|
* this allows for device specific driver registration
|
|
*/
|
|
struct acpiphp_attention_info
|
|
{
|
|
int (*set_attn)(struct hotplug_slot *slot, u8 status);
|
|
int (*get_attn)(struct hotplug_slot *slot, u8 *status);
|
|
struct module *owner;
|
|
};
|
|
|
|
/* PCI bus bridge HID */
|
|
#define ACPI_PCI_HOST_HID "PNP0A03"
|
|
|
|
/* ACPI _STA method value (ignore bit 4; battery present) */
|
|
#define ACPI_STA_ALL (0x0000000f)
|
|
|
|
/* slot flags */
|
|
|
|
#define SLOT_ENABLED (0x00000002)
|
|
#define SLOT_MULTIFUNCTION (0x00000004)
|
|
|
|
/* function flags */
|
|
|
|
#define FUNC_HAS_STA (0x00000001)
|
|
#define FUNC_HAS_EJ0 (0x00000002)
|
|
#define FUNC_HAS_DCK (0x00000004)
|
|
|
|
/* function prototypes */
|
|
|
|
/* acpiphp_core.c */
|
|
int acpiphp_register_attention(struct acpiphp_attention_info*info);
|
|
int acpiphp_unregister_attention(struct acpiphp_attention_info *info);
|
|
int acpiphp_register_hotplug_slot(struct acpiphp_slot *slot, unsigned int sun);
|
|
void acpiphp_unregister_hotplug_slot(struct acpiphp_slot *slot);
|
|
|
|
/* acpiphp_glue.c */
|
|
typedef int (*acpiphp_callback)(struct acpiphp_slot *slot, void *data);
|
|
|
|
int acpiphp_enable_slot(struct acpiphp_slot *slot);
|
|
int acpiphp_disable_and_eject_slot(struct acpiphp_slot *slot);
|
|
u8 acpiphp_get_power_status(struct acpiphp_slot *slot);
|
|
u8 acpiphp_get_attention_status(struct acpiphp_slot *slot);
|
|
u8 acpiphp_get_latch_status(struct acpiphp_slot *slot);
|
|
u8 acpiphp_get_adapter_status(struct acpiphp_slot *slot);
|
|
|
|
/* variables */
|
|
extern bool acpiphp_debug;
|
|
extern bool acpiphp_disabled;
|
|
|
|
#endif /* _ACPIPHP_H */
|