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

Commit 39d40871 authored by Andrew Donnellan's avatar Andrew Donnellan Committed by Michael Ellerman
Browse files

cxl: Fix build when CONFIG_DEBUG_FS=n 



Stub out the debugfs functions so that the build doesn't break when
CONFIG_DEBUG_FS=n.

Reported-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarAndrew Donnellan <andrew.donnellan@au1.ibm.com>
Acked-by: default avatarIan Munsie <imunsie@au1.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 673bc435

drivers/misc/cxl/Makefile

+2 −1
Original line number Original line Diff line number Diff line
@@ -2,9 +2,10 @@ ccflags-y := $(call cc-disable-warning, unused-const-variable) 
ccflags-$(CONFIG_PPC_WERROR)	+= -Werror

ccflags-$(CONFIG_PPC_WERROR)	+= -Werror





cxl-y				+= main.o file.o irq.o fault.o native.o

cxl-y				+= main.o file.o irq.o fault.o native.o

cxl-y				+= context.o sysfs.o debugfs.o pci.o trace.o

cxl-y				+= context.o sysfs.o pci.o trace.o

cxl-y				+= vphb.o phb.o api.o

cxl-y				+= vphb.o phb.o api.o

cxl-$(CONFIG_PPC_PSERIES)	+= flash.o guest.o of.o hcalls.o

cxl-$(CONFIG_PPC_PSERIES)	+= flash.o guest.o of.o hcalls.o

cxl-$(CONFIG_DEBUG_FS)		+= debugfs.o

obj-$(CONFIG_CXL)		+= cxl.o

obj-$(CONFIG_CXL)		+= cxl.o

obj-$(CONFIG_CXL_BASE)		+= base.o

obj-$(CONFIG_CXL_BASE)		+= base.o

drivers/misc/cxl/cxl.h

+55 −4
Original line number Original line Diff line number Diff line
@@ -802,12 +802,67 @@ int afu_register_irqs(struct cxl_context *ctx, u32 count); 
void afu_release_irqs(struct cxl_context *ctx, void *cookie);

void afu_release_irqs(struct cxl_context *ctx, void *cookie);

void afu_irq_name_free(struct cxl_context *ctx);

void afu_irq_name_free(struct cxl_context *ctx);





#ifdef CONFIG_DEBUG_FS



int cxl_debugfs_init(void);

int cxl_debugfs_init(void);

void cxl_debugfs_exit(void);

void cxl_debugfs_exit(void);

int cxl_debugfs_adapter_add(struct cxl *adapter);

int cxl_debugfs_adapter_add(struct cxl *adapter);

void cxl_debugfs_adapter_remove(struct cxl *adapter);

void cxl_debugfs_adapter_remove(struct cxl *adapter);

int cxl_debugfs_afu_add(struct cxl_afu *afu);

int cxl_debugfs_afu_add(struct cxl_afu *afu);

void cxl_debugfs_afu_remove(struct cxl_afu *afu);

void cxl_debugfs_afu_remove(struct cxl_afu *afu);

void cxl_stop_trace(struct cxl *cxl);

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

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

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



#else /* CONFIG_DEBUG_FS */



static inline int __init cxl_debugfs_init(void)

{

	return 0;

}



static inline void cxl_debugfs_exit(void)

{

}



static inline int cxl_debugfs_adapter_add(struct cxl *adapter)

{

	return 0;

}



static inline void cxl_debugfs_adapter_remove(struct cxl *adapter)

{

}



static inline int cxl_debugfs_afu_add(struct cxl_afu *afu)

{

	return 0;

}



static inline void cxl_debugfs_afu_remove(struct cxl_afu *afu)

{

}



static inline void cxl_stop_trace(struct cxl *cxl)

{

}



static inline void cxl_debugfs_add_adapter_psl_regs(struct cxl *adapter,

						    struct dentry *dir)

{

}



static inline void cxl_debugfs_add_adapter_xsl_regs(struct cxl *adapter,

						    struct dentry *dir)

{

}



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

{

}



#endif /* CONFIG_DEBUG_FS */





void cxl_handle_fault(struct work_struct *work);

void cxl_handle_fault(struct work_struct *work);

void cxl_prefault(struct cxl_context *ctx, u64 wed);

void cxl_prefault(struct cxl_context *ctx, u64 wed);
@@ -872,12 +927,8 @@ int cxl_data_cache_flush(struct cxl *adapter); 
int cxl_afu_disable(struct cxl_afu *afu);

int cxl_afu_disable(struct cxl_afu *afu);

int cxl_psl_purge(struct cxl_afu *afu);

int cxl_psl_purge(struct cxl_afu *afu);





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

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

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

void cxl_native_psl_irq_dump_regs(struct cxl_context *ctx);

void cxl_native_psl_irq_dump_regs(struct cxl_context *ctx);

void cxl_native_err_irq_dump_regs(struct cxl *adapter);

void cxl_native_err_irq_dump_regs(struct cxl *adapter);

void cxl_stop_trace(struct cxl *cxl);

int cxl_pci_vphb_add(struct cxl_afu *afu);

int cxl_pci_vphb_add(struct cxl_afu *afu);

void cxl_pci_vphb_remove(struct cxl_afu *afu);

void cxl_pci_vphb_remove(struct cxl_afu *afu);

void cxl_release_mapping(struct cxl_context *ctx);

void cxl_release_mapping(struct cxl_context *ctx);