Skip to content

Commit 784c46f

Browse files
Wen GuPaolo Abeni
authored andcommitted
net/smc: decouple ism_client from SMC-D DMB registration
The struct 'ism_client' is specialized for s390 platform firmware ISM. So replace it with 'void' to make SMCD DMB registration helper generic for both Emulated-ISM and existing ISM. Signed-off-by: Wen Gu <[email protected]> Reviewed-by: Wenjia Zhang <[email protected]> Reviewed-and-tested-by: Jan Karcher <[email protected]> Signed-off-by: Paolo Abeni <[email protected]>
1 parent e5c5f35 commit 784c46f

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

drivers/s390/net/ism_drv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@ static int smcd_query_rgid(struct smcd_dev *smcd, struct smcd_gid *rgid,
745745
}
746746

747747
static int smcd_register_dmb(struct smcd_dev *smcd, struct smcd_dmb *dmb,
748-
struct ism_client *client)
748+
void *client)
749749
{
750750
return ism_register_dmb(smcd->priv, (struct ism_dmb *)dmb, client);
751751
}

include/net/smc.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ struct smcd_dmb {
4747
#define ISM_ERROR 0xFFFF
4848

4949
struct smcd_dev;
50-
struct ism_client;
5150

5251
struct smcd_gid {
5352
u64 gid;
@@ -58,7 +57,7 @@ struct smcd_ops {
5857
int (*query_remote_gid)(struct smcd_dev *dev, struct smcd_gid *rgid,
5958
u32 vid_valid, u32 vid);
6059
int (*register_dmb)(struct smcd_dev *dev, struct smcd_dmb *dmb,
61-
struct ism_client *client);
60+
void *client);
6261
int (*unregister_dmb)(struct smcd_dev *dev, struct smcd_dmb *dmb);
6362
int (*add_vlan_id)(struct smcd_dev *dev, u64 vlan_id);
6463
int (*del_vlan_id)(struct smcd_dev *dev, u64 vlan_id);
@@ -78,6 +77,7 @@ struct smcd_ops {
7877
struct smcd_dev {
7978
const struct smcd_ops *ops;
8079
void *priv;
80+
void *client;
8181
struct list_head list;
8282
spinlock_t lock;
8383
struct smc_connection **conn;

net/smc/smc_ism.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,6 @@ int smc_ism_unregister_dmb(struct smcd_dev *smcd, struct smc_buf_desc *dmb_desc)
222222
int smc_ism_register_dmb(struct smc_link_group *lgr, int dmb_len,
223223
struct smc_buf_desc *dmb_desc)
224224
{
225-
#if IS_ENABLED(CONFIG_ISM)
226225
struct smcd_dmb dmb;
227226
int rc;
228227

@@ -231,7 +230,7 @@ int smc_ism_register_dmb(struct smc_link_group *lgr, int dmb_len,
231230
dmb.sba_idx = dmb_desc->sba_idx;
232231
dmb.vlan_id = lgr->vlan_id;
233232
dmb.rgid = lgr->peer_gid.gid;
234-
rc = lgr->smcd->ops->register_dmb(lgr->smcd, &dmb, &smc_ism_client);
233+
rc = lgr->smcd->ops->register_dmb(lgr->smcd, &dmb, lgr->smcd->client);
235234
if (!rc) {
236235
dmb_desc->sba_idx = dmb.sba_idx;
237236
dmb_desc->token = dmb.dmb_tok;
@@ -240,9 +239,6 @@ int smc_ism_register_dmb(struct smc_link_group *lgr, int dmb_len,
240239
dmb_desc->len = dmb.dmb_len;
241240
}
242241
return rc;
243-
#else
244-
return 0;
245-
#endif
246242
}
247243

248244
static int smc_nl_handle_smcd_dev(struct smcd_dev *smcd,
@@ -446,6 +442,7 @@ static void smcd_register_dev(struct ism_dev *ism)
446442
if (!smcd)
447443
return;
448444
smcd->priv = ism;
445+
smcd->client = &smc_ism_client;
449446
ism_set_priv(ism, &smc_ism_client, smcd);
450447
if (smc_pnetid_by_dev_port(&ism->pdev->dev, 0, smcd->pnetid))
451448
smc_pnetid_by_table_smcd(smcd);

0 commit comments

Comments
 (0)