#include <linux/signal.h>
#include <linux/kthread.h>
#include <linux/dmi.h>
++++ +++#include <linux/nls.h>
#include <acpi/acpi_drivers.h>
}
static DEVICE_ATTR(modalias, 0444, acpi_device_modalias_show, NULL);
- static void acpi_bus_hot_remove_device(void *context)
+ /**
+ * acpi_bus_hot_remove_device: hot-remove a device and its children
+ * @context: struct acpi_eject_event pointer (freed in this func)
+ *
+ * Hot-remove a device and its children. This function frees up the
+ * memory space passed by arg context, so that the caller may call
+ * this function asynchronously through acpi_os_hotplug_execute().
+ */
+ void acpi_bus_hot_remove_device(void *context)
{
+ struct acpi_eject_event *ej_event = (struct acpi_eject_event *) context;
struct acpi_device *device;
- acpi_handle handle = context;
+ acpi_handle handle = ej_event->handle;
struct acpi_object_list arg_list;
union acpi_object arg;
acpi_status status = AE_OK;
+ u32 ost_code = ACPI_OST_SC_NON_SPECIFIC_FAILURE; /* default */
if (acpi_bus_get_device(handle, &device))
- return;
+ goto err_out;
if (!device)
- return;
+ goto err_out;
ACPI_DEBUG_PRINT((ACPI_DB_INFO,
"Hot-removing device %s...\n", dev_name(&device->dev)));
if (acpi_bus_trim(device, 1)) {
printk(KERN_ERR PREFIX
"Removing device failed\n");
- return;
+ goto err_out;
}
/* power off device */
* TBD: _EJD support.
*/
status = acpi_evaluate_object(handle, "_EJ0", &arg_list, NULL);
- if (ACPI_FAILURE(status))
- printk(KERN_WARNING PREFIX
- "Eject device failed\n");
+ if (ACPI_FAILURE(status)) {
+ if (status != AE_NOT_FOUND)
+ printk(KERN_WARNING PREFIX
+ "Eject device failed\n");
+ goto err_out;
+ }
+
+ kfree(context);
+ return;
+ err_out:
+ /* Inform firmware the hot-remove operation has completed w/ error */
+ (void) acpi_evaluate_hotplug_ost(handle,
+ ej_event->event, ost_code, NULL);
+ kfree(context);
return;
}
acpi_status status;
acpi_object_type type = 0;
struct acpi_device *acpi_device = to_acpi_device(d);
+ struct acpi_eject_event *ej_event;
if ((!count) || (buf[0] != '1')) {
return -EINVAL;
goto err;
}
- acpi_os_hotplug_execute(acpi_bus_hot_remove_device, acpi_device->handle);
+ ej_event = kmalloc(sizeof(*ej_event), GFP_KERNEL);
+ if (!ej_event) {
+ ret = -ENOMEM;
+ goto err;
+ }
+
+ ej_event->handle = acpi_device->handle;
+ if (acpi_device->flags.eject_pending) {
+ /* event originated from ACPI eject notification */
+ ej_event->event = ACPI_NOTIFY_EJECT_REQUEST;
+ acpi_device->flags.eject_pending = 0;
+ } else {
+ /* event originated from user */
+ ej_event->event = ACPI_OST_EC_OSPM_EJECT;
+ (void) acpi_evaluate_hotplug_ost(ej_event->handle,
+ ej_event->event, ACPI_OST_SC_EJECT_IN_PROGRESS, NULL);
+ }
+
+ acpi_os_hotplug_execute(acpi_bus_hot_remove_device, (void *)ej_event);
err:
return ret;
}
}
static DEVICE_ATTR(path, 0444, acpi_device_path_show, NULL);
++++ +++/* sysfs file that shows description text from the ACPI _STR method */
++++ +++static ssize_t description_show(struct device *dev,
++++ +++ struct device_attribute *attr,
++++ +++ char *buf) {
++++ +++ struct acpi_device *acpi_dev = to_acpi_device(dev);
++++ +++ int result;
++++ +++
++++ +++ if (acpi_dev->pnp.str_obj == NULL)
++++ +++ return 0;
++++ +++
++++ +++ /*
++++ +++ * The _STR object contains a Unicode identifier for a device.
++++ +++ * We need to convert to utf-8 so it can be displayed.
++++ +++ */
++++ +++ result = utf16s_to_utf8s(
++++ +++ (wchar_t *)acpi_dev->pnp.str_obj->buffer.pointer,
++++ +++ acpi_dev->pnp.str_obj->buffer.length,
++++ +++ UTF16_LITTLE_ENDIAN, buf,
++++ +++ PAGE_SIZE);
++++ +++
++++ +++ buf[result++] = '\n';
++++ +++
++++ +++ return result;
++++ +++}
++++ +++static DEVICE_ATTR(description, 0444, description_show, NULL);
++++ +++
static int acpi_device_setup_files(struct acpi_device *dev)
{
++++ +++ struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
acpi_status status;
acpi_handle temp;
int result = 0;
goto end;
}
++++ +++ /*
++++ +++ * If device has _STR, 'description' file is created
++++ +++ */
++++ +++ status = acpi_get_handle(dev->handle, "_STR", &temp);
++++ +++ if (ACPI_SUCCESS(status)) {
++++ +++ status = acpi_evaluate_object(dev->handle, "_STR",
++++ +++ NULL, &buffer);
++++ +++ if (ACPI_FAILURE(status))
++++ +++ buffer.pointer = NULL;
++++ +++ dev->pnp.str_obj = buffer.pointer;
++++ +++ result = device_create_file(&dev->dev, &dev_attr_description);
++++ +++ if (result)
++++ +++ goto end;
++++ +++ }
++++ +++
/*
* If device has _EJ0, 'eject' file is created that is used to trigger
* hot-removal function from userland.
acpi_handle temp;
/*
---- --- * If device has _EJ0, 'eject' file is created that is used to trigger
---- --- * hot-removal function from userland.
++++ +++ * If device has _STR, remove 'description' file
++++ +++ */
++++ +++ status = acpi_get_handle(dev->handle, "_STR", &temp);
++++ +++ if (ACPI_SUCCESS(status)) {
++++ +++ kfree(dev->pnp.str_obj);
++++ +++ device_remove_file(&dev->dev, &dev_attr_description);
++++ +++ }
++++ +++ /*
++++ +++ * If device has _EJ0, remove 'eject' file.
*/
status = acpi_get_handle(dev->handle, "_EJ0", &temp);
if (ACPI_SUCCESS(status))
kfree(acpi_dev);
}
- static int acpi_device_suspend(struct device *dev, pm_message_t state)
- {
- struct acpi_device *acpi_dev = to_acpi_device(dev);
- struct acpi_driver *acpi_drv = acpi_dev->driver;
-
- if (acpi_drv && acpi_drv->ops.suspend)
- return acpi_drv->ops.suspend(acpi_dev, state);
- return 0;
- }
-
- static int acpi_device_resume(struct device *dev)
- {
- struct acpi_device *acpi_dev = to_acpi_device(dev);
- struct acpi_driver *acpi_drv = acpi_dev->driver;
-
- if (acpi_drv && acpi_drv->ops.resume)
- return acpi_drv->ops.resume(acpi_dev);
- return 0;
- }
-
static int acpi_bus_match(struct device *dev, struct device_driver *drv)
{
struct acpi_device *acpi_dev = to_acpi_device(dev);
struct bus_type acpi_bus_type = {
.name = "acpi",
- .suspend = acpi_device_suspend,
- .resume = acpi_device_resume,
.match = acpi_bus_match,
.probe = acpi_device_probe,
.remove = acpi_device_remove,
INIT_LIST_HEAD(&device->children);
INIT_LIST_HEAD(&device->node);
INIT_LIST_HEAD(&device->wakeup_list);
+++++++ INIT_LIST_HEAD(&device->physical_node_list);
+++++++ mutex_init(&device->physical_node_lock);
new_bus_id = kzalloc(sizeof(struct acpi_device_bus_id), GFP_KERNEL);
if (!new_bus_id) {
acpi_string pathname,
struct acpi_object_list *arguments,
struct acpi_handle_list *list);
-
- struct acpi_pld {
- unsigned int revision:7; /* 0 */
- unsigned int ignore_colour:1; /* 7 */
- unsigned int colour:24; /* 8 */
- unsigned int width:16; /* 32 */
- unsigned int height:16; /* 48 */
- unsigned int user_visible:1; /* 64 */
- unsigned int dock:1; /* 65 */
- unsigned int lid:1; /* 66 */
- unsigned int panel:3; /* 67 */
- unsigned int vertical_pos:2; /* 70 */
- unsigned int horizontal_pos:2; /* 72 */
- unsigned int shape:4; /* 74 */
- unsigned int group_orientation:1; /* 78 */
- unsigned int group_token:8; /* 79 */
- unsigned int group_position:8; /* 87 */
- unsigned int bay:1; /* 95 */
- unsigned int ejectable:1; /* 96 */
- unsigned int ospm_eject_required:1; /* 97 */
- unsigned int cabinet_number:8; /* 98 */
- unsigned int card_cage_number:8; /* 106 */
- unsigned int reference:1; /* 114 */
- unsigned int rotation:4; /* 115 */
- unsigned int order:5; /* 119 */
- unsigned int reserved:4; /* 124 */
- unsigned int vertical_offset:16; /* 128 */
- unsigned int horizontal_offset:16; /* 144 */
- } __attribute__((__packed__));
+ acpi_status
+ acpi_evaluate_hotplug_ost(acpi_handle handle, u32 source_event,
+ u32 status_code, struct acpi_buffer *status_buf);
- -----struct acpi_pld {
- ----- unsigned int revision:7; /* 0 */
- ----- unsigned int ignore_colour:1; /* 7 */
- ----- unsigned int colour:24; /* 8 */
- ----- unsigned int width:16; /* 32 */
- ----- unsigned int height:16; /* 48 */
- ----- unsigned int user_visible:1; /* 64 */
- ----- unsigned int dock:1; /* 65 */
- ----- unsigned int lid:1; /* 66 */
- ----- unsigned int panel:3; /* 67 */
- ----- unsigned int vertical_pos:2; /* 70 */
- ----- unsigned int horizontal_pos:2; /* 72 */
- ----- unsigned int shape:4; /* 74 */
- ----- unsigned int group_orientation:1; /* 78 */
- ----- unsigned int group_token:8; /* 79 */
- ----- unsigned int group_position:8; /* 87 */
- ----- unsigned int bay:1; /* 95 */
- ----- unsigned int ejectable:1; /* 96 */
- ----- unsigned int ospm_eject_required:1; /* 97 */
- ----- unsigned int cabinet_number:8; /* 98 */
- ----- unsigned int card_cage_number:8; /* 106 */
- ----- unsigned int reference:1; /* 114 */
- ----- unsigned int rotation:4; /* 115 */
- ----- unsigned int order:5; /* 119 */
- ----- unsigned int reserved:4; /* 124 */
- ----- unsigned int vertical_offset:16; /* 128 */
- ----- unsigned int horizontal_offset:16; /* 144 */
- -----} __attribute__((__packed__));
- -----
acpi_status
- ------acpi_get_physical_device_location(acpi_handle handle, struct acpi_pld *pld);
+ ++++++acpi_get_physical_device_location(acpi_handle handle, struct acpi_pld_info **pld);
#ifdef CONFIG_ACPI
#include <linux/proc_fs.h>
typedef int (*acpi_op_add) (struct acpi_device * device);
typedef int (*acpi_op_remove) (struct acpi_device * device, int type);
typedef int (*acpi_op_start) (struct acpi_device * device);
- typedef int (*acpi_op_suspend) (struct acpi_device * device,
- pm_message_t state);
- typedef int (*acpi_op_resume) (struct acpi_device * device);
typedef int (*acpi_op_bind) (struct acpi_device * device);
typedef int (*acpi_op_unbind) (struct acpi_device * device);
typedef void (*acpi_op_notify) (struct acpi_device * device, u32 event);
acpi_op_add add;
acpi_op_remove remove;
acpi_op_start start;
- acpi_op_suspend suspend;
- acpi_op_resume resume;
acpi_op_bind bind;
acpi_op_unbind unbind;
acpi_op_notify notify;
u32 suprise_removal_ok:1;
u32 power_manageable:1;
u32 performance_manageable:1;
- u32 reserved:24;
+ u32 eject_pending:1;
+ u32 reserved:23;
};
/* File System */
struct list_head ids; /* _HID and _CIDs */
acpi_device_name device_name; /* Driver-determined */
acpi_device_class device_class; /* " */
++++ +++ union acpi_object *str_obj; /* unicode string for _STR method */
};
#define acpi_device_bid(d) ((d)->pnp.bus_id)
int prepare_count;
};
------- /* Device */
+++++++ struct acpi_device_physical_node {
+++++++ u8 node_id;
+++++++ struct list_head node;
+++++++ struct device *dev;
+++++++ };
+ +++++
+++++++ /* set maximum of physical nodes to 32 for expansibility */
+++++++ #define ACPI_MAX_PHYSICAL_NODE 32
+
+++++++ /* Device */
struct acpi_device {
int device_type;
acpi_handle handle; /* no handle for fixed hardware */
struct device dev;
struct acpi_bus_ops bus_ops; /* workaround for different code path for hotplug */
enum acpi_bus_removal_type removal_type; /* indicate for different removal type */
+++++++ u8 physical_node_count;
+++++++ struct list_head physical_node_list;
+++++++ struct mutex physical_node_lock;
+++++++ DECLARE_BITMAP(physical_node_id_bitmap, ACPI_MAX_PHYSICAL_NODE);
};
static inline void *acpi_driver_data(struct acpi_device *d)
u32 data;
};
+ struct acpi_eject_event {
+ acpi_handle handle;
+ u32 event;
+ };
+
extern struct kobject *acpi_kobj;
extern int acpi_bus_generate_netlink_event(const char*, const char*, u8, int);
void acpi_bus_private_data_handler(acpi_handle, void *);
void acpi_bus_unregister_driver(struct acpi_driver *driver);
int acpi_bus_add(struct acpi_device **child, struct acpi_device *parent,
acpi_handle handle, int type);
+ void acpi_bus_hot_remove_device(void *context);
int acpi_bus_trim(struct acpi_device *start, int rmdevice);
int acpi_bus_start(struct acpi_device *device);
acpi_status acpi_bus_get_ejd(acpi_handle handle, acpi_handle * ejd);
int acpi_create_dir(struct acpi_device *);
void acpi_remove_dir(struct acpi_device *);
+++++ ++
+++++ ++/**
+++++ ++ * module_acpi_driver(acpi_driver) - Helper macro for registering an ACPI driver
+++++ ++ * @__acpi_driver: acpi_driver struct
+++++ ++ *
+++++ ++ * Helper macro for ACPI drivers which do not do anything special in module
+++++ ++ * init/exit. This eliminates a lot of boilerplate. Each module may only
+++++ ++ * use this macro once, and calling it replaces module_init() and module_exit()
+++++ ++ */
+++++ ++#define module_acpi_driver(__acpi_driver) \
+++++ ++ module_driver(__acpi_driver, acpi_bus_register_driver, \
+++++ ++ acpi_bus_unregister_driver)
+++++ ++
/*
* Bind physical devices with ACPI devices
*/
};
int register_acpi_bus_type(struct acpi_bus_type *);
int unregister_acpi_bus_type(struct acpi_bus_type *);
------- struct device *acpi_get_physical_device(acpi_handle);
struct acpi_pci_root {
struct list_head node;
u32 osc_support_set; /* _OSC state of support bits */
u32 osc_control_set; /* _OSC state of control bits */
+ phys_addr_t mcfg_addr;
};
/* helper */
int acpi_disable_wakeup_device_power(struct acpi_device *dev);
#ifdef CONFIG_PM
- int acpi_pm_device_sleep_state(struct device *, int *);
+ int acpi_pm_device_sleep_state(struct device *, int *, int);
#else
- static inline int acpi_pm_device_sleep_state(struct device *d, int *p)
+ static inline int acpi_pm_device_sleep_state(struct device *d, int *p, int m)
{
if (p)
*p = ACPI_STATE_D0;
- return ACPI_STATE_D3;
+ return (m >= ACPI_STATE_D0 && m <= ACPI_STATE_D3) ? m : ACPI_STATE_D0;
}
#endif
projects / karo-tx-linux.git / commitdiff