This patch adds support for of_platform_driver to the ipmi_si module.
When loading the module, the driver will be registered to of_platform.
The driver will be probed for all devices with the type ipmi. It's supporting
devices with compatible settings ipmi-kcs, ipmi-smic and ipmi-bt.
Only ipmi-kcs could be tested.
Signed-off-by: Christian Krafft <[EMAIL PROTECTED]>
Index: linux-2.6.19-rc6/drivers/char/ipmi/ipmi_si_intf.c
===================================================================
--- linux-2.6.19-rc6.orig/drivers/char/ipmi/ipmi_si_intf.c
+++ linux-2.6.19-rc6/drivers/char/ipmi/ipmi_si_intf.c
@@ -9,6 +9,7 @@
* [EMAIL PROTECTED]
*
* Copyright 2002 MontaVista Software Inc.
+ * Copyright 2006 IBM Corp., Christian Krafft <[EMAIL PROTECTED]>
*
* 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
@@ -62,6 +63,12 @@
#include <linux/init.h>
#include <linux/dmi.h>
+/* only exists on powerpc */
+#ifdef CONFIG_PPC_OF
+#include <asm/of_device.h>
+#include <asm/of_platform.h>
+#endif
+
/* Measure times between events in the driver. */
#undef DEBUG_TIMING
@@ -1884,6 +1891,90 @@ static struct pci_driver ipmi_pci_driver
#endif /* CONFIG_PCI */
+#ifdef CONFIG_PPC_OF
+static int ipmi_of_probe(struct of_device *dev, const struct of_device_id
*match)
+{
+ struct smi_info *info;
+ struct resource resource0, resource1;
+ struct device_node *np = dev->node;
+ int ret;
+
+ dev_info(&dev->dev, "probing via device tree\n");
+
+ if (match->data) {
+ dev_warn(&dev->dev, "unknown interface type\n");
+ return -ENODEV;
+ }
+
+ ret = of_address_to_resource(np, 0, &resource0);
+
+ if (ret) {
+ dev_warn(&dev->dev, "invalid address\n");
+ return ret;
+ }
+
+ ret = of_address_to_resource(np, 1, &resource1);
+
+ if (ret) {
+ dev_warn(&dev->dev, "invalid address\n");
+ return ret;
+ }
+
+ info = kzalloc(sizeof(*info), GFP_KERNEL);
+
+ if (!info) {
+ dev_err(&dev->dev, "could not allocate memory\n");
+ return -ENOMEM;
+ }
+
+ info->si_type = (enum si_type) match->data;
+ info->addr_source = "device-tree";
+ info->io_setup = mem_setup;
+ info->irq_setup = std_irq_setup;
+
+ info->io.addr_type = IPMI_MEM_ADDR_SPACE;
+ info->io.addr_data = resource0.start;
+ info->io.regsize = resource0.end - resource0.start + 1;
+ info->io.regspacing = resource1.start - resource0.start;
+ info->io.regshift = 0; /* regshift property if needed */
+ info->irq = irq_of_parse_and_map(dev->node, 0);
+ info->dev = &dev->dev;
+
+ dev_dbg(&dev->dev, "addr 0x%lx regsize %ld spacing %ld irq %x\n",
+ info->io.addr_data, info->io.regsize, info->io.regspacing,
+ info->irq);
+
+ return try_smi_init(info);
+}
+
+static int ipmi_of_remove(struct of_device *dev)
+{
+ return 0;
+}
+
+static struct of_device_id ipmi_match[] =
+{
+ { .type = "ipmi", .compatible = "ipmi-kcs", .data =
(void*)SI_KCS },
+ { .type = "ipmi", .compatible = "ipmi-smic", .data =
(void*)SI_SMIC },
+ { .type = "ipmi", .compatible = "ipmi-bt", .data =
(void*)SI_BT },
+ {},
+};
+
+static struct of_platform_driver ipmi_of_platform_driver =
+{
+ .name = "ipmi",
+ .match_table = ipmi_match,
+ .probe = ipmi_of_probe,
+ .remove = ipmi_of_remove
+};
+
+static void __devinit of_find_bmc(void)
+{
+ of_register_platform_driver(&ipmi_of_platform_driver);
+}
+#endif /* CONFIG_PM_OF */
+
+
static int try_get_dev_id(struct smi_info *smi_info)
{
unsigned char msg[2];
@@ -2486,6 +2577,10 @@ static __devinit int init_ipmi_si(void)
pci_module_init(&ipmi_pci_driver);
#endif
+#ifdef CONFIG_PPC_OF
+ of_find_bmc();
+#endif
+
if (si_trydefaults) {
mutex_lock(&smi_infos_lock);
if (list_empty(&smi_infos)) {
@@ -2583,6 +2678,10 @@ static __exit void cleanup_ipmi_si(void)
pci_unregister_driver(&ipmi_pci_driver);
#endif
+#ifdef CONFIG_OF_PPC
+ of_unregister_platform_driver(&ipmi_of_platform_driver);
+#endif
+
mutex_lock(&smi_infos_lock);
list_for_each_entry_safe(e, tmp_e, &smi_infos, link)
cleanup_one_si(e);
--
Mit freundlichen Grüssen,
kind regards,
Christian Krafft
IBM Systems & Technology Group,
Linux Kernel Development
IT Specialist
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Openipmi-developer mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openipmi-developer
