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

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

cxl: Rename some psl8 specific functions 



Rename a few functions, changing the '_psl' suffix to '_psl8', to make
clear that the implementation is psl8 specific.
Those functions will have an equivalent implementation for the psl9 in
a later patch.

Signed-off-by: default avatarChristophe Lombard <clombard@linux.vnet.ibm.com>
Reviewed-by: default avatarAndrew Donnellan <andrew.donnellan@au1.ibm.com>
Acked-by: default avatarFrederic Barrat <fbarrat@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent bdd2e715

drivers/misc/cxl/cxl.h

+13 −13
Original line number Diff line number Diff line
@@ -813,10 +813,10 @@ int afu_register_irqs(struct cxl_context *ctx, u32 count); 
void afu_release_irqs(struct cxl_context *ctx, void *cookie);

void afu_irq_name_free(struct cxl_context *ctx);



int cxl_attach_afu_directed_psl(struct cxl_context *ctx, u64 wed, u64 amr);

int cxl_activate_dedicated_process_psl(struct cxl_afu *afu);

int cxl_attach_dedicated_process_psl(struct cxl_context *ctx, u64 wed, u64 amr);

void cxl_update_dedicated_ivtes_psl(struct cxl_context *ctx);

int cxl_attach_afu_directed_psl8(struct cxl_context *ctx, u64 wed, u64 amr);

int cxl_activate_dedicated_process_psl8(struct cxl_afu *afu);

int cxl_attach_dedicated_process_psl8(struct cxl_context *ctx, u64 wed, u64 amr);

void cxl_update_dedicated_ivtes_psl8(struct cxl_context *ctx);



#ifdef CONFIG_DEBUG_FS
@@ -826,10 +826,10 @@ int cxl_debugfs_adapter_add(struct cxl *adapter); 
void cxl_debugfs_adapter_remove(struct cxl *adapter);

int cxl_debugfs_afu_add(struct cxl_afu *afu);

void cxl_debugfs_afu_remove(struct cxl_afu *afu);

void cxl_stop_trace_psl(struct cxl *cxl);

void cxl_debugfs_add_adapter_regs_psl(struct cxl *adapter, struct dentry *dir);

void cxl_stop_trace_psl8(struct cxl *cxl);

void cxl_debugfs_add_adapter_regs_psl8(struct cxl *adapter, struct dentry *dir);

void cxl_debugfs_add_adapter_regs_xsl(struct cxl *adapter, struct dentry *dir);

void cxl_debugfs_add_afu_regs_psl(struct cxl_afu *afu, struct dentry *dir);

void cxl_debugfs_add_afu_regs_psl8(struct cxl_afu *afu, struct dentry *dir);



#else /* CONFIG_DEBUG_FS */
@@ -860,11 +860,11 @@ static inline void cxl_debugfs_afu_remove(struct cxl_afu *afu) 
{

}



static inline void cxl_stop_trace(struct cxl *cxl)

static inline void cxl_stop_trace_psl8(struct cxl *cxl)

{

}



static inline void cxl_debugfs_add_adapter_regs_psl(struct cxl *adapter,

static inline void cxl_debugfs_add_adapter_regs_psl8(struct cxl *adapter,

						    struct dentry *dir)

{

}
@@ -874,7 +874,7 @@ static inline void cxl_debugfs_add_adapter_regs_xsl(struct cxl *adapter, 
{

}



static inline void cxl_debugfs_add_afu_regs_psl(struct cxl_afu *afu, struct dentry *dir)

static inline void cxl_debugfs_add_afu_regs_psl8(struct cxl_afu *afu, struct dentry *dir)

{

}
@@ -919,8 +919,8 @@ struct cxl_irq_info { 
};



void cxl_assign_psn_space(struct cxl_context *ctx);

int cxl_invalidate_all_psl(struct cxl *adapter);

irqreturn_t cxl_irq_psl(int irq, struct cxl_context *ctx, struct cxl_irq_info *irq_info);

int cxl_invalidate_all_psl8(struct cxl *adapter);

irqreturn_t cxl_irq_psl8(int irq, struct cxl_context *ctx, struct cxl_irq_info *irq_info);

irqreturn_t cxl_fail_irq_psl(struct cxl_afu *afu, 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,
@@ -932,7 +932,7 @@ int cxl_data_cache_flush(struct cxl *adapter); 
int cxl_afu_disable(struct cxl_afu *afu);

int cxl_psl_purge(struct cxl_afu *afu);



void cxl_native_irq_dump_regs_psl(struct cxl_context *ctx);

void cxl_native_irq_dump_regs_psl8(struct cxl_context *ctx);

void cxl_native_err_irq_dump_regs(struct cxl *adapter);

int cxl_pci_vphb_add(struct cxl_afu *afu);

void cxl_pci_vphb_remove(struct cxl_afu *afu);

drivers/misc/cxl/debugfs.c

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


static struct dentry *cxl_debugfs;



void cxl_stop_trace_psl(struct cxl *adapter)

void cxl_stop_trace_psl8(struct cxl *adapter)

{

	int slice;
@@ -53,7 +53,7 @@ static struct dentry *debugfs_create_io_x64(const char *name, umode_t mode, 
					  (void __force *)value, &fops_io_x64);

}



void cxl_debugfs_add_adapter_regs_psl(struct cxl *adapter, struct dentry *dir)

void cxl_debugfs_add_adapter_regs_psl8(struct cxl *adapter, struct dentry *dir)

{

	debugfs_create_io_x64("fir1", S_IRUSR, dir, _cxl_p1_addr(adapter, CXL_PSL_FIR1));

	debugfs_create_io_x64("fir2", S_IRUSR, dir, _cxl_p1_addr(adapter, CXL_PSL_FIR2));
@@ -92,7 +92,7 @@ void cxl_debugfs_adapter_remove(struct cxl *adapter) 
	debugfs_remove_recursive(adapter->debugfs);

}



void cxl_debugfs_add_afu_regs_psl(struct cxl_afu *afu, struct dentry *dir)

void cxl_debugfs_add_afu_regs_psl8(struct cxl_afu *afu, struct dentry *dir)

{

	debugfs_create_io_x64("fir", S_IRUSR, dir, _cxl_p1n_addr(afu, CXL_PSL_FIR_SLICE_An));

	debugfs_create_io_x64("serr", S_IRUSR, dir, _cxl_p1n_addr(afu, CXL_PSL_SERR_An));

drivers/misc/cxl/guest.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ static irqreturn_t guest_psl_irq(int irq, void *data) 
		return IRQ_HANDLED;

	}



	rc = cxl_irq_psl(irq, ctx, &irq_info);

	rc = cxl_irq_psl8(irq, ctx, &irq_info);

	return rc;

}

drivers/misc/cxl/irq.c

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

}



irqreturn_t cxl_irq_psl(int irq, struct cxl_context *ctx, struct cxl_irq_info *irq_info)

irqreturn_t cxl_irq_psl8(int irq, struct cxl_context *ctx, struct cxl_irq_info *irq_info)

{

	u64 dsisr, dar;

drivers/misc/cxl/native.c

+6 −6
Original line number Diff line number Diff line
@@ -258,7 +258,7 @@ void cxl_release_spa(struct cxl_afu *afu) 
	}

}



int cxl_invalidate_all_psl(struct cxl *adapter)

int cxl_invalidate_all_psl8(struct cxl *adapter)

{

	unsigned long timeout = jiffies + (HZ * CXL_TIMEOUT);
@@ -578,7 +578,7 @@ static void update_ivtes_directed(struct cxl_context *ctx) 
		WARN_ON(add_process_element(ctx));

}



int cxl_attach_afu_directed_psl(struct cxl_context *ctx, u64 wed, u64 amr)

int cxl_attach_afu_directed_psl8(struct cxl_context *ctx, u64 wed, u64 amr)

{

	u32 pid;

	int result;
@@ -671,7 +671,7 @@ static int deactivate_afu_directed(struct cxl_afu *afu) 
	return 0;

}



int cxl_activate_dedicated_process_psl(struct cxl_afu *afu)

int cxl_activate_dedicated_process_psl8(struct cxl_afu *afu)

{

	dev_info(&afu->dev, "Activating dedicated process mode\n");
@@ -694,7 +694,7 @@ int cxl_activate_dedicated_process_psl(struct cxl_afu *afu) 
	return cxl_chardev_d_afu_add(afu);

}



void cxl_update_dedicated_ivtes_psl(struct cxl_context *ctx)

void cxl_update_dedicated_ivtes_psl8(struct cxl_context *ctx)

{

	struct cxl_afu *afu = ctx->afu;
@@ -710,7 +710,7 @@ void cxl_update_dedicated_ivtes_psl(struct cxl_context *ctx) 
			((u64)ctx->irqs.range[3] & 0xffff));

}



int cxl_attach_dedicated_process_psl(struct cxl_context *ctx, u64 wed, u64 amr)

int cxl_attach_dedicated_process_psl8(struct cxl_context *ctx, u64 wed, u64 amr)

{

	struct cxl_afu *afu = ctx->afu;

	u64 pid;
@@ -880,7 +880,7 @@ static int native_get_irq_info(struct cxl_afu *afu, struct cxl_irq_info *info) 
	return 0;

}



void cxl_native_irq_dump_regs_psl(struct cxl_context *ctx)

void cxl_native_irq_dump_regs_psl8(struct cxl_context *ctx)

{

	u64 fir1, fir2, fir_slice, serr, afu_debug;