redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

ACPI / IPMI: Cleanup coding styles

Browse source 
This patch only introduces indentation cleanups.  No functional changes.

Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Lv Zheng 2013-09-13 13:15:00 +08:00 committed by Rafael J. Wysocki
parent 4b88e33091
commit 5006530031
1 changed files with 65 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

105
drivers/acpi/acpi_ipmi.c
View file

@ -33,7 +33,6 @@ MODULE_AUTHOR("Zhao Yakui");
MODULE_DESCRIPTION("ACPI IPMI Opregion driver"); MODULE_DESCRIPTION("ACPI IPMI Opregion driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
#define ACPI_IPMI_OK 0 #define ACPI_IPMI_OK 0
#define ACPI_IPMI_TIMEOUT 0x10 #define ACPI_IPMI_TIMEOUT 0x10
#define ACPI_IPMI_UNKNOWN 0x07 #define ACPI_IPMI_UNKNOWN 0x07
@ -44,12 +43,14 @@ MODULE_LICENSE("GPL");
struct acpi_ipmi_device { struct acpi_ipmi_device {
/* the device list attached to driver_data.ipmi_devices */ /* the device list attached to driver_data.ipmi_devices */
struct list_head head; struct list_head head;
/* the IPMI request message list */ /* the IPMI request message list */
struct list_head tx_msg_list; struct list_head tx_msg_list;
spinlock_t tx_msg_lock;
spinlock_t tx_msg_lock;
acpi_handle handle; acpi_handle handle;
struct device *dev; struct device *dev;
ipmi_user_t user_interface; ipmi_user_t user_interface;
int ipmi_ifnum; /* IPMI interface number */ int ipmi_ifnum; /* IPMI interface number */
long curr_msgid; long curr_msgid;
bool dead; bool dead;
@ -57,10 +58,11 @@ struct acpi_ipmi_device {
}; };
struct ipmi_driver_data { struct ipmi_driver_data {
struct list_head ipmi_devices; struct list_head ipmi_devices;
struct ipmi_smi_watcher bmc_events; struct ipmi_smi_watcher bmc_events;
struct ipmi_user_hndl ipmi_hndlrs; struct ipmi_user_hndl ipmi_hndlrs;
struct mutex ipmi_lock; struct mutex ipmi_lock;
/* /*
* NOTE: IPMI System Interface Selection * NOTE: IPMI System Interface Selection
* There is no system interface specified by the IPMI operation * There is no system interface specified by the IPMI operation
@ -73,6 +75,7 @@ struct ipmi_driver_data {
struct acpi_ipmi_msg { struct acpi_ipmi_msg {
struct list_head head; struct list_head head;
/* /*
* General speaking the addr type should be SI_ADDR_TYPE. And * General speaking the addr type should be SI_ADDR_TYPE. And
* the addr channel should be BMC. * the addr channel should be BMC.
@ -82,15 +85,19 @@ struct acpi_ipmi_msg {
*/ */
struct ipmi_addr addr; struct ipmi_addr addr;
long tx_msgid; long tx_msgid;
/* it is used to track whether the IPMI message is finished */ /* it is used to track whether the IPMI message is finished */
struct completion tx_complete; struct completion tx_complete;
struct kernel_ipmi_msg tx_message; struct kernel_ipmi_msg tx_message;
int msg_done; int msg_done;
/* tx/rx data . And copy it from/to ACPI object buffer */ /* tx/rx data . And copy it from/to ACPI object buffer */
u8 data[ACPI_IPMI_MAX_MSG_LENGTH]; u8 data[ACPI_IPMI_MAX_MSG_LENGTH];
u8 rx_len; u8 rx_len;
struct acpi_ipmi_device *device; struct acpi_ipmi_device *device;
struct kref kref; struct kref kref;
}; };
/* IPMI request/response buffer per ACPI 4.0, sec 5.5.2.4.3.2 */ /* IPMI request/response buffer per ACPI 4.0, sec 5.5.2.4.3.2 */
@ -132,7 +139,6 @@ ipmi_dev_alloc(int iface, struct device *dev, acpi_handle handle)
INIT_LIST_HEAD(&ipmi_device->head); INIT_LIST_HEAD(&ipmi_device->head);
INIT_LIST_HEAD(&ipmi_device->tx_msg_list); INIT_LIST_HEAD(&ipmi_device->tx_msg_list);
spin_lock_init(&ipmi_device->tx_msg_lock); spin_lock_init(&ipmi_device->tx_msg_lock);
ipmi_device->handle = handle; ipmi_device->handle = handle;
ipmi_device->dev = get_device(dev); ipmi_device->dev = get_device(dev);
ipmi_device->ipmi_ifnum = iface; ipmi_device->ipmi_ifnum = iface;
@ -169,6 +175,7 @@ static void __ipmi_dev_kill(struct acpi_ipmi_device *ipmi_device)
list_del(&ipmi_device->head); list_del(&ipmi_device->head);
if (driver_data.selected_smi == ipmi_device) if (driver_data.selected_smi == ipmi_device)
driver_data.selected_smi = NULL; driver_data.selected_smi = NULL;
/* /*
* Always setting dead flag after deleting from the list or * Always setting dead flag after deleting from the list or
* list_for_each_entry() codes must get changed. * list_for_each_entry() codes must get changed.
@ -203,16 +210,19 @@ static struct acpi_ipmi_msg *ipmi_msg_alloc(void)
ipmi = acpi_ipmi_dev_get(); ipmi = acpi_ipmi_dev_get();
if (!ipmi) if (!ipmi)
return NULL; return NULL;
ipmi_msg = kzalloc(sizeof(struct acpi_ipmi_msg), GFP_KERNEL); ipmi_msg = kzalloc(sizeof(struct acpi_ipmi_msg), GFP_KERNEL);
if (!ipmi_msg) { if (!ipmi_msg) {
acpi_ipmi_dev_put(ipmi); acpi_ipmi_dev_put(ipmi);
return NULL; return NULL;
} }
kref_init(&ipmi_msg->kref); kref_init(&ipmi_msg->kref);
init_completion(&ipmi_msg->tx_complete); init_completion(&ipmi_msg->tx_complete);
INIT_LIST_HEAD(&ipmi_msg->head); INIT_LIST_HEAD(&ipmi_msg->head);
ipmi_msg->device = ipmi; ipmi_msg->device = ipmi;
ipmi_msg->msg_done = ACPI_IPMI_UNKNOWN; ipmi_msg->msg_done = ACPI_IPMI_UNKNOWN;
return ipmi_msg; return ipmi_msg;
} }
@ -242,11 +252,11 @@ static void acpi_ipmi_msg_put(struct acpi_ipmi_msg *tx_msg)
kref_put(&tx_msg->kref, ipmi_msg_release_kref); kref_put(&tx_msg->kref, ipmi_msg_release_kref);
} }
#define IPMI_OP_RGN_NETFN(offset) ((offset >> 8) & 0xff) #define IPMI_OP_RGN_NETFN(offset) ((offset >> 8) & 0xff)
#define IPMI_OP_RGN_CMD(offset) (offset & 0xff) #define IPMI_OP_RGN_CMD(offset) (offset & 0xff)
static int acpi_format_ipmi_request(struct acpi_ipmi_msg *tx_msg, static int acpi_format_ipmi_request(struct acpi_ipmi_msg *tx_msg,
acpi_physical_address address, acpi_physical_address address,
acpi_integer *value) acpi_integer *value)
{ {
struct kernel_ipmi_msg *msg; struct kernel_ipmi_msg *msg;
struct acpi_ipmi_buffer *buffer; struct acpi_ipmi_buffer *buffer;
@ -254,6 +264,7 @@ static int acpi_format_ipmi_request(struct acpi_ipmi_msg *tx_msg,
unsigned long flags; unsigned long flags;
msg = &tx_msg->tx_message; msg = &tx_msg->tx_message;
/* /*
* IPMI network function and command are encoded in the address * IPMI network function and command are encoded in the address
* within the IPMI OpRegion; see ACPI 4.0, sec 5.5.2.4.3. * within the IPMI OpRegion; see ACPI 4.0, sec 5.5.2.4.3.
@ -261,11 +272,13 @@ static int acpi_format_ipmi_request(struct acpi_ipmi_msg *tx_msg,
msg->netfn = IPMI_OP_RGN_NETFN(address); msg->netfn = IPMI_OP_RGN_NETFN(address);
msg->cmd = IPMI_OP_RGN_CMD(address); msg->cmd = IPMI_OP_RGN_CMD(address);
msg->data = tx_msg->data; msg->data = tx_msg->data;
/* /*
* value is the parameter passed by the IPMI opregion space handler. * value is the parameter passed by the IPMI opregion space handler.
* It points to the IPMI request message buffer * It points to the IPMI request message buffer
*/ */
buffer = (struct acpi_ipmi_buffer *)value; buffer = (struct acpi_ipmi_buffer *)value;
/* copy the tx message data */ /* copy the tx message data */
if (buffer->length > ACPI_IPMI_MAX_MSG_LENGTH) { if (buffer->length > ACPI_IPMI_MAX_MSG_LENGTH) {
dev_WARN_ONCE(tx_msg->device->dev, true, dev_WARN_ONCE(tx_msg->device->dev, true,
@ -275,6 +288,7 @@ static int acpi_format_ipmi_request(struct acpi_ipmi_msg *tx_msg,
} }
msg->data_len = buffer->length; msg->data_len = buffer->length;
memcpy(tx_msg->data, buffer->data, msg->data_len); memcpy(tx_msg->data, buffer->data, msg->data_len);
/* /*
* now the default type is SYSTEM_INTERFACE and channel type is BMC. * now the default type is SYSTEM_INTERFACE and channel type is BMC.
* If the netfn is APP_REQUEST and the cmd is SEND_MESSAGE, * If the netfn is APP_REQUEST and the cmd is SEND_MESSAGE,
@ -288,15 +302,17 @@ static int acpi_format_ipmi_request(struct acpi_ipmi_msg *tx_msg,
/* Get the msgid */ /* Get the msgid */
device = tx_msg->device; device = tx_msg->device;
spin_lock_irqsave(&device->tx_msg_lock, flags); spin_lock_irqsave(&device->tx_msg_lock, flags);
device->curr_msgid++; device->curr_msgid++;
tx_msg->tx_msgid = device->curr_msgid; tx_msg->tx_msgid = device->curr_msgid;
spin_unlock_irqrestore(&device->tx_msg_lock, flags); spin_unlock_irqrestore(&device->tx_msg_lock, flags);
return 0; return 0;
} }
static void acpi_format_ipmi_response(struct acpi_ipmi_msg *msg, static void acpi_format_ipmi_response(struct acpi_ipmi_msg *msg,
acpi_integer *value) acpi_integer *value)
{ {
struct acpi_ipmi_buffer *buffer; struct acpi_ipmi_buffer *buffer;
@ -305,6 +321,7 @@ static void acpi_format_ipmi_response(struct acpi_ipmi_msg *msg,
* IPMI message returned by IPMI command. * IPMI message returned by IPMI command.
*/ */
buffer = (struct acpi_ipmi_buffer *)value; buffer = (struct acpi_ipmi_buffer *)value;
/* /*
* If the flag of msg_done is not set, it means that the IPMI command is * If the flag of msg_done is not set, it means that the IPMI command is
* not executed correctly. * not executed correctly.
@ -312,6 +329,7 @@ static void acpi_format_ipmi_response(struct acpi_ipmi_msg *msg,
buffer->status = msg->msg_done; buffer->status = msg->msg_done;
if (msg->msg_done != ACPI_IPMI_OK) if (msg->msg_done != ACPI_IPMI_OK)
return; return;
/* /*
* If the IPMI response message is obtained correctly, the status code * If the IPMI response message is obtained correctly, the status code
* will be ACPI_IPMI_OK * will be ACPI_IPMI_OK
@ -379,11 +397,12 @@ static void ipmi_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data)
unsigned long flags; unsigned long flags;
if (msg->user != ipmi_device->user_interface) { if (msg->user != ipmi_device->user_interface) {
dev_warn(dev, "Unexpected response is returned. " dev_warn(dev,
"returned user %p, expected user %p\n", "Unexpected response is returned. returned user %p, expected user %p\n",
msg->user, ipmi_device->user_interface); msg->user, ipmi_device->user_interface);
goto out_msg; goto out_msg;
} }
spin_lock_irqsave(&ipmi_device->tx_msg_lock, flags); spin_lock_irqsave(&ipmi_device->tx_msg_lock, flags);
list_for_each_entry_safe(tx_msg, temp, &ipmi_device->tx_msg_list, head) { list_for_each_entry_safe(tx_msg, temp, &ipmi_device->tx_msg_list, head) {
if (msg->msgid == tx_msg->tx_msgid) { if (msg->msgid == tx_msg->tx_msgid) {
@ -395,8 +414,9 @@ static void ipmi_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data)
spin_unlock_irqrestore(&ipmi_device->tx_msg_lock, flags); spin_unlock_irqrestore(&ipmi_device->tx_msg_lock, flags);
if (!msg_found) { if (!msg_found) {
dev_warn(dev, "Unexpected response (msg id %ld) is " dev_warn(dev,
"returned.\n", msg->msgid); "Unexpected response (msg id %ld) is returned.\n",
msg->msgid);
goto out_msg; goto out_msg;
} }
@ -407,6 +427,7 @@ static void ipmi_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data)
msg->msg.data_len); msg->msg.data_len);
goto out_comp; goto out_comp;
} }
/* response msg is an error msg */ /* response msg is an error msg */
msg->recv_type = IPMI_RESPONSE_RECV_TYPE; msg->recv_type = IPMI_RESPONSE_RECV_TYPE;
if (msg->recv_type == IPMI_RESPONSE_RECV_TYPE && if (msg->recv_type == IPMI_RESPONSE_RECV_TYPE &&
@ -418,15 +439,17 @@ static void ipmi_msg_handler(struct ipmi_recv_msg *msg, void *user_msg_data)
} }
goto out_comp; goto out_comp;
} }
tx_msg->rx_len = msg->msg.data_len; tx_msg->rx_len = msg->msg.data_len;
memcpy(tx_msg->data, msg->msg.data, tx_msg->rx_len); memcpy(tx_msg->data, msg->msg.data, tx_msg->rx_len);
tx_msg->msg_done = ACPI_IPMI_OK; tx_msg->msg_done = ACPI_IPMI_OK;
out_comp: out_comp:
complete(&tx_msg->tx_complete); complete(&tx_msg->tx_complete);
acpi_ipmi_msg_put(tx_msg); acpi_ipmi_msg_put(tx_msg);
out_msg: out_msg:
ipmi_free_recv_msg(msg); ipmi_free_recv_msg(msg);
}; }
static void ipmi_register_bmc(int iface, struct device *dev) static void ipmi_register_bmc(int iface, struct device *dev)
{ {
@ -436,7 +459,6 @@ static void ipmi_register_bmc(int iface, struct device *dev)
acpi_handle handle; acpi_handle handle;
err = ipmi_get_smi_info(iface, &smi_data); err = ipmi_get_smi_info(iface, &smi_data);
if (err) if (err)
return; return;
@ -461,11 +483,11 @@ static void ipmi_register_bmc(int iface, struct device *dev)
if (temp->handle == handle) if (temp->handle == handle)
goto err_lock; goto err_lock;
} }
if (!driver_data.selected_smi) if (!driver_data.selected_smi)
driver_data.selected_smi = ipmi_device; driver_data.selected_smi = ipmi_device;
list_add_tail(&ipmi_device->head, &driver_data.ipmi_devices); list_add_tail(&ipmi_device->head, &driver_data.ipmi_devices);
mutex_unlock(&driver_data.ipmi_lock); mutex_unlock(&driver_data.ipmi_lock);
put_device(smi_data.dev); put_device(smi_data.dev);
return; return;
@ -484,7 +506,7 @@ static void ipmi_bmc_gone(int iface)
mutex_lock(&driver_data.ipmi_lock); mutex_lock(&driver_data.ipmi_lock);
list_for_each_entry_safe(ipmi_device, temp, list_for_each_entry_safe(ipmi_device, temp,
&driver_data.ipmi_devices, head) { &driver_data.ipmi_devices, head) {
if (ipmi_device->ipmi_ifnum != iface) { if (ipmi_device->ipmi_ifnum != iface) {
dev_found = true; dev_found = true;
__ipmi_dev_kill(ipmi_device); __ipmi_dev_kill(ipmi_device);
@ -496,14 +518,13 @@ static void ipmi_bmc_gone(int iface)
&driver_data.ipmi_devices, &driver_data.ipmi_devices,
struct acpi_ipmi_device, head); struct acpi_ipmi_device, head);
mutex_unlock(&driver_data.ipmi_lock); mutex_unlock(&driver_data.ipmi_lock);
if (dev_found) { if (dev_found) {
ipmi_flush_tx_msg(ipmi_device); ipmi_flush_tx_msg(ipmi_device);
acpi_ipmi_dev_put(ipmi_device); acpi_ipmi_dev_put(ipmi_device);
} }
} }
/* --------------------------------------------------------------------------
* Address Space Management
* -------------------------------------------------------------------------- */
/* /*
* This is the IPMI opregion space handler. * This is the IPMI opregion space handler.
* @function: indicates the read/write. In fact as the IPMI message is driven * @function: indicates the read/write. In fact as the IPMI message is driven
@ -516,17 +537,17 @@ static void ipmi_bmc_gone(int iface)
* the response IPMI message returned by IPMI command. * the response IPMI message returned by IPMI command.
* @handler_context: IPMI device context. * @handler_context: IPMI device context.
*/ */
static acpi_status static acpi_status
acpi_ipmi_space_handler(u32 function, acpi_physical_address address, acpi_ipmi_space_handler(u32 function, acpi_physical_address address,
u32 bits, acpi_integer *value, u32 bits, acpi_integer *value,
void *handler_context, void *region_context) void *handler_context, void *region_context)
{ {
struct acpi_ipmi_msg *tx_msg; struct acpi_ipmi_msg *tx_msg;
struct acpi_ipmi_device *ipmi_device; struct acpi_ipmi_device *ipmi_device;
int err; int err;
acpi_status status; acpi_status status;
unsigned long flags; unsigned long flags;
/* /*
* IPMI opregion message. * IPMI opregion message.
* IPMI message is firstly written to the BMC and system software * IPMI message is firstly written to the BMC and system software
@ -539,13 +560,13 @@ acpi_ipmi_space_handler(u32 function, acpi_physical_address address,
tx_msg = ipmi_msg_alloc(); tx_msg = ipmi_msg_alloc();
if (!tx_msg) if (!tx_msg)
return AE_NOT_EXIST; return AE_NOT_EXIST;
ipmi_device = tx_msg->device; ipmi_device = tx_msg->device;
if (acpi_format_ipmi_request(tx_msg, address, value) != 0) { if (acpi_format_ipmi_request(tx_msg, address, value) != 0) {
ipmi_msg_release(tx_msg); ipmi_msg_release(tx_msg);
return AE_TYPE; return AE_TYPE;
} }
acpi_ipmi_msg_get(tx_msg); acpi_ipmi_msg_get(tx_msg);
mutex_lock(&driver_data.ipmi_lock); mutex_lock(&driver_data.ipmi_lock);
/* Do not add a tx_msg that can not be flushed. */ /* Do not add a tx_msg that can not be flushed. */
@ -558,16 +579,18 @@ acpi_ipmi_space_handler(u32 function, acpi_physical_address address,
list_add_tail(&tx_msg->head, &ipmi_device->tx_msg_list); list_add_tail(&tx_msg->head, &ipmi_device->tx_msg_list);
spin_unlock_irqrestore(&ipmi_device->tx_msg_lock, flags); spin_unlock_irqrestore(&ipmi_device->tx_msg_lock, flags);
mutex_unlock(&driver_data.ipmi_lock); mutex_unlock(&driver_data.ipmi_lock);
err = ipmi_request_settime(ipmi_device->user_interface, err = ipmi_request_settime(ipmi_device->user_interface,
&tx_msg->addr, &tx_msg->addr,
tx_msg->tx_msgid, tx_msg->tx_msgid,
&tx_msg->tx_message, &tx_msg->tx_message,
NULL, 0, 0, IPMI_TIMEOUT); NULL, 0, 0, IPMI_TIMEOUT);
if (err) { if (err) {
status = AE_ERROR; status = AE_ERROR;
goto out_msg; goto out_msg;
} }
wait_for_completion(&tx_msg->tx_complete); wait_for_completion(&tx_msg->tx_complete);
acpi_format_ipmi_response(tx_msg, value); acpi_format_ipmi_response(tx_msg, value);
status = AE_OK; status = AE_OK;
@ -586,8 +609,9 @@ static int __init acpi_ipmi_init(void)
return 0; return 0;
status = acpi_install_address_space_handler(ACPI_ROOT_OBJECT, status = acpi_install_address_space_handler(ACPI_ROOT_OBJECT,
ACPI_ADR_SPACE_IPMI, &acpi_ipmi_space_handler, ACPI_ADR_SPACE_IPMI,
NULL, NULL); &acpi_ipmi_space_handler,
NULL, NULL);
if (ACPI_FAILURE(status)) { if (ACPI_FAILURE(status)) {
pr_warn("Can't register IPMI opregion space handle\n"); pr_warn("Can't register IPMI opregion space handle\n");
return -EINVAL; return -EINVAL;
@ -629,7 +653,8 @@ static void __exit acpi_ipmi_exit(void)
} }
mutex_unlock(&driver_data.ipmi_lock); mutex_unlock(&driver_data.ipmi_lock);
acpi_remove_address_space_handler(ACPI_ROOT_OBJECT, acpi_remove_address_space_handler(ACPI_ROOT_OBJECT,
ACPI_ADR_SPACE_IPMI, &acpi_ipmi_space_handler); ACPI_ADR_SPACE_IPMI,
&acpi_ipmi_space_handler);
} }
module_init(acpi_ipmi_init); module_init(acpi_ipmi_init);