Commit 3bacd665 authored by Ben Walker's avatar Ben Walker Committed by Jim Harris
Browse files

idxd: No longer set token configuration 



This has changed to control the number of read buffers allocated to the
group, but it is only valid to set this register if the device has
indicated it supports it. Further, the default value is what we want
anyway, so we can skip setting it altogether.

Signed-off-by: default avatarBen Walker <benjamin.walker@intel.com>
Change-Id: Ic54672ea6cb16acc7613860e36d9f7033048bd98
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/11484


Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarPaul Luse <paul.e.luse@intel.com>
Reviewed-by: default avatarChangpeng Liu <changpeng.liu@intel.com>
Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Broadcom CI <spdk-ci.pdl@broadcom.com>
Community-CI: Mellanox Build Bot
parent 8c400e49

include/spdk/idxd_spec.h

+8 −8
Original line number Diff line number Diff line
@@ -542,12 +542,12 @@ union idxd_group_flags { 
	struct {

		uint32_t tc_a : 3;

		uint32_t tc_b : 3;

		uint32_t rsvd: 1;

		uint32_t use_token_limit: 1;

		uint32_t tokens_reserved: 8;

		uint32_t rsvd2: 4;

		uint32_t tokens_allowed: 8;

		uint32_t rsvd3: 4;

		uint32_t reserved0 : 1;

		uint32_t global_read_buffer_limit : 1;

		uint32_t read_buffers_reserved : 8;

		uint32_t reserved1 : 4;

		uint32_t read_buffers_allowed : 8;

		uint32_t reserved2 : 4;

	};

	uint32_t raw;

};

lib/idxd/idxd_user.c

+0 −4
Original line number Diff line number Diff line
@@ -238,10 +238,6 @@ idxd_group_config(struct spdk_idxd_device *idxd) 
	for (i = 0; i < g_user_dev_cfg.num_groups; i++) {

		idxd->groups[i].idxd = idxd;

		idxd->groups[i].id = i;



		/* Divide BW tokens evenly */

		idxd->groups[i].grpcfg.flags.tokens_allowed =

			user_idxd->registers.groupcap.read_bufs / g_user_dev_cfg.num_groups;

	}



	/*

test/unit/lib/idxd/idxd_user.c/idxd_user_ut.c

+1 −3
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ 


#define FAKE_REG_SIZE 0x800

#define GRP_CFG_OFFSET 0x400

#define MAX_TOKENS 0x40

#define MAX_ARRAY_SIZE 0x20



SPDK_LOG_REGISTER_COMPONENT(idxd);
@@ -172,7 +171,6 @@ test_idxd_group_config(void) 
	user_idxd.registers.groupcap.num_groups = g_user_dev_cfg.num_groups;

	user_idxd.registers.enginecap.num_engines = g_user_dev_cfg.total_engines;

	user_idxd.registers.wqcap.num_wqs = g_user_dev_cfg.total_wqs;

	user_idxd.registers.groupcap.read_bufs = MAX_TOKENS;

	user_idxd.grpcfg_offset = GRP_CFG_OFFSET;



	rc = idxd_group_config(idxd);
@@ -187,7 +185,7 @@ test_idxd_group_config(void) 
	/* wqe and engine arrays are indexed by group id and are bitmaps of assigned elements. */

	CU_ASSERT(wqs[0] == 0x1);

	CU_ASSERT(engines[0] == 0xf);

	CU_ASSERT(flags[0].tokens_allowed == MAX_TOKENS / g_user_dev_cfg.num_groups);

	CU_ASSERT(flags[0].raw == 0);



	/* groups allocated by code under test. */

	free(idxd->groups);