s390/ism: Consolidate SMC-D-related code

The ism module had SMC-D-specific code sprinkled across the entire module.
We are now consolidating the SMC-D-specific parts into the latter parts
of the module, so it becomes more clear what code is intended for use with
ISM, and which parts are glue code for usage in the context of SMC-D.
This is the fourth part of a bigger overhaul of the interfaces between SMC
and ISM.

Signed-off-by: Stefan Raspl <raspl@linux.ibm.com>
Signed-off-by: Jan Karcher <jaka@linux.ibm.com>
Signed-off-by: Wenjia Zhang <wenjia@linux.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/s390/net/ism_drv.c b/drivers/s390/net/ism_drv.c
index e6c810a96b242fbf065e93c279fe1f734785e39f..73c8f42a22a7d6e9da973d075796198bd2094139 100644 (file)
--- a/drivers/s390/net/ism_drv.c
+++ b/drivers/s390/net/ism_drv.c
@@ -289,11 +289,6 @@ static int ism_query_rgid(struct ism_dev *ism, u64 rgid, u32 vid_valid,
        return ism_cmd(ism, &cmd);
 }
 
-static int smcd_query_rgid(struct smcd_dev *smcd, u64 rgid, u32 vid_valid, u32 vid)
-{
-       return ism_query_rgid(smcd->priv, rgid, vid_valid, vid);
-}
-
 static void ism_free_dmb(struct ism_dev *ism, struct ism_dmb *dmb)
 {
        clear_bit(dmb->sba_idx, ism->sba_bitmap);
@@ -363,11 +358,6 @@ out:
 }
 EXPORT_SYMBOL_GPL(ism_register_dmb);
 
-static int smcd_register_dmb(struct smcd_dev *smcd, struct smcd_dmb *dmb)
-{
-       return ism_register_dmb(smcd->priv, (struct ism_dmb *)dmb, NULL);
-}
-
 int ism_unregister_dmb(struct ism_dev *ism, struct ism_dmb *dmb)
 {
        union ism_unreg_dmb cmd;
@@ -391,11 +381,6 @@ out:
 }
 EXPORT_SYMBOL_GPL(ism_unregister_dmb);
 
-static int smcd_unregister_dmb(struct smcd_dev *smcd, struct smcd_dmb *dmb)
-{
-       return ism_unregister_dmb(smcd->priv, (struct ism_dmb *)dmb);
-}
-
 static int ism_add_vlan_id(struct ism_dev *ism, u64 vlan_id)
 {
        union ism_set_vlan_id cmd;
@@ -409,11 +394,6 @@ static int ism_add_vlan_id(struct ism_dev *ism, u64 vlan_id)
        return ism_cmd(ism, &cmd);
 }
 
-static int smcd_add_vlan_id(struct smcd_dev *smcd, u64 vlan_id)
-{
-       return ism_add_vlan_id(smcd->priv, vlan_id);
-}
-
 static int ism_del_vlan_id(struct ism_dev *ism, u64 vlan_id)
 {
        union ism_set_vlan_id cmd;
@@ -427,25 +407,9 @@ static int ism_del_vlan_id(struct ism_dev *ism, u64 vlan_id)
        return ism_cmd(ism, &cmd);
 }
 
-static int smcd_del_vlan_id(struct smcd_dev *smcd, u64 vlan_id)
-{
-       return ism_del_vlan_id(smcd->priv, vlan_id);
-}
-
-static int ism_set_vlan_required(struct smcd_dev *smcd)
+static int ism_signal_ieq(struct ism_dev *ism, u64 rgid, u32 trigger_irq,
+                         u32 event_code, u64 info)
 {
-       return ism_cmd_simple(smcd->priv, ISM_SET_VLAN);
-}
-
-static int ism_reset_vlan_required(struct smcd_dev *smcd)
-{
-       return ism_cmd_simple(smcd->priv, ISM_RESET_VLAN);
-}
-
-static int smcd_signal_ieq(struct smcd_dev *smcd, u64 rgid, u32 trigger_irq,
-                          u32 event_code, u64 info)
-{
-       struct ism_dev *ism = smcd->priv;
        union ism_sig_ieq cmd;
 
        memset(&cmd, 0, sizeof(cmd));
@@ -466,11 +430,9 @@ static unsigned int max_bytes(unsigned int start, unsigned int len,
        return min(boundary - (start & (boundary - 1)), len);
 }
 
-static int smcd_move(struct smcd_dev *smcd, u64 dmb_tok, unsigned int idx,
-                    bool sf, unsigned int offset, void *data,
-                    unsigned int size)
+int ism_move(struct ism_dev *ism, u64 dmb_tok, unsigned int idx, bool sf,
+            unsigned int offset, void *data, unsigned int size)
 {
-       struct ism_dev *ism = smcd->priv;
        unsigned int bytes;
        u64 dmb_req;
        int ret;
@@ -491,6 +453,7 @@ static int smcd_move(struct smcd_dev *smcd, u64 dmb_tok, unsigned int idx,
 
        return 0;
 }
+EXPORT_SYMBOL_GPL(ism_move);
 
 static struct ism_systemeid SYSTEM_EID = {
        .seid_string = "IBM-SYSZ-ISMSEID00000000",
@@ -518,10 +481,8 @@ u8 *ism_get_seid(void)
 }
 EXPORT_SYMBOL_GPL(ism_get_seid);
 
-static u16 smcd_get_chid(struct smcd_dev *smcd)
+static u16 ism_get_chid(struct ism_dev *ism)
 {
-       struct ism_dev *ism = smcd->priv;
-
        if (!ism || !ism->pdev)
                return 0;
 
@@ -583,28 +544,11 @@ static irqreturn_t ism_handle_irq(int irq, void *data)
        return IRQ_HANDLED;
 }
 
-static u64 smcd_get_local_gid(struct smcd_dev *smcd)
+static u64 ism_get_local_gid(struct ism_dev *ism)
 {
-       struct ism_dev *ism = smcd->priv;
-
        return ism->local_gid;
 }
 
-static const struct smcd_ops ism_ops = {
-       .query_remote_gid = smcd_query_rgid,
-       .register_dmb = smcd_register_dmb,
-       .unregister_dmb = smcd_unregister_dmb,
-       .add_vlan_id = smcd_add_vlan_id,
-       .del_vlan_id = smcd_del_vlan_id,
-       .set_vlan_required = ism_set_vlan_required,
-       .reset_vlan_required = ism_reset_vlan_required,
-       .signal_event = smcd_signal_ieq,
-       .move_data = smcd_move,
-       .get_system_eid = ism_get_seid,
-       .get_local_gid = smcd_get_local_gid,
-       .get_chid = smcd_get_chid,
-};
-
 static void ism_dev_add_work_func(struct work_struct *work)
 {
        struct ism_client *client = container_of(work, struct ism_client,
@@ -846,3 +790,95 @@ static void __exit ism_exit(void)
 
 module_init(ism_init);
 module_exit(ism_exit);
+
+/*************************** SMC-D Implementation *****************************/
+
+#if IS_ENABLED(CONFIG_SMC)
+static int smcd_query_rgid(struct smcd_dev *smcd, u64 rgid, u32 vid_valid,
+                          u32 vid)
+{
+       return ism_query_rgid(smcd->priv, rgid, vid_valid, vid);
+}
+
+static int smcd_register_dmb(struct smcd_dev *smcd, struct smcd_dmb *dmb,
+                            struct ism_client *client)
+{
+       return ism_register_dmb(smcd->priv, (struct ism_dmb *)dmb, client);
+}
+
+static int smcd_unregister_dmb(struct smcd_dev *smcd, struct smcd_dmb *dmb)
+{
+       return ism_unregister_dmb(smcd->priv, (struct ism_dmb *)dmb);
+}
+
+static int smcd_add_vlan_id(struct smcd_dev *smcd, u64 vlan_id)
+{
+       return ism_add_vlan_id(smcd->priv, vlan_id);
+}
+
+static int smcd_del_vlan_id(struct smcd_dev *smcd, u64 vlan_id)
+{
+       return ism_del_vlan_id(smcd->priv, vlan_id);
+}
+
+static int smcd_set_vlan_required(struct smcd_dev *smcd)
+{
+       return ism_cmd_simple(smcd->priv, ISM_SET_VLAN);
+}
+
+static int smcd_reset_vlan_required(struct smcd_dev *smcd)
+{
+       return ism_cmd_simple(smcd->priv, ISM_RESET_VLAN);
+}
+
+static int smcd_signal_ieq(struct smcd_dev *smcd, u64 rgid, u32 trigger_irq,
+                          u32 event_code, u64 info)
+{
+       return ism_signal_ieq(smcd->priv, rgid, trigger_irq, event_code, info);
+}
+
+static int smcd_move(struct smcd_dev *smcd, u64 dmb_tok, unsigned int idx,
+                    bool sf, unsigned int offset, void *data,
+                    unsigned int size)
+{
+       return ism_move(smcd->priv, dmb_tok, idx, sf, offset, data, size);
+}
+
+static u64 smcd_get_local_gid(struct smcd_dev *smcd)
+{
+       return ism_get_local_gid(smcd->priv);
+}
+
+static u16 smcd_get_chid(struct smcd_dev *smcd)
+{
+       return ism_get_chid(smcd->priv);
+}
+
+static inline struct device *smcd_get_dev(struct smcd_dev *dev)
+{
+       struct ism_dev *ism = dev->priv;
+
+       return &ism->dev;
+}
+
+static const struct smcd_ops ism_ops = {
+       .query_remote_gid = smcd_query_rgid,
+       .register_dmb = smcd_register_dmb,
+       .unregister_dmb = smcd_unregister_dmb,
+       .add_vlan_id = smcd_add_vlan_id,
+       .del_vlan_id = smcd_del_vlan_id,
+       .set_vlan_required = smcd_set_vlan_required,
+       .reset_vlan_required = smcd_reset_vlan_required,
+       .signal_event = smcd_signal_ieq,
+       .move_data = smcd_move,
+       .get_system_eid = ism_get_seid,
+       .get_local_gid = smcd_get_local_gid,
+       .get_chid = smcd_get_chid,
+};
+
+const struct smcd_ops *ism_get_smcd_ops(void)
+{
+       return &ism_ops;
+}
+EXPORT_SYMBOL_GPL(ism_get_smcd_ops);
+#endif

diff --git a/include/linux/ism.h b/include/linux/ism.h
index bdd29e08d4fe2c2f228d5eb4f9981dbf9f49d4dd..104ce2fd503ab263d42899e4df0254c43cd52977 100644 (file)
--- a/include/linux/ism.h
+++ b/include/linux/ism.h
@@ -94,4 +94,6 @@ int  ism_move(struct ism_dev *dev, u64 dmb_tok, unsigned int idx, bool sf,
              unsigned int offset, void *data, unsigned int size);
 u8  *ism_get_seid(void);
 
+const struct smcd_ops *ism_get_smcd_ops(void);
+
 #endif /* _ISM_H */

diff --git a/include/net/smc.h b/include/net/smc.h
index d5f8f18169d7135a9645d6c77a1b9da30b068499..556b96c12279b0584f56d73c97b04e3df1b55c38 100644 (file)
--- a/include/net/smc.h
+++ b/include/net/smc.h
@@ -50,11 +50,13 @@ struct smcd_dmb {
 #define ISM_ERROR      0xFFFF
 
 struct smcd_dev;
+struct ism_client;
 
 struct smcd_ops {
        int (*query_remote_gid)(struct smcd_dev *dev, u64 rgid, u32 vid_valid,
                                u32 vid);
-       int (*register_dmb)(struct smcd_dev *dev, struct smcd_dmb *dmb);
+       int (*register_dmb)(struct smcd_dev *dev, struct smcd_dmb *dmb,
+                           struct ism_client *client);
        int (*unregister_dmb)(struct smcd_dev *dev, struct smcd_dmb *dmb);
        int (*add_vlan_id)(struct smcd_dev *dev, u64 vlan_id);
        int (*del_vlan_id)(struct smcd_dev *dev, u64 vlan_id);
@@ -73,7 +75,6 @@ struct smcd_ops {
 struct smcd_dev {
        const struct smcd_ops *ops;
        struct device dev;
-       struct ism_dev *ism;
        void *priv;
        struct list_head list;
        spinlock_t lock;

diff --git a/net/smc/smc_ism.c b/net/smc/smc_ism.c
index 6d31e9bbc5f907de9fbe4c4dac8e25a96be21e79..6196b305df44464e6862cbe1ceac594cc674af2a 100644 (file)
--- a/net/smc/smc_ism.c
+++ b/net/smc/smc_ism.c
@@ -27,6 +27,7 @@ struct smcd_dev_list smcd_dev_list = {
 static bool smc_ism_v2_capable;
 static u8 smc_ism_v2_system_eid[SMC_MAX_EID_LEN];
 
+#if IS_ENABLED(CONFIG_ISM)
 static void smcd_register_dev(struct ism_dev *ism);
 static void smcd_unregister_dev(struct ism_dev *ism);
 static void smcd_handle_event(struct ism_dev *ism, struct ism_event *event);
@@ -40,6 +41,7 @@ static struct ism_client smc_ism_client = {
        .handle_event = smcd_handle_event,
        .handle_irq = smcd_handle_irq,
 };
+#endif
 
 /* Test if an ISM communication is possible - same CPC */
 int smc_ism_cantalk(u64 peer_gid, unsigned short vlan_id, struct smcd_dev *smcd)
@@ -198,6 +200,7 @@ int smc_ism_unregister_dmb(struct smcd_dev *smcd, struct smc_buf_desc *dmb_desc)
 int smc_ism_register_dmb(struct smc_link_group *lgr, int dmb_len,
                         struct smc_buf_desc *dmb_desc)
 {
+#if IS_ENABLED(CONFIG_ISM)
        struct smcd_dmb dmb;
        int rc;
 
@@ -206,7 +209,7 @@ int smc_ism_register_dmb(struct smc_link_group *lgr, int dmb_len,
        dmb.sba_idx = dmb_desc->sba_idx;
        dmb.vlan_id = lgr->vlan_id;
        dmb.rgid = lgr->peer_gid;
-       rc = lgr->smcd->ops->register_dmb(lgr->smcd, &dmb);
+       rc = lgr->smcd->ops->register_dmb(lgr->smcd, &dmb, &smc_ism_client);
        if (!rc) {
                dmb_desc->sba_idx = dmb.sba_idx;
                dmb_desc->token = dmb.dmb_tok;
@@ -215,6 +218,9 @@ int smc_ism_register_dmb(struct smc_link_group *lgr, int dmb_len,
                dmb_desc->len = dmb.dmb_len;
        }
        return rc;
+#else
+       return 0;
+#endif
 }
 
 static int smc_nl_handle_smcd_dev(struct smcd_dev *smcd,
@@ -308,6 +314,7 @@ int smcd_nl_get_device(struct sk_buff *skb, struct netlink_callback *cb)
        return skb->len;
 }
 
+#if IS_ENABLED(CONFIG_ISM)
 struct smc_ism_event_work {
        struct work_struct work;
        struct smcd_dev *smcd;
@@ -351,24 +358,6 @@ static void smcd_handle_sw_event(struct smc_ism_event_work *wrk)
        }
 }
 
-int smc_ism_signal_shutdown(struct smc_link_group *lgr)
-{
-       int rc;
-       union smcd_sw_event_info ev_info;
-
-       if (lgr->peer_shutdown)
-               return 0;
-
-       memcpy(ev_info.uid, lgr->id, SMC_LGR_ID_SIZE);
-       ev_info.vlan_id = lgr->vlan_id;
-       ev_info.code = ISM_EVENT_REQUEST;
-       rc = lgr->smcd->ops->signal_event(lgr->smcd, lgr->peer_gid,
-                                         ISM_EVENT_REQUEST_IR,
-                                         ISM_EVENT_CODE_SHUTDOWN,
-                                         ev_info.info);
-       return rc;
-}
-
 /* worker for SMC-D events */
 static void smc_ism_event_work(struct work_struct *work)
 {
@@ -442,9 +431,12 @@ EXPORT_SYMBOL_GPL(smcd_free_dev);
 
 static void smcd_register_dev(struct ism_dev *ism)
 {
-       const struct smcd_ops *ops = NULL;
+       const struct smcd_ops *ops = ism_get_smcd_ops();
        struct smcd_dev *smcd;
 
+       if (!ops)
+               return;
+
        smcd = smcd_alloc_dev(&ism->pdev->dev, dev_name(&ism->pdev->dev), ops,
                              ISM_NR_DMBS);
        if (!smcd)
@@ -550,16 +542,39 @@ static void smcd_handle_irq(struct ism_dev *ism, unsigned int dmbno,
                tasklet_schedule(&conn->rx_tsklet);
        spin_unlock_irqrestore(&smcd->lock, flags);
 }
+#endif
+
+int smc_ism_signal_shutdown(struct smc_link_group *lgr)
+{
+       int rc = 0;
+#if IS_ENABLED(CONFIG_ISM)
+       union smcd_sw_event_info ev_info;
+
+       if (lgr->peer_shutdown)
+               return 0;
+
+       memcpy(ev_info.uid, lgr->id, SMC_LGR_ID_SIZE);
+       ev_info.vlan_id = lgr->vlan_id;
+       ev_info.code = ISM_EVENT_REQUEST;
+       rc = lgr->smcd->ops->signal_event(lgr->smcd, lgr->peer_gid,
+                                         ISM_EVENT_REQUEST_IR,
+                                         ISM_EVENT_CODE_SHUTDOWN,
+                                         ev_info.info);
+#endif
+       return rc;
+}
 
 int smc_ism_init(void)
 {
+       int rc = 0;
+
+#if IS_ENABLED(CONFIG_ISM)
        smc_ism_v2_capable = false;
        memset(smc_ism_v2_system_eid, 0, SMC_MAX_EID_LEN);
-#if IS_ENABLED(CONFIG_ISM)
-       return ism_register_client(&smc_ism_client);
-#else
-       return 0;
+
+       rc = ism_register_client(&smc_ism_client);
 #endif
+       return rc;
 }
 
 void smc_ism_exit(void)