1 files changed, 98 insertions, 80 deletions

diff --git a/drivers/s390/cio/chsc.c b/drivers/s390/cio/chsc.c
index 6f05a44e3817..bb6f876e53c2 100644
--- a/drivers/s390/cio/chsc.c
+++ b/drivers/s390/cio/chsc.c
@@ -20,43 +20,48 @@
 #include "cio.h"
 #include "cio_debug.h"
 #include "ioasm.h"
+#include "chpid.h"
 #include "chsc.h"
 
 static void *sei_page;
 
-static int new_channel_path(int chpid);
+static int new_channel_path(struct chp_id chpid);
 
-static inline void
-set_chp_logically_online(int chp, int onoff)
+static inline struct channel_path *chpid_to_chp(struct chp_id chpid)
 {
-        css[0]->chps[chp]->state = onoff;
+        return css[chpid.cssid]->chps[chpid.id];
 }
 
-static int
-get_chp_status(int chp)
+static void set_chp_logically_online(struct chp_id chpid, int onoff)
 {
-        return (css[0]->chps[chp] ? css[0]->chps[chp]->state : -ENODEV);
+        chpid_to_chp(chpid)->state = onoff;
 }
 
-void
-chsc_validate_chpids(struct subchannel *sch)
+static int get_chp_status(struct chp_id chpid)
+{
+        return (chpid_to_chp(chpid) ? chpid_to_chp(chpid)->state : -ENODEV);
+}
+
+void chsc_validate_chpids(struct subchannel *sch)
 {
         int mask, chp;
+        struct chp_id chpid;
 
+        chp_id_init(&chpid);
         for (chp = 0; chp <= 7; chp++) {
                 mask = 0x80 >> chp;
-                if (!get_chp_status(sch->schib.pmcw.chpid[chp]))
+                chpid.id = sch->schib.pmcw.chpid[chp];
+                if (!get_chp_status(chpid))
                         /* disable using this path */
                         sch->opm &= ~mask;
         }
 }
 
-void
-chpid_is_actually_online(int chp)
+void chpid_is_actually_online(struct chp_id chpid)
 {
         int state;
 
-        state = get_chp_status(chp);
+        state = get_chp_status(chpid);
         if (state < 0) {
                 need_rescan = 1;
                 queue_work(slow_path_wq, &slow_path_work);
@@ -200,11 +205,14 @@ css_get_ssd_info(struct subchannel *sch)
         spin_unlock_irq(sch->lock);
         free_page((unsigned long)page);
         if (!ret) {
-                int j, chpid, mask;
+                int j, mask;
+                struct chp_id chpid;
+
+                chp_id_init(&chpid);
                 /* Allocate channel path structures, if needed. */
                 for (j = 0; j < 8; j++) {
                         mask = 0x80 >> j;
-                        chpid = sch->ssd_info.chpid[j];
+                        chpid.id = sch->ssd_info.chpid[j];
                         if ((sch->schib.pmcw.pim & mask) &&
                             (get_chp_status(chpid) < 0))
                             new_channel_path(chpid);
@@ -227,7 +235,7 @@ s390_subchannel_remove_chpid(struct device *dev, void *data)
         for (j = 0; j < 8; j++) {
                 mask = 0x80 >> j;
                 if ((sch->schib.pmcw.pim & mask) &&
-                    (sch->schib.pmcw.chpid[j] == chpid->id))
+                    (sch->schib.pmcw.chpid[j] == chpid->chpid.id))
                         break;
         }
         if (j >= 8)
@@ -277,18 +285,17 @@ out_unreg:
         return 0;
 }
 
-static void
-s390_set_chpid_offline( __u8 chpid)
+static void s390_set_chpid_offline(struct chp_id chpid)
 {
         char dbf_txt[15];
         struct device *dev;
 
-        sprintf(dbf_txt, "chpr%x", chpid);
+        sprintf(dbf_txt, "chpr%x.%02x", chpid.cssid, chpid.id);
         CIO_TRACE_EVENT(2, dbf_txt);
 
         if (get_chp_status(chpid) <= 0)
                 return;
-        dev = get_device(&css[0]->chps[chpid]->dev);
+        dev = get_device(&(chpid_to_chp(chpid)->dev));
         bus_for_each_dev(&css_bus_type, NULL, to_channelpath(dev),
                          s390_subchannel_remove_chpid);
 
@@ -316,7 +323,7 @@ s390_process_res_acc_sch(struct res_acc_data *res_data, struct subchannel *sch)
                  * check if chpid is in information updated by ssd
                  */
                 if (sch->ssd_info.valid &&
-                    sch->ssd_info.chpid[chp] == res_data->chp->id &&
+                    sch->ssd_info.chpid[chp] == res_data->chp->chpid.id &&
                     (sch->ssd_info.fla[chp] & res_data->fla_mask)
                     == res_data->fla) {
                         found = 1;
@@ -409,7 +416,8 @@ s390_process_res_acc (struct res_acc_data *res_data)
         int rc;
         char dbf_txt[15];
 
-        sprintf(dbf_txt, "accpr%x", res_data->chp->id);
+        sprintf(dbf_txt, "accpr%x.%02x", res_data->chp->chpid.cssid,
+                res_data->chp->chpid.id);
         CIO_TRACE_EVENT( 2, dbf_txt);
         if (res_data->fla != 0) {
                 sprintf(dbf_txt, "fla%x", res_data->fla);
@@ -482,17 +490,21 @@ struct chsc_sei_area {
 
 static int chsc_process_sei_link_incident(struct chsc_sei_area *sei_area)
 {
-        int chpid;
+        struct chp_id chpid;
+        int id;
 
         CIO_CRW_EVENT(4, "chsc: link incident (rs=%02x, rs_id=%04x)\n",
                       sei_area->rs, sei_area->rsid);
         if (sei_area->rs != 4)
                 return 0;
-        chpid = __get_chpid_from_lir(sei_area->ccdf);
-        if (chpid < 0)
+        id = __get_chpid_from_lir(sei_area->ccdf);
+        if (id < 0)
                 CIO_CRW_EVENT(4, "chsc: link incident - invalid LIR\n");
-        else
+        else {
+                chp_id_init(&chpid);
+                chpid.id = id;
                 s390_set_chpid_offline(chpid);
+        }
 
         return 0;
 }
@@ -501,6 +513,7 @@ static int chsc_process_sei_res_acc(struct chsc_sei_area *sei_area)
 {
         struct res_acc_data res_data;
         struct device *dev;
+        struct chp_id chpid;
         int status;
         int rc;
 
@@ -508,13 +521,15 @@ static int chsc_process_sei_res_acc(struct chsc_sei_area *sei_area)
                       "rs_id=%04x)\n", sei_area->rs, sei_area->rsid);
         if (sei_area->rs != 4)
                 return 0;
+        chp_id_init(&chpid);
+        chpid.id = sei_area->rsid;
         /* allocate a new channel path structure, if needed */
-        status = get_chp_status(sei_area->rsid);
+        status = get_chp_status(chpid);
         if (status < 0)
-                new_channel_path(sei_area->rsid);
+                new_channel_path(chpid);
         else if (!status)
                 return 0;
-        dev = get_device(&css[0]->chps[sei_area->rsid]->dev);
+        dev = get_device(&(chpid_to_chp(chpid)->dev));
         memset(&res_data, 0, sizeof(struct res_acc_data));
         res_data.chp = to_channelpath(dev);
         if ((sei_area->vf & 0xc0) != 0) {
@@ -631,7 +646,7 @@ __chp_add(struct subchannel_id schid, void *data)
         for (i=0; i<8; i++) {
                 mask = 0x80 >> i;
                 if ((sch->schib.pmcw.pim & mask) &&
-                    (sch->schib.pmcw.chpid[i] == chp->id)) {
+                    (sch->schib.pmcw.chpid[i] == chp->chpid.id)) {
                         if (stsch(sch->schid, &sch->schib) != 0) {
                                 /* Endgame. */
                                 spin_unlock_irq(sch->lock);
@@ -657,8 +672,7 @@ __chp_add(struct subchannel_id schid, void *data)
         return 0;
 }
 
-static int
-chp_add(int chpid)
+static int chp_add(struct chp_id chpid)
 {
         int rc;
         char dbf_txt[15];
@@ -667,10 +681,10 @@ chp_add(int chpid)
         if (!get_chp_status(chpid))
                 return 0; /* no need to do the rest */
         
-        sprintf(dbf_txt, "cadd%x", chpid);
+        sprintf(dbf_txt, "cadd%x.%02x", chpid.cssid, chpid.id);
         CIO_TRACE_EVENT(2, dbf_txt);
 
-        dev = get_device(&css[0]->chps[chpid]->dev);
+        dev = get_device(&(chpid_to_chp(chpid)->dev));
         rc = for_each_subchannel(__chp_add, to_channelpath(dev));
         if (css_slow_subchannels_exist())
                 rc = -EAGAIN;
@@ -683,9 +697,12 @@ chp_add(int chpid)
 /* 
  * Handling of crw machine checks with channel path source.
  */
-int
-chp_process_crw(int chpid, int on)
+int chp_process_crw(int id, int on)
 {
+        struct chp_id chpid;
+
+        chp_id_init(&chpid);
+        chpid.id = id;
         if (on == 0) {
                 /* Path has gone. We use the link incident routine.*/
                 s390_set_chpid_offline(chpid);
@@ -733,8 +750,8 @@ static void terminate_internal_io(struct subchannel *sch)
                 sch->driver->termination(&sch->dev);
 }
 
-static void
-__s390_subchannel_vary_chpid(struct subchannel *sch, __u8 chpid, int on)
+static void __s390_subchannel_vary_chpid(struct subchannel *sch,
+                                         struct chp_id chpid, int on)
 {
         int chp, old_lpm;
         unsigned long flags;
@@ -745,7 +762,7 @@ __s390_subchannel_vary_chpid(struct subchannel *sch, __u8 chpid, int on)
         spin_lock_irqsave(sch->lock, flags);
         old_lpm = sch->lpm;
         for (chp = 0; chp < 8; chp++) {
-                if (sch->ssd_info.chpid[chp] != chpid)
+                if (sch->ssd_info.chpid[chp] != chpid.id)
                         continue;
 
                 if (on) {
@@ -780,11 +797,10 @@ __s390_subchannel_vary_chpid(struct subchannel *sch, __u8 chpid, int on)
         spin_unlock_irqrestore(sch->lock, flags);
 }
 
-static int
-s390_subchannel_vary_chpid_off(struct device *dev, void *data)
+static int s390_subchannel_vary_chpid_off(struct device *dev, void *data)
 {
         struct subchannel *sch;
-        __u8 *chpid;
+        struct chp_id *chpid;
 
         sch = to_subchannel(dev);
         chpid = data;
@@ -793,11 +809,10 @@ s390_subchannel_vary_chpid_off(struct device *dev, void *data)
         return 0;
 }
 
-static int
-s390_subchannel_vary_chpid_on(struct device *dev, void *data)
+static int s390_subchannel_vary_chpid_on(struct device *dev, void *data)
 {
         struct subchannel *sch;
-        __u8 *chpid;
+        struct chp_id *chpid;
 
         sch = to_subchannel(dev);
         chpid = data;
@@ -833,23 +848,25 @@ __s390_vary_chpid_on(struct subchannel_id schid, void *data)
  * Function: s390_vary_chpid
  * Varies the specified chpid online or offline
  */
-static int
-s390_vary_chpid( __u8 chpid, int on)
+static int s390_vary_chpid(struct chp_id chpid, int on)
 {
         char dbf_text[15];
         int status;
 
-        sprintf(dbf_text, on?"varyon%x":"varyoff%x", chpid);
+        sprintf(dbf_text, on?"varyon%x.%02x":"varyoff%x.%02x", chpid.cssid,
+                chpid.id);
         CIO_TRACE_EVENT( 2, dbf_text);
 
         status = get_chp_status(chpid);
         if (status < 0) {
-                printk(KERN_ERR "Can't vary unknown chpid %02X\n", chpid);
+                printk(KERN_ERR "Can't vary unknown chpid %x.%02x\n",
+                       chpid.cssid, chpid.id);
                 return -EINVAL;
         }
 
         if (!on && !status) {
-                printk(KERN_ERR "chpid %x is already offline\n", chpid);
+                printk(KERN_ERR "chpid %x.%02x is already offline\n",
+                       chpid.cssid, chpid.id);
                 return -EINVAL;
         }
 
@@ -904,20 +921,19 @@ static struct bin_attribute chp_measurement_chars_attr = {
         .read = chp_measurement_chars_read,
 };
 
-static void
-chp_measurement_copy_block(struct cmg_entry *buf,
-                           struct channel_subsystem *css, int chpid)
+static void chp_measurement_copy_block(struct cmg_entry *buf,
+                        struct channel_subsystem *css, struct chp_id chpid)
 {
         void *area;
         struct cmg_entry *entry, reference_buf;
         int idx;
 
-        if (chpid < 128) {
+        if (chpid.id < 128) {
                 area = css->cub_addr1;
-                idx = chpid;
+                idx = chpid.id;
         } else {
                 area = css->cub_addr2;
-                idx = chpid - 128;
+                idx = chpid.id - 128;
         }
         entry = area + (idx * sizeof(struct cmg_entry));
         do {
@@ -941,7 +957,7 @@ chp_measurement_read(struct kobject *kobj, char *buf, loff_t off, size_t count)
         /* Only allow single reads. */
         if (off || count < size)
                 return 0;
-        chp_measurement_copy_block((struct cmg_entry *)buf, css, chp->id);
+        chp_measurement_copy_block((struct cmg_entry *)buf, css, chp->chpid);
         count = size;
         return count;
 }
@@ -1137,7 +1153,7 @@ chp_status_show(struct device *dev, struct device_attribute *attr, char *buf)
 
         if (!chp)
                 return 0;
-        return (get_chp_status(chp->id) ? sprintf(buf, "online\n") :
+        return (get_chp_status(chp->chpid) ? sprintf(buf, "online\n") :
                 sprintf(buf, "offline\n"));
 }
 
@@ -1154,9 +1170,9 @@ chp_status_write(struct device *dev, struct device_attribute *attr, const char *
                 return count;
 
         if (!strnicmp(cmd, "on", 2))
-                error = s390_vary_chpid(cp->id, 1);
+                error = s390_vary_chpid(cp->chpid, 1);
         else if (!strnicmp(cmd, "off", 3))
-                error = s390_vary_chpid(cp->id, 0);
+                error = s390_vary_chpid(cp->chpid, 0);
         else
                 error = -EINVAL;
 
@@ -1227,9 +1243,8 @@ chp_release(struct device *dev)
         kfree(cp);
 }
 
-static int
-chsc_determine_channel_path_description(int chpid,
-                                        struct channel_path_desc *desc)
+static int chsc_determine_channel_path_description(struct chp_id chpid,
+                                                struct channel_path_desc *desc)
 {
         int ccode, ret;
 
@@ -1252,8 +1267,8 @@ chsc_determine_channel_path_description(int chpid,
         scpd_area->request.length = 0x0010;
         scpd_area->request.code = 0x0002;
 
-        scpd_area->first_chpid = chpid;
-        scpd_area->last_chpid = chpid;
+        scpd_area->first_chpid = chpid.id;
+        scpd_area->last_chpid = chpid.id;
 
         ccode = chsc(scpd_area);
         if (ccode > 0) {
@@ -1349,8 +1364,8 @@ chsc_get_channel_measurement_chars(struct channel_path *chp)
         scmc_area->request.length = 0x0010;
         scmc_area->request.code = 0x0022;
 
-        scmc_area->first_chpid = chp->id;
-        scmc_area->last_chpid = chp->id;
+        scmc_area->first_chpid = chp->chpid.id;
+        scmc_area->last_chpid = chp->chpid.id;
 
         ccode = chsc(scmc_area);
         if (ccode > 0) {
@@ -1396,8 +1411,7 @@ out:
  * Entries for chpids on the system bus.
  * This replaces /proc/chpids.
  */
-static int
-new_channel_path(int chpid)
+static int new_channel_path(struct chp_id chpid)
 {
         struct channel_path *chp;
         int ret;
@@ -1407,11 +1421,12 @@ new_channel_path(int chpid)
                 return -ENOMEM;
 
         /* fill in status, etc. */
-        chp->id = chpid;
+        chp->chpid = chpid;
         chp->state = 1;
-        chp->dev.parent = &css[0]->device;
+        chp->dev.parent = &css[chpid.cssid]->device;
         chp->dev.release = chp_release;
-        snprintf(chp->dev.bus_id, BUS_ID_SIZE, "chp0.%x", chpid);
+        snprintf(chp->dev.bus_id, BUS_ID_SIZE, "chp%x.%02x", chpid.cssid,
+                 chpid.id);
 
         /* Obtain channel path description and fill it in. */
         ret = chsc_determine_channel_path_description(chpid, &chp->desc);
@@ -1437,8 +1452,8 @@ new_channel_path(int chpid)
         /* make it known to the system */
         ret = device_register(&chp->dev);
         if (ret) {
-                printk(KERN_WARNING "%s: could not register %02x\n",
-                       __func__, chpid);
+                printk(KERN_WARNING "%s: could not register %x.%02x\n",
+                       __func__, chpid.cssid, chpid.id);
                 goto out_free;
         }
         ret = sysfs_create_group(&chp->dev.kobj, &chp_attr_group);
@@ -1446,18 +1461,18 @@ new_channel_path(int chpid)
                 device_unregister(&chp->dev);
                 goto out_free;
         }
-        mutex_lock(&css[0]->mutex);
-        if (css[0]->cm_enabled) {
+        mutex_lock(&css[chpid.cssid]->mutex);
+        if (css[chpid.cssid]->cm_enabled) {
                 ret = chsc_add_chp_cmg_attr(chp);
                 if (ret) {
                         sysfs_remove_group(&chp->dev.kobj, &chp_attr_group);
                         device_unregister(&chp->dev);
-                        mutex_unlock(&css[0]->mutex);
+                        mutex_unlock(&css[chpid.cssid]->mutex);
                         goto out_free;
                 }
         }
-        css[0]->chps[chpid] = chp;
-        mutex_unlock(&css[0]->mutex);
+        css[chpid.cssid]->chps[chpid.id] = chp;
+        mutex_unlock(&css[chpid.cssid]->mutex);
         return ret;
 out_free:
         kfree(chp);
@@ -1469,8 +1484,11 @@ chsc_get_chp_desc(struct subchannel *sch, int chp_no)
 {
         struct channel_path *chp;
         struct channel_path_desc *desc;
+        struct chp_id chpid;
 
-        chp = css[0]->chps[sch->schib.pmcw.chpid[chp_no]];
+        chp_id_init(&chpid);
+        chpid.id = sch->schib.pmcw.chpid[chp_no];
+        chp = chpid_to_chp(chpid);
         if (!chp)
                 return NULL;
         desc = kmalloc(sizeof(struct channel_path_desc), GFP_KERNEL);