Commit a8de86e9 authored by Tomasz Zawadzki's avatar Tomasz Zawadzki Committed by Jim Harris
Browse files

lib/accel: remove legacy config support for accel module register 



Since legacy config is being removed, SPDK_ACCEL_MODULE_REGISTER
macro no longer needs field corresponding to processing this
type of configuration.

Signed-off-by: default avatarTomasz Zawadzki <tomasz.zawadzki@intel.com>
Change-Id: I76ca02487a5fb8f9ecc9d33ac6fa514e7226a03b
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/4636


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: default avatarBen Walker <benjamin.walker@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent 5f90d0c0

include/spdk/accel_engine.h

+0 −7
Original line number Diff line number Diff line
@@ -88,13 +88,6 @@ int spdk_accel_engine_initialize(void); 
 */

void spdk_accel_engine_finish(spdk_accel_fini_cb cb_fn, void *cb_arg);



/**

 * Get the configuration for the acceleration engine.

 *

 * \param fp The pointer to a file that will be written to the configuration.

 */

void spdk_accel_engine_config_text(FILE *fp);



/**

 * Close the acceleration engine module and perform any necessary cleanup.

 */

include/spdk_internal/accel_engine.h

+1 −8
Original line number Diff line number Diff line
@@ -94,12 +94,6 @@ struct spdk_accel_module_if { 
	 */

	void	(*module_fini)(void *ctx);



	/** Function called to return a text string representing the

	 *   module's configuration options for inclusion in an

	 *   spdk configuration file.

	 */

	void	(*config_text)(FILE *fp);



	/**

	 * Write Acceleration module configuration into provided JSON context.

	 */
@@ -116,11 +110,10 @@ struct spdk_accel_module_if { 
void spdk_accel_hw_engine_register(struct spdk_accel_engine *accel_engine);

void spdk_accel_module_list_add(struct spdk_accel_module_if *accel_module);



#define SPDK_ACCEL_MODULE_REGISTER(init_fn, fini_fn, config_fn, config_json, ctx_size_fn)				\

#define SPDK_ACCEL_MODULE_REGISTER(init_fn, fini_fn, config_json, ctx_size_fn)				\

	static struct spdk_accel_module_if init_fn ## _if = {						\

	.module_init		= init_fn,								\

	.module_fini		= fini_fn,								\

	.config_text		= config_fn,								\

	.write_config_json	= config_json,								\

	.get_ctx_size		= ctx_size_fn,								\

	};												\

lib/accel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ 
SPDK_ROOT_DIR := $(abspath $(CURDIR)/../..)

include $(SPDK_ROOT_DIR)/mk/spdk.common.mk



SO_VER := 3

SO_VER := 4

SO_MINOR := 0

SO_SUFFIX := $(SO_VER).$(SO_MINOR)

lib/accel/accel_engine.c

+1 −13
Original line number Diff line number Diff line
@@ -571,18 +571,6 @@ spdk_accel_engine_finish(spdk_accel_fini_cb cb_fn, void *cb_arg) 
	spdk_accel_engine_module_finish();

}



void

spdk_accel_engine_config_text(FILE *fp)

{

	struct spdk_accel_module_if *accel_engine_module;



	TAILQ_FOREACH(accel_engine_module, &spdk_accel_module_list, tailq) {

		if (accel_engine_module->config_text) {

			accel_engine_module->config_text(fp);

		}

	}

}



/*

 * The SW Accelerator module is "built in" here (rest of file)

 */
@@ -1031,4 +1019,4 @@ sw_accel_engine_fini(void *ctxt) 
}



SPDK_ACCEL_MODULE_REGISTER(sw_accel_engine_init, sw_accel_engine_fini,

			   NULL, NULL, sw_accel_engine_get_ctx_size)
 
			   NULL, sw_accel_engine_get_ctx_size)

lib/accel/spdk_accel.map

+0 −1
Original line number Diff line number Diff line
@@ -4,7 +4,6 @@ 
	# public functions

	spdk_accel_engine_initialize;

	spdk_accel_engine_finish;

	spdk_accel_engine_config_text;

	spdk_accel_engine_module_finish;

	spdk_accel_engine_get_io_channel;

	spdk_accel_get_capabilities;