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

Commit 86331862 authored by Christophe Lombard's avatar Christophe Lombard Committed by Michael Ellerman
Browse files

cxl: Move common code away from bare-metal-specific files 



Move around some functions which will be accessed from the bare-metal
and guest environments.
Code in native.c and pci.c is meant to be bare-metal specific.
Other files contain code which may be shared with guests.

Co-authored-by: default avatarFrederic Barrat <fbarrat@linux.vnet.ibm.com>
Signed-off-by: default avatarFrederic Barrat <fbarrat@linux.vnet.ibm.com>
Signed-off-by: default avatarChristophe Lombard <clombard@linux.vnet.ibm.com>
Reviewed-by: default avatarManoj Kumar <manoj@linux.vnet.ibm.com>
Acked-by: default avatarIan Munsie <imunsie@au1.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 949e9b82

drivers/misc/cxl/cxl.h

+9 −0
Original line number Diff line number Diff line
@@ -526,6 +526,7 @@ void cxl_release_irq_ranges(struct cxl_irq_ranges *irqs, struct cxl *adapter); 
int cxl_setup_irq(struct cxl *adapter, unsigned int hwirq, unsigned int virq);

int cxl_update_image_control(struct cxl *adapter);

int cxl_reset(struct cxl *adapter);

void cxl_release_afu(struct device *dev);



/* common == phyp + powernv */

struct cxl_process_element_common {
@@ -679,6 +680,9 @@ void cxl_sysfs_afu_remove(struct cxl_afu *afu); 
int cxl_sysfs_afu_m_add(struct cxl_afu *afu);

void cxl_sysfs_afu_m_remove(struct cxl_afu *afu);



struct cxl *cxl_alloc_adapter(void);

struct cxl_afu *cxl_alloc_afu(struct cxl *adapter, int slice);



int cxl_afu_activate_mode(struct cxl_afu *afu, int mode);

int _cxl_afu_deactivate_mode(struct cxl_afu *afu, int mode);

int cxl_afu_deactivate_mode(struct cxl_afu *afu);
@@ -733,6 +737,11 @@ struct cxl_irq_info { 
};



void cxl_assign_psn_space(struct cxl_context *ctx);

irqreturn_t cxl_irq(int irq, void *ctx, struct cxl_irq_info *irq_info);

int cxl_register_one_irq(struct cxl *adapter, irq_handler_t handler,

			void *cookie, irq_hw_number_t *dest_hwirq,

			unsigned int *dest_virq, const char *name);



int cxl_attach_process(struct cxl_context *ctx, bool kernel, u64 wed,

			    u64 amr);

int cxl_detach_process(struct cxl_context *ctx);

drivers/misc/cxl/irq.c

+7 −7
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static irqreturn_t schedule_cxl_fault(struct cxl_context *ctx, u64 dsisr, u64 da 
	return IRQ_HANDLED;

}



static irqreturn_t cxl_irq(int irq, void *data, struct cxl_irq_info *irq_info)

irqreturn_t cxl_irq(int irq, void *data, struct cxl_irq_info *irq_info)

{

	struct cxl_context *ctx = data;

	u64 dsisr, dar;
@@ -291,7 +291,7 @@ void cxl_unmap_irq(unsigned int virq, void *cookie) 
	irq_dispose_mapping(virq);

}



static int cxl_register_one_irq(struct cxl *adapter,

int cxl_register_one_irq(struct cxl *adapter,

			irq_handler_t handler,

			void *cookie,

			irq_hw_number_t *dest_hwirq,

drivers/misc/cxl/main.c

+67 −0
Original line number Diff line number Diff line
@@ -32,6 +32,27 @@ uint cxl_verbose; 
module_param_named(verbose, cxl_verbose, uint, 0600);

MODULE_PARM_DESC(verbose, "Enable verbose dmesg output");



int cxl_afu_slbia(struct cxl_afu *afu)

{

	unsigned long timeout = jiffies + (HZ * CXL_TIMEOUT);



	pr_devel("cxl_afu_slbia issuing SLBIA command\n");

	cxl_p2n_write(afu, CXL_SLBIA_An, CXL_TLB_SLB_IQ_ALL);

	while (cxl_p2n_read(afu, CXL_SLBIA_An) & CXL_TLB_SLB_P) {

		if (time_after_eq(jiffies, timeout)) {

			dev_warn(&afu->dev, "WARNING: CXL AFU SLBIA timed out!\n");

			return -EBUSY;

		}

		/* If the adapter has gone down, we can assume that we

		 * will PERST it and that will invalidate everything.

		 */

		if (!cxl_adapter_link_ok(afu->adapter))

			return -EIO;

		cpu_relax();

	}

	return 0;

}



static inline void _cxl_slbia(struct cxl_context *ctx, struct mm_struct *mm)

{

	struct task_struct *task;
@@ -174,6 +195,52 @@ void cxl_remove_adapter_nr(struct cxl *adapter) 
	idr_remove(&cxl_adapter_idr, adapter->adapter_num);

}



struct cxl *cxl_alloc_adapter(void)

{

	struct cxl *adapter;



	if (!(adapter = kzalloc(sizeof(struct cxl), GFP_KERNEL)))

		return NULL;



	spin_lock_init(&adapter->afu_list_lock);



	if (cxl_alloc_adapter_nr(adapter))

		goto err1;



	if (dev_set_name(&adapter->dev, "card%i", adapter->adapter_num))

		goto err2;



	return adapter;



err2:

	cxl_remove_adapter_nr(adapter);

err1:

	kfree(adapter);

	return NULL;

}



struct cxl_afu *cxl_alloc_afu(struct cxl *adapter, int slice)

{

	struct cxl_afu *afu;



	if (!(afu = kzalloc(sizeof(struct cxl_afu), GFP_KERNEL)))

		return NULL;



	afu->adapter = adapter;

	afu->dev.parent = &adapter->dev;

	afu->dev.release = cxl_release_afu;

	afu->slice = slice;

	idr_init(&afu->contexts_idr);

	mutex_init(&afu->contexts_lock);

	spin_lock_init(&afu->afu_cntl_lock);

	mutex_init(&afu->spa_mutex);



	afu->prefault_mode = CXL_PREFAULT_NONE;

	afu->irqs_max = afu->adapter->user_irqs;



	return afu;

}



int cxl_afu_select_best_mode(struct cxl_afu *afu)

{

	if (afu->modes_supported & CXL_MODE_DIRECTED)

drivers/misc/cxl/native.c

+0 −21
Original line number Diff line number Diff line
@@ -265,27 +265,6 @@ int cxl_tlb_slb_invalidate(struct cxl *adapter) 
	return 0;

}



int cxl_afu_slbia(struct cxl_afu *afu)

{

	unsigned long timeout = jiffies + (HZ * CXL_TIMEOUT);



	pr_devel("cxl_afu_slbia issuing SLBIA command\n");

	cxl_p2n_write(afu, CXL_SLBIA_An, CXL_TLB_SLB_IQ_ALL);

	while (cxl_p2n_read(afu, CXL_SLBIA_An) & CXL_TLB_SLB_P) {

		if (time_after_eq(jiffies, timeout)) {

			dev_warn(&afu->dev, "WARNING: CXL AFU SLBIA timed out!\n");

			return -EBUSY;

		}

		/* If the adapter has gone down, we can assume that we

		 * will PERST it and that will invalidate everything.

		 */

		if (!cxl_adapter_link_ok(afu->adapter))

			return -EIO;

		cpu_relax();

	}

	return 0;

}



static int cxl_write_sstp(struct cxl_afu *afu, u64 sstp0, u64 sstp1)

{

	int rc;

drivers/misc/cxl/pci.c

+1 −47
Original line number Diff line number Diff line
@@ -604,7 +604,7 @@ static void cxl_unmap_slice_regs(struct cxl_afu *afu) 
	}

}



static void cxl_release_afu(struct device *dev)

void cxl_release_afu(struct device *dev)

{

	struct cxl_afu *afu = to_cxl_afu(dev);
@@ -616,28 +616,6 @@ static void cxl_release_afu(struct device *dev) 
	kfree(afu);

}



static struct cxl_afu *cxl_alloc_afu(struct cxl *adapter, int slice)

{

	struct cxl_afu *afu;



	if (!(afu = kzalloc(sizeof(struct cxl_afu), GFP_KERNEL)))

		return NULL;



	afu->adapter = adapter;

	afu->dev.parent = &adapter->dev;

	afu->dev.release = cxl_release_afu;

	afu->slice = slice;

	idr_init(&afu->contexts_idr);

	mutex_init(&afu->contexts_lock);

	spin_lock_init(&afu->afu_cntl_lock);

	mutex_init(&afu->spa_mutex);



	afu->prefault_mode = CXL_PREFAULT_NONE;

	afu->irqs_max = afu->adapter->user_irqs;



	return afu;

}



/* Expects AFU struct to have recently been zeroed out */

static int cxl_read_afu_descriptor(struct cxl_afu *afu)

{
@@ -1105,30 +1083,6 @@ static void cxl_release_adapter(struct device *dev) 
	kfree(adapter);

}



static struct cxl *cxl_alloc_adapter(void)

{

	struct cxl *adapter;



	if (!(adapter = kzalloc(sizeof(struct cxl), GFP_KERNEL)))

		return NULL;



	spin_lock_init(&adapter->afu_list_lock);



	if (cxl_alloc_adapter_nr(adapter))

		goto err1;



	if (dev_set_name(&adapter->dev, "card%i", adapter->adapter_num))

		goto err2;



	return adapter;



err2:

	cxl_remove_adapter_nr(adapter);

err1:

	kfree(adapter);

	return NULL;

}



#define CXL_PSL_ErrIVTE_tberror (0x1ull << (63-31))



static int sanitise_adapter_regs(struct cxl *adapter)