Commit 8c81ba20 authored by Stefan Raspl's avatar Stefan Raspl Committed by David S. Miller
Browse files

net/smc: De-tangle ism and smc device initialization 



The struct device for ISM devices was part of struct smcd_dev. Move to
struct ism_dev, provide a new API call in struct smcd_ops, and convert
existing SMCD code accordingly.
Furthermore, remove struct smcd_dev from struct ism_dev.
This is the final part of a bigger overhaul of the interfaces between SMC
and ISM.

Signed-off-by: default avatarStefan Raspl <raspl@linux.ibm.com>
Signed-off-by: default avatarJan Karcher <jaka@linux.ibm.com>
Signed-off-by: default avatarWenjia Zhang <wenjia@linux.ibm.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 820f2100

drivers/s390/net/ism_drv.c

+12 −13
Original line number Diff line number Diff line
@@ -646,6 +646,12 @@ static int ism_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	spin_lock_init(&ism->lock);

	dev_set_drvdata(&pdev->dev, ism);

	ism->pdev = pdev;

	ism->dev.parent = &pdev->dev;

	device_initialize(&ism->dev);

	dev_set_name(&ism->dev, dev_name(&pdev->dev));

	ret = device_add(&ism->dev);

	if (ret)

		goto err_dev;



	ret = pci_enable_device_mem(pdev);

	if (ret)
@@ -663,30 +669,23 @@ static int ism_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
	dma_set_max_seg_size(&pdev->dev, SZ_1M);

	pci_set_master(pdev);



	ism->smcd = smcd_alloc_dev(&pdev->dev, dev_name(&pdev->dev), &ism_ops,

				   ISM_NR_DMBS);

	if (!ism->smcd) {

		ret = -ENOMEM;

		goto err_resource;

	}



	ism->smcd->priv = ism;

	ret = ism_dev_init(ism);

	if (ret)

		goto err_free;

		goto err_resource;



	return 0;



err_free:

	smcd_free_dev(ism->smcd);

err_resource:

	pci_clear_master(pdev);

	pci_release_mem_regions(pdev);

err_disable:

	pci_disable_device(pdev);

err:

	kfree(ism);

	device_del(&ism->dev);

err_dev:

	dev_set_drvdata(&pdev->dev, NULL);

	kfree(ism);



	return ret;

}
@@ -740,7 +739,6 @@ static void ism_remove(struct pci_dev *pdev) 
	ism_dev_exit(ism);

	mutex_unlock(&ism_dev_list.mutex);



	smcd_free_dev(ism->smcd);

	pci_clear_master(pdev);

	pci_release_mem_regions(pdev);

	pci_disable_device(pdev);
@@ -874,6 +872,7 @@ static const struct smcd_ops ism_ops = { 
	.get_system_eid = ism_get_seid,

	.get_local_gid = smcd_get_local_gid,

	.get_chid = smcd_get_chid,

	.get_dev = smcd_get_dev,

};



const struct smcd_ops *ism_get_smcd_ops(void)

include/linux/ism.h

+0 −1
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ struct ism_dev { 
	spinlock_t lock; /* protects the ism device */

	struct list_head list;

	struct pci_dev *pdev;

	struct smcd_dev *smcd;



	struct ism_sba *sba;

	dma_addr_t sba_dma_addr;

include/net/smc.h

+1 −5
Original line number Diff line number Diff line
@@ -70,11 +70,11 @@ struct smcd_ops { 
	u8* (*get_system_eid)(void);

	u64 (*get_local_gid)(struct smcd_dev *dev);

	u16 (*get_chid)(struct smcd_dev *dev);

	struct device* (*get_dev)(struct smcd_dev *dev);

};



struct smcd_dev {

	const struct smcd_ops *ops;

	struct device dev;

	void *priv;

	struct list_head list;

	spinlock_t lock;
@@ -90,8 +90,4 @@ struct smcd_dev { 
	u8 going_away : 1;

};



struct smcd_dev *smcd_alloc_dev(struct device *parent, const char *name,

				const struct smcd_ops *ops, int max_dmbs);

void smcd_free_dev(struct smcd_dev *smcd);



#endif	/* _SMC_H */

net/smc/af_smc.c

+1 −0
Original line number Diff line number Diff line
@@ -3499,6 +3499,7 @@ static void __exit smc_exit(void) 
	sock_unregister(PF_SMC);

	smc_core_exit();

	smc_ib_unregister_client();

	smc_ism_exit();

	destroy_workqueue(smc_close_wq);

	destroy_workqueue(smc_tcp_ls_wq);

	destroy_workqueue(smc_hs_wq);

net/smc/smc_core.c

+4 −2
Original line number Diff line number Diff line
@@ -822,6 +822,7 @@ static int smc_lgr_create(struct smc_sock *smc, struct smc_init_info *ini) 
{

	struct smc_link_group *lgr;

	struct list_head *lgr_list;

	struct smcd_dev *smcd;

	struct smc_link *lnk;

	spinlock_t *lgr_lock;

	u8 link_idx;
@@ -868,7 +869,8 @@ static int smc_lgr_create(struct smc_sock *smc, struct smc_init_info *ini) 
	lgr->conns_all = RB_ROOT;

	if (ini->is_smcd) {

		/* SMC-D specific settings */

		get_device(&ini->ism_dev[ini->ism_selected]->dev);

		smcd = ini->ism_dev[ini->ism_selected];

		get_device(smcd->ops->get_dev(smcd));

		lgr->peer_gid = ini->ism_peer_gid[ini->ism_selected];

		lgr->smcd = ini->ism_dev[ini->ism_selected];

		lgr_list = &ini->ism_dev[ini->ism_selected]->lgr_list;
@@ -1387,7 +1389,7 @@ static void smc_lgr_free(struct smc_link_group *lgr) 
	destroy_workqueue(lgr->tx_wq);

	if (lgr->is_smcd) {

		smc_ism_put_vlan(lgr->smcd, lgr->vlan_id);

		put_device(&lgr->smcd->dev);

		put_device(lgr->smcd->ops->get_dev(lgr->smcd));

	}

	smc_lgr_put(lgr); /* theoretically last lgr_put */

}