[PATCH v2 06/10] cxl: Refactor AFU init/teardown

[Cyril Bur]

On Tue, 28 Jul 2015 15:28:39 +1000
Daniel Axtens <dja at axtens.net> wrote:

> As with an adapter, some aspects of initialisation are done only once
> in the lifetime of an AFU: for example, allocating memory, or setting
> up sysfs/debugfs files.
> 
> However, we may want to be able to do some parts of the initialisation
> multiple times: for example, in error recovery we want to be able to
> tear down and then re-map IO memory and IRQs.
> 
> Therefore, refactor AFU init/teardown as follows.
> 
>  - Create two new functions: 'cxl_configure_afu', and its pair
>    'cxl_deconfigure_afu'. As with the adapter functions,
>    these (de)configure resources that do not need to last the entire
>    lifetime of the AFU.
> 
>  - Allocating and releasing memory remain the task of 'cxl_alloc_afu'
>    and 'cxl_release_afu'.
> 
>  - Once-only functions that do not involve allocating/releasing memory
>    stay in the overarching 'cxl_init_afu'/'cxl_remove_afu' pair.
>    However, the task of picking an AFU mode and activating it has been
>    broken out.
> 

Reviewed-by: Cyril Bur <cyrilbur at gmail.com>

> Signed-off-by: Daniel Axtens <dja at axtens.net>
> ---
>  drivers/misc/cxl/pci.c | 87 +++++++++++++++++++++++++++++---------------------
>  1 file changed, 50 insertions(+), 37 deletions(-)
> 
> diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c
> index 7f47e2221524..98a8207da88d 100644
> --- a/drivers/misc/cxl/pci.c
> +++ b/drivers/misc/cxl/pci.c
> @@ -753,45 +753,67 @@ ssize_t cxl_afu_read_err_buffer(struct cxl_afu *afu, char *buf,
>  	return count;
>  }
>  
> -static int cxl_init_afu(struct cxl *adapter, int slice, struct pci_dev *dev)
> +static int cxl_configure_afu(struct cxl_afu *afu, struct cxl *adapter, struct pci_dev *dev)
>  {
> -	struct cxl_afu *afu;
> -	bool free = true;
>  	int rc;
>  
> -	if (!(afu = cxl_alloc_afu(adapter, slice)))
> -		return -ENOMEM;
> -
> -	if ((rc = dev_set_name(&afu->dev, "afu%i.%i", adapter->adapter_num, slice)))
> -		goto err1;
> -
>  	if ((rc = cxl_map_slice_regs(afu, adapter, dev)))
> -		goto err1;
> +		return rc;
>  
>  	if ((rc = sanitise_afu_regs(afu)))
> -		goto err2;
> +		goto err1;
>  
>  	/* We need to reset the AFU before we can read the AFU descriptor */
>  	if ((rc = __cxl_afu_reset(afu)))
> -		goto err2;
> +		goto err1;
>  
>  	if (cxl_verbose)
>  		dump_afu_descriptor(afu);
>  
>  	if ((rc = cxl_read_afu_descriptor(afu)))
> -		goto err2;
> +		goto err1;
>  
>  	if ((rc = cxl_afu_descriptor_looks_ok(afu)))
> -		goto err2;
> +		goto err1;
>  
>  	if ((rc = init_implementation_afu_regs(afu)))
> -		goto err2;
> +		goto err1;
>  
>  	if ((rc = cxl_register_serr_irq(afu)))
> -		goto err2;
> +		goto err1;
>  
>  	if ((rc = cxl_register_psl_irq(afu)))
> -		goto err3;
> +		goto err2;
> +
> +	return 0;
> +
> +err2:
> +	cxl_release_serr_irq(afu);
> +err1:
> +	cxl_unmap_slice_regs(afu);
> +	return rc;
> +}
> +
> +static void cxl_deconfigure_afu(struct cxl_afu *afu)
> +{
> +	cxl_release_psl_irq(afu);
> +	cxl_release_serr_irq(afu);
> +	cxl_unmap_slice_regs(afu);
> +}
> +
> +static int cxl_init_afu(struct cxl *adapter, int slice, struct pci_dev *dev)
> +{
> +	struct cxl_afu *afu;
> +	int rc;
> +
> +	if (!(afu = cxl_alloc_afu(adapter, slice)))
> +		return -ENOMEM;
> +
> +	if ((rc = dev_set_name(&afu->dev, "afu%i.%i", adapter->adapter_num, slice)))
> +		goto err_free;
> +
> +	if ((rc = cxl_configure_afu(afu, adapter, dev)))
> +		goto err_free;
>  
>  	/* Don't care if this fails */
>  	cxl_debugfs_afu_add(afu);
> @@ -806,10 +828,6 @@ static int cxl_init_afu(struct cxl *adapter, int slice, struct pci_dev *dev)
>  	if ((rc = cxl_sysfs_afu_add(afu)))
>  		goto err_put1;
>  
> -
> -	if ((rc = cxl_afu_select_best_mode(afu)))
> -		goto err_put2;
> -
>  	adapter->afu[afu->slice] = afu;
>  
>  	if ((rc = cxl_pci_vphb_add(afu)))
> @@ -817,21 +835,16 @@ static int cxl_init_afu(struct cxl *adapter, int slice, struct pci_dev *dev)
>  
>  	return 0;
>  
> -err_put2:
> -	cxl_sysfs_afu_remove(afu);
>  err_put1:
> -	device_unregister(&afu->dev);
> -	free = false;
> +	cxl_deconfigure_afu(afu);
>  	cxl_debugfs_afu_remove(afu);
> -	cxl_release_psl_irq(afu);
> -err3:
> -	cxl_release_serr_irq(afu);
> -err2:
> -	cxl_unmap_slice_regs(afu);
> -err1:
> -	if (free)
> -		kfree(afu);
> +	device_unregister(&afu->dev);
>  	return rc;
> +
> +err_free:
> +	kfree(afu);
> +	return rc;
> +
>  }
>  
>  static void cxl_remove_afu(struct cxl_afu *afu)
> @@ -851,10 +864,7 @@ static void cxl_remove_afu(struct cxl_afu *afu)
>  	cxl_context_detach_all(afu);
>  	cxl_afu_deactivate_mode(afu);
>  
> -	cxl_release_psl_irq(afu);
> -	cxl_release_serr_irq(afu);
> -	cxl_unmap_slice_regs(afu);
> -
> +	cxl_deconfigure_afu(afu);
>  	device_unregister(&afu->dev);
>  }
>  
> @@ -1207,6 +1217,9 @@ static int cxl_probe(struct pci_dev *dev, const struct pci_device_id *id)
>  	for (slice = 0; slice < adapter->slices; slice++) {
>  		if ((rc = cxl_init_afu(adapter, slice, dev)))
>  			dev_err(&dev->dev, "AFU %i failed to initialise: %i\n", slice, rc);
> +
> +		if ((rc = cxl_afu_select_best_mode(adapter->afu[slice])))
> +			dev_err(&dev->dev, "AFU %i failed to start: %i\n", slice, rc);
>  	}
>  
>  	return 0;