From patchwork Wed Sep 15 08:06:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Zhao, Yakui" X-Patchwork-Id: 182002 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8F8BRVi027675 for ; Wed, 15 Sep 2010 08:11:29 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751559Ab0IOIL2 (ORCPT ); Wed, 15 Sep 2010 04:11:28 -0400 Received: from mga11.intel.com ([192.55.52.93]:62845 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751492Ab0IOIL0 (ORCPT ); Wed, 15 Sep 2010 04:11:26 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 15 Sep 2010 01:11:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.56,370,1280732400"; d="scan'208";a="607054466" Received: from yakui_zhao.sh.intel.com (HELO localhost.localdomain) ([10.239.36.65]) by fmsmga002.fm.intel.com with ESMTP; 15 Sep 2010 01:11:25 -0700 From: yakui.zhao@intel.com To: openipmi-developer@lists.sourceforge.net, linux-acpi@vger.kernel.org Cc: lenb@kernel.org, minyard@acm.org, Zhao Yakui Subject: [RFC PATCH 1/2_v9] IPMI: Add one interface to get more info of low-level IPMI device Date: Wed, 15 Sep 2010 16:06:19 +0800 Message-Id: <1284537980-10094-2-git-send-email-yakui.zhao@intel.com> X-Mailer: git-send-email 1.5.4.5 In-Reply-To: <1284537980-10094-1-git-send-email-yakui.zhao@intel.com> References: <1284537980-10094-1-git-send-email-yakui.zhao@intel.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Wed, 15 Sep 2010 08:11:29 +0000 (UTC) diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c index 4f3f8c9..f82d426 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c @@ -970,6 +970,32 @@ out_kfree: } EXPORT_SYMBOL(ipmi_create_user); +int ipmi_get_smi_info(int if_num, enum ipmi_addr_src type, + union ipmi_smi_data *data) +{ + int rv = 0; + ipmi_smi_t intf; + struct ipmi_smi_handlers *handlers; + + mutex_lock(&ipmi_interfaces_mutex); + list_for_each_entry_rcu(intf, &ipmi_interfaces, link) { + if (intf->intf_num == if_num) + goto found; + } + /* Not found, return an error */ + rv = -EINVAL; + mutex_unlock(&ipmi_interfaces_mutex); + return rv; + +found: + handlers = intf->handlers; + rv = handlers->get_smi_info(intf->send_info, type, data); + mutex_unlock(&ipmi_interfaces_mutex); + + return rv; +} +EXPORT_SYMBOL(ipmi_get_smi_info); + static void free_user(struct kref *ref) { ipmi_user_t user = container_of(ref, struct ipmi_user, refcount); diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index 3822b4f..ebb87b4 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c @@ -57,6 +57,7 @@ #include #include #include +#include #include #include #include "ipmi_si_sm.h" @@ -107,10 +108,6 @@ enum si_type { }; static char *si_to_str[] = { "kcs", "smic", "bt" }; -enum ipmi_addr_src { - SI_INVALID = 0, SI_HOTMOD, SI_HARDCODED, SI_SPMI, SI_ACPI, SI_SMBIOS, - SI_PCI, SI_DEVICETREE, SI_DEFAULT -}; static char *ipmi_addr_src_to_str[] = { NULL, "hotmod", "hardcoded", "SPMI", "ACPI", "SMBIOS", "PCI", "device-tree", "default" }; @@ -291,6 +288,7 @@ struct smi_info { struct task_struct *thread; struct list_head link; + union ipmi_smi_data smi_data; }; #define smi_inc_stat(smi, stat) \ @@ -1183,6 +1181,21 @@ static int smi_start_processing(void *send_info, return 0; } +static int get_smi_info(void *send_info, + enum ipmi_addr_src type, + union ipmi_smi_data *data) +{ + struct smi_info *new_smi = send_info; + union ipmi_smi_data *smi_data = &new_smi->smi_data; + + if (new_smi->addr_source != type) + return -EINVAL; + + memcpy(data, smi_data, sizeof(*smi_data)); + + return 0; +} + static void set_maintenance_mode(void *send_info, int enable) { struct smi_info *smi_info = send_info; @@ -1194,6 +1207,7 @@ static void set_maintenance_mode(void *send_info, int enable) static struct ipmi_smi_handlers handlers = { .owner = THIS_MODULE, .start_processing = smi_start_processing, + .get_smi_info = get_smi_info, .sender = sender, .request_events = request_events, .set_maintenance_mode = set_maintenance_mode, @@ -2140,6 +2154,8 @@ static int __devinit ipmi_pnp_probe(struct pnp_dev *dev, return -ENOMEM; info->addr_source = SI_ACPI; + info->smi_data.acpi_data.acpi_handle = acpi_dev->handle; + info->smi_data.acpi_data.dev = &dev->dev; printk(KERN_INFO PFX "probing via ACPI\n"); handle = acpi_dev->handle; diff --git a/include/linux/ipmi.h b/include/linux/ipmi.h index 65aae34..04e4a90 100644 --- a/include/linux/ipmi.h +++ b/include/linux/ipmi.h @@ -454,6 +454,22 @@ unsigned int ipmi_addr_length(int addr_type); /* Validate that the given IPMI address is valid. */ int ipmi_validate_addr(struct ipmi_addr *addr, int len); +enum ipmi_addr_src { + SI_INVALID = 0, SI_HOTMOD, SI_HARDCODED, SI_SPMI, SI_ACPI, SI_SMBIOS, + SI_PCI, SI_DEVICETREE, SI_DEFAULT +}; +union ipmi_smi_data{ + /* If the other type of data is required, please add it */ + u8 data[16]; + struct { + void *acpi_handle; + struct device *dev; + } acpi_data; +}; + +/* This is to get the private info of ipmi_smi_t */ +extern int ipmi_get_smi_info(int if_num, enum ipmi_addr_src type, + union ipmi_smi_data *data); #endif /* __KERNEL__ */ diff --git a/include/linux/ipmi_smi.h b/include/linux/ipmi_smi.h index 4b48318..d5bae83 100644 --- a/include/linux/ipmi_smi.h +++ b/include/linux/ipmi_smi.h @@ -86,6 +86,17 @@ struct ipmi_smi_handlers { int (*start_processing)(void *send_info, ipmi_smi_t new_intf); + /* + * Get the detailed private info of the low level interface and store + * it into the union structure of ipmi_smi_data. For example: the + * ACPI device handle will be returned for the pnp_acpi IPMI device. + * Of course it will firstly compare the interface type of low-level + * interface(Hardcoded type, DMI, ACPI and so on). If the type doesn't + * match, it will return -EINVAL. + */ + int (*get_smi_info)(void *send_info, enum ipmi_addr_src type, + union ipmi_smi_data *data); + /* Called to enqueue an SMI message to be sent. This operation is not allowed to fail. If an error occurs, it should report back the error in a received message. It may