Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73904823 authored by Uma Krishnan's avatar Uma Krishnan Committed by Martin K. Petersen
Browse files

scsi: cxlflash: Setup function OCXL link 



After reading and modifying the function configuration, setup the OCXL link
using the OCXL provider services. The link is released when the adapter is
unconfigured.

Signed-off-by: default avatarUma Krishnan <ukrishn@linux.vnet.ibm.com>
Acked-by: default avatarMatthew R. Ochs <mrochs@linux.vnet.ibm.com>
Reviewed-by: default avatarFrederic Barrat <fbarrat@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 119c9200

drivers/scsi/cxlflash/ocxl_hw.c

+22 −3
Original line number Original line Diff line number Diff line
@@ -415,10 +415,27 @@ static int ocxlflash_config_fn(struct pci_dev *pdev, struct ocxl_hw_afu *afu) 
	ocxl_config_set_actag(pdev, fcfg->dvsec_function_pos, base, enabled);

	ocxl_config_set_actag(pdev, fcfg->dvsec_function_pos, base, enabled);

	dev_dbg(dev, "%s: Function acTag range base=%u enabled=%u\n",

	dev_dbg(dev, "%s: Function acTag range base=%u enabled=%u\n",

		__func__, base, enabled);

		__func__, base, enabled);



	rc = ocxl_link_setup(pdev, 0, &afu->link_token);

	if (unlikely(rc)) {

		dev_err(dev, "%s: ocxl_link_setup failed rc=%d\n",

			__func__, rc);

		goto out;

	}

out:

out:

	return rc;

	return rc;

}

}





/**

 * ocxlflash_unconfig_fn() - unconfigure the host function

 * @pdev:	PCI device associated with the host.

 * @afu:	AFU associated with the host.

 */

static void ocxlflash_unconfig_fn(struct pci_dev *pdev, struct ocxl_hw_afu *afu)

{

	ocxl_link_release(pdev, afu->link_token);

}



/**

/**

 * ocxlflash_map_mmio() - map the AFU MMIO space

 * ocxlflash_map_mmio() - map the AFU MMIO space

 * @afu: AFU associated with the host.

 * @afu: AFU associated with the host.
@@ -560,7 +577,7 @@ static void *ocxlflash_create_afu(struct pci_dev *pdev) 
	if (unlikely(rc)) {

	if (unlikely(rc)) {

		dev_err(dev, "%s: AFU configuration failed rc=%d\n",

		dev_err(dev, "%s: AFU configuration failed rc=%d\n",

			__func__, rc);

			__func__, rc);

		goto err1;

		goto err2;

	}

	}





	ctx = ocxlflash_dev_context_init(pdev, afu);

	ctx = ocxlflash_dev_context_init(pdev, afu);
@@ -568,14 +585,16 @@ static void *ocxlflash_create_afu(struct pci_dev *pdev) 
		rc = PTR_ERR(ctx);

		rc = PTR_ERR(ctx);

		dev_err(dev, "%s: ocxlflash_dev_context_init failed rc=%d\n",

		dev_err(dev, "%s: ocxlflash_dev_context_init failed rc=%d\n",

			__func__, rc);

			__func__, rc);

		goto err2;

		goto err3;

	}

	}





	afu->ocxl_ctx = ctx;

	afu->ocxl_ctx = ctx;

out:

out:

	return afu;

	return afu;

err2:

err3:

	ocxlflash_unconfig_afu(afu);

	ocxlflash_unconfig_afu(afu);

err2:

	ocxlflash_unconfig_fn(pdev, afu);

err1:

err1:

	idr_destroy(&afu->idr);

	idr_destroy(&afu->idr);

	kfree(afu);

	kfree(afu);

drivers/scsi/cxlflash/ocxl_hw.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -31,6 +31,7 @@ struct ocxl_hw_afu { 
	phys_addr_t gmmio_phys;		/* Global AFU MMIO space */

	phys_addr_t gmmio_phys;		/* Global AFU MMIO space */

	void __iomem *gmmio_virt;	/* Global MMIO map */

	void __iomem *gmmio_virt;	/* Global MMIO map */





	void *link_token;		/* Link token for the SPA */

	struct idr idr;			/* IDR to manage contexts */

	struct idr idr;			/* IDR to manage contexts */

	int max_pasid;			/* Maximum number of contexts */

	int max_pasid;			/* Maximum number of contexts */

	bool is_present;		/* Function has AFUs defined */

	bool is_present;		/* Function has AFUs defined */