ibft: convert iscsi_ibft module to iscsi boot lib

This patch just converts the iscsi_ibft module to the
iscsi boot sysfs lib module.

Signed-off-by: Mike Christie <michaelc@cs.wisc.edu>
Signed-off-by: Konrad Rzeszutek Wilk <konrad@kernel.org>
Signed-off-by: Peter Jones <pjones@redhat.com>

2 files changed, 248 insertions, 451 deletions

diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index 571d2182613d..a6c670b8ce52 100644
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -132,6 +132,7 @@ config ISCSI_BOOT_SYSFS
 
 config ISCSI_IBFT
         tristate "iSCSI Boot Firmware Table Attributes module"
+        select ISCSI_BOOT_SYSFS
         depends on ISCSI_IBFT_FIND
         default n
         help
diff --git a/drivers/firmware/iscsi_ibft.c b/drivers/firmware/iscsi_ibft.c
index b3ab24f9d78f..4f04ec0410a0 100644
--- a/drivers/firmware/iscsi_ibft.c
+++ b/drivers/firmware/iscsi_ibft.c
@@ -82,6 +82,7 @@
 #include <linux/string.h>
 #include <linux/types.h>
 #include <linux/acpi.h>
+#include <linux/iscsi_boot_sysfs.h>
 
 #define IBFT_ISCSI_VERSION "0.5.0"
 #define IBFT_ISCSI_DATE "2010-Feb-25"
@@ -170,74 +171,6 @@ enum ibft_id {
 };
 
 /*
- * We do not support the other types, hence the usage of NULL.
- * This maps to the enum ibft_id.
- */
-static const char *ibft_id_names[] =
-        {NULL, NULL, "initiator", "ethernet%d", "target%d", NULL, NULL};
-
-/*
- * The text attributes names for each of the kobjects.
-*/
-enum ibft_eth_properties_enum {
-        ibft_eth_index,
-        ibft_eth_flags,
-        ibft_eth_ip_addr,
-        ibft_eth_subnet_mask,
-        ibft_eth_origin,
-        ibft_eth_gateway,
-        ibft_eth_primary_dns,
-        ibft_eth_secondary_dns,
-        ibft_eth_dhcp,
-        ibft_eth_vlan,
-        ibft_eth_mac,
-        /* ibft_eth_pci_bdf - this is replaced by link to the device itself. */
-        ibft_eth_hostname,
-        ibft_eth_end_marker,
-};
-
-static const char *ibft_eth_properties[] =
-        {"index", "flags", "ip-addr", "subnet-mask", "origin", "gateway",
-        "primary-dns", "secondary-dns", "dhcp", "vlan", "mac", "hostname",
-        NULL};
-
-enum ibft_tgt_properties_enum {
-        ibft_tgt_index,
-        ibft_tgt_flags,
-        ibft_tgt_ip_addr,
-        ibft_tgt_port,
-        ibft_tgt_lun,
-        ibft_tgt_chap_type,
-        ibft_tgt_nic_assoc,
-        ibft_tgt_name,
-        ibft_tgt_chap_name,
-        ibft_tgt_chap_secret,
-        ibft_tgt_rev_chap_name,
-        ibft_tgt_rev_chap_secret,
-        ibft_tgt_end_marker,
-};
-
-static const char *ibft_tgt_properties[] =
-        {"index", "flags", "ip-addr", "port", "lun", "chap-type", "nic-assoc",
-        "target-name", "chap-name", "chap-secret", "rev-chap-name",
-        "rev-chap-name-secret", NULL};
-
-enum ibft_initiator_properties_enum {
-        ibft_init_index,
-        ibft_init_flags,
-        ibft_init_isns_server,
-        ibft_init_slp_server,
-        ibft_init_pri_radius_server,
-        ibft_init_sec_radius_server,
-        ibft_init_initiator_name,
-        ibft_init_end_marker,
-};
-
-static const char *ibft_initiator_properties[] =
-        {"index", "flags", "isns-server", "slp-server", "pri-radius-server",
-        "sec-radius-server", "initiator-name", NULL};
-
-/*
  * The kobject and attribute structures.
  */
 
@@ -249,29 +182,9 @@ struct ibft_kobject {
                 struct ibft_tgt *tgt;
                 struct ibft_hdr *hdr;
         };
-        struct kobject kobj;
-        struct list_head node;
 };
 
-struct ibft_attribute {
-        struct attribute attr;
-        ssize_t (*show) (struct  ibft_kobject *entry,
-                         struct ibft_attribute *attr, char *buf);
-        union {
-                struct ibft_initiator *initiator;
-                struct ibft_nic *nic;
-                struct ibft_tgt *tgt;
-                struct ibft_hdr *hdr;
-        };
-        struct kobject *kobj;
-        int type; /* The enum of the type. This can be any value of:
-                ibft_eth_properties_enum, ibft_tgt_properties_enum,
-                or ibft_initiator_properties_enum. */
-        struct list_head node;
-};
-
-static LIST_HEAD(ibft_attr_list);
-static LIST_HEAD(ibft_kobject_list);
+static struct iscsi_boot_kset *boot_kset;
 
 static const char nulls[16];
 
@@ -310,35 +223,27 @@ static ssize_t sprintf_string(char *str, int len, char *buf)
 static int ibft_verify_hdr(char *t, struct ibft_hdr *hdr, int id, int length)
 {
         if (hdr->id != id) {
-                printk(KERN_ERR "iBFT error: We expected the " \
+                printk(KERN_ERR "iBFT error: We expected the %s " \
                                 "field header.id to have %d but " \
-                                "found %d instead!\n", id, hdr->id);
+                                "found %d instead!\n", t, id, hdr->id);
                 return -ENODEV;
         }
         if (hdr->length != length) {
-                printk(KERN_ERR "iBFT error: We expected the " \
+                printk(KERN_ERR "iBFT error: We expected the %s " \
                                 "field header.length to have %d but " \
-                                "found %d instead!\n", length, hdr->length);
+                                "found %d instead!\n", t, length, hdr->length);
                 return -ENODEV;
         }
 
         return 0;
 }
 
-static void ibft_release(struct kobject *kobj)
-{
-        struct ibft_kobject *ibft =
-                container_of(kobj, struct ibft_kobject, kobj);
-        kfree(ibft);
-}
-
 /*
  *  Routines for parsing the iBFT data to be human readable.
  */
-static ssize_t ibft_attr_show_initiator(struct ibft_kobject *entry,
-                                        struct ibft_attribute *attr,
-                                        char *buf)
+static ssize_t ibft_attr_show_initiator(void *data, int type, char *buf)
 {
+        struct ibft_kobject *entry = data;
         struct ibft_initiator *initiator = entry->initiator;
         void *ibft_loc = entry->header;
         char *str = buf;
@@ -346,26 +251,26 @@ static ssize_t ibft_attr_show_initiator(struct ibft_kobject *entry,
         if (!initiator)
                 return 0;