Skip to content

L
linux
Commit db17c640 authored by Laurentiu Tudor's avatar Laurentiu Tudor Committed by Greg Kroah-Hartman
Browse files
Options

staging: fsl-mc: dprc: drop unused APIs 

Leave only APIs that area actually used in the bus driver.
The patch is mostly mechanical, with a couple exceptions:
 - getters/setters were not removed even if only one of
   them is being used
 - versioning API was also left in place
They will be added back on an as-needed basis.
Signed-off-by: default avatarLaurentiu Tudor <laurentiu.tudor@nxp.com>
Acked-by: default avatarStuart Yoder <stuart.yoder@nxp.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5e62af88
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 927 deletions
drivers/staging/fsl-mc/bus/dprc-cmd.h
View file @ db17c640
......@@ -53,11 +53,9 @@
/* Command IDs */
#define DPRC_CMDID_CLOSE DPRC_CMD(0x800)
#define DPRC_CMDID_OPEN DPRC_CMD(0x805)
#define DPRC_CMDID_CREATE DPRC_CMD(0x905)
#define DPRC_CMDID_GET_API_VERSION DPRC_CMD(0xa05)
#define DPRC_CMDID_GET_ATTR DPRC_CMD(0x004)
#define DPRC_CMDID_RESET_CONT DPRC_CMD(0x005)
#define DPRC_CMDID_SET_IRQ DPRC_CMD(0x010)
#define DPRC_CMDID_GET_IRQ DPRC_CMD(0x011)
......@@ -68,29 +66,13 @@
#define DPRC_CMDID_GET_IRQ_STATUS DPRC_CMD(0x016)
#define DPRC_CMDID_CLEAR_IRQ_STATUS DPRC_CMD(0x017)
#define DPRC_CMDID_CREATE_CONT DPRC_CMD(0x151)
#define DPRC_CMDID_DESTROY_CONT DPRC_CMD(0x152)
#define DPRC_CMDID_GET_CONT_ID DPRC_CMD(0x830)
#define DPRC_CMDID_SET_RES_QUOTA DPRC_CMD(0x155)
#define DPRC_CMDID_GET_RES_QUOTA DPRC_CMD(0x156)
#define DPRC_CMDID_ASSIGN DPRC_CMD(0x157)
#define DPRC_CMDID_UNASSIGN DPRC_CMD(0x158)
#define DPRC_CMDID_GET_OBJ_COUNT DPRC_CMD(0x159)
#define DPRC_CMDID_GET_OBJ DPRC_CMD(0x15A)
#define DPRC_CMDID_GET_RES_COUNT DPRC_CMD(0x15B)
#define DPRC_CMDID_GET_RES_IDS DPRC_CMD(0x15C)
#define DPRC_CMDID_GET_OBJ_REG DPRC_CMD(0x15E)
#define DPRC_CMDID_SET_OBJ_IRQ DPRC_CMD(0x15F)
#define DPRC_CMDID_GET_OBJ_IRQ DPRC_CMD(0x160)
#define DPRC_CMDID_SET_OBJ_LABEL DPRC_CMD(0x161)
#define DPRC_CMDID_GET_OBJ_DESC DPRC_CMD(0x162)
#define DPRC_CMDID_CONNECT DPRC_CMD(0x167)
#define DPRC_CMDID_DISCONNECT DPRC_CMD(0x168)
#define DPRC_CMDID_GET_POOL DPRC_CMD(0x169)
#define DPRC_CMDID_GET_POOL_COUNT DPRC_CMD(0x16A)
#define DPRC_CMDID_GET_CONNECTION DPRC_CMD(0x16C)
struct dprc_cmd_open {
__le32 container_id;
......
drivers/staging/fsl-mc/bus/dprc.c
View file @ db17c640
This diff is collapsed.
drivers/staging/fsl-mc/include/dprc.h
View file @ db17c640
......@@ -42,20 +42,6 @@
struct fsl_mc_io;
/**
* Set this value as the icid value in dprc_cfg structure when creating a
* container, in case the ICID is not selected by the user and should be
* allocated by the DPRC from the pool of ICIDs.
*/
#define DPRC_GET_ICID_FROM_POOL (u16)(~(0))
/**
* Set this value as the portal_id value in dprc_cfg structure when creating a
* container, in case the portal ID is not specifically selected by the
* user and should be allocated by the DPRC from the pool of portal ids.
*/
#define DPRC_GET_PORTAL_ID_FROM_POOL (int)(~(0))
int dprc_open(struct fsl_mc_io *mc_io,
u32 cmd_flags,
int container_id,
......@@ -65,79 +51,6 @@ int dprc_close(struct fsl_mc_io *mc_io,
u32 cmd_flags,
u16 token);
/**
* Container general options
*
* These options may be selected at container creation by the container creator
* and can be retrieved using dprc_get_attributes()
*/
/*
* Spawn Policy Option allowed - Indicates that the new container is allowed
* to spawn and have its own child containers.
*/
#define DPRC_CFG_OPT_SPAWN_ALLOWED 0x00000001
/*
* General Container allocation policy - Indicates that the new container is
* allowed to allocate requested resources from its parent container; if not
* set, the container is only allowed to use resources in its own pools; Note
* that this is a container's global policy, but the parent container may
* override it and set specific quota per resource type.
*/
#define DPRC_CFG_OPT_ALLOC_ALLOWED 0x00000002
/*
* Object initialization allowed - software context associated with this
* container is allowed to invoke object initialization operations.
*/
#define DPRC_CFG_OPT_OBJ_CREATE_ALLOWED 0x00000004
/*
* Topology change allowed - software context associated with this
* container is allowed to invoke topology operations, such as attach/detach
* of network objects.
*/
#define DPRC_CFG_OPT_TOPOLOGY_CHANGES_ALLOWED 0x00000008
/* AIOP - Indicates that container belongs to AIOP. */
#define DPRC_CFG_OPT_AIOP 0x00000020
/* IRQ Config - Indicates that the container allowed to configure its IRQs. */
#define DPRC_CFG_OPT_IRQ_CFG_ALLOWED 0x00000040
/**
* struct dprc_cfg - Container configuration options
* @icid: Container's ICID; if set to 'DPRC_GET_ICID_FROM_POOL', a free
* ICID value is allocated by the DPRC
* @portal_id: Portal ID; if set to 'DPRC_GET_PORTAL_ID_FROM_POOL', a free
* portal ID is allocated by the DPRC
* @options: Combination of 'DPRC_CFG_OPT_<X>' options
* @label: Object's label
*/
struct dprc_cfg {
u16 icid;
int portal_id;
u64 options;
char label[16];
};
int dprc_create_container(struct fsl_mc_io *mc_io,
u32 cmd_flags,
u16 token,
struct dprc_cfg *cfg,
int *child_container_id,
u64 *child_portal_offset);
int dprc_destroy_container(struct fsl_mc_io *mc_io,
u32 cmd_flags,
u16 token,
int child_container_id);
int dprc_reset_container(struct fsl_mc_io *mc_io,
u32 cmd_flags,
u16 token,
int child_container_id);
/* IRQ */
......@@ -252,90 +165,6 @@ int dprc_get_attributes(struct fsl_mc_io *mc_io,
u16 token,
struct dprc_attributes *attributes);
int dprc_set_res_quota(struct fsl_mc_io *mc_io,
u32 cmd_flags,
u16 token,
int child_container_id,
char *type,
u16 quota);
int dprc_get_res_quota(struct fsl_mc_io *mc_io,
u32 cmd_flags,
u16 token,
int child_container_id,
char *type,
u16 *quota);
/* Resource request options */
/*
* Explicit resource ID request - The requested objects/resources
* are explicit and sequential (in case of resources).
* The base ID is given at res_req at base_align field
*/
#define DPRC_RES_REQ_OPT_EXPLICIT 0x00000001
/*
* Aligned resources request - Relevant only for resources
* request (and not objects). Indicates that resources base ID should be
* sequential and aligned to the value given at dprc_res_req base_align field
*/
#define DPRC_RES_REQ_OPT_ALIGNED 0x00000002
/*
* Plugged Flag - Relevant only for object assignment request.
* Indicates that after all objects assigned. An interrupt will be invoked at
* the relevant GPP. The assigned object will be marked as plugged.
* plugged objects can't be assigned from their container
*/
#define DPRC_RES_REQ_OPT_PLUGGED 0x00000004
/**
* struct dprc_res_req - Resource request descriptor, to be used in assignment
* or un-assignment of resources and objects.
* @type: Resource/object type: Represent as a NULL terminated string.
* This string may received by using dprc_get_pool() to get resource
* type and dprc_get_obj() to get object type;
* Note: it is not possible to assign/un-assign DPRC objects
* @num: Number of resources
* @options: Request options: combination of DPRC_RES_REQ_OPT_ options
* @id_base_align: In case of explicit assignment (DPRC_RES_REQ_OPT_EXPLICIT
* is set at option), this field represents the required base ID
* for resource allocation; In case of aligned assignment
* (DPRC_RES_REQ_OPT_ALIGNED is set at option), this field
* indicates the required alignment for the resource ID(s) -
* use 0 if there is no alignment or explicit ID requirements
*/
struct dprc_res_req {
char type[16];
u32 num;
u32 options;
int id_base_align;
};
int dprc_assign(struct fsl_mc_io *mc_io,
u32 cmd_flags,
u16 token,
int container_id,
struct dprc_res_req *res_req);
int dprc_unassign(struct fsl_mc_io *mc_io,
u32 cmd_flags,
u16 token,
int child_container_id,
struct dprc_res_req *res_req);
int dprc_get_pool_count(struct fsl_mc_io *mc_io,
u32 cmd_flags,
u16 token,
int *pool_count);
int dprc_get_pool(struct fsl_mc_io *mc_io,
u32 cmd_flags,
u16 token,
int pool_index,
char *type);
int dprc_get_obj_count(struct fsl_mc_io *mc_io,
u32 cmd_flags,
u16 token,
......@@ -430,27 +259,6 @@ enum dprc_iter_status {
DPRC_ITER_STATUS_LAST = 2
};
/**
* struct dprc_res_ids_range_desc - Resource ID range descriptor
* @base_id: Base resource ID of this range
* @last_id: Last resource ID of this range
* @iter_status: Iteration status - should be set to DPRC_ITER_STATUS_FIRST at
* first iteration; while the returned marker is DPRC_ITER_STATUS_MORE,
* additional iterations are needed, until the returned marker is
* DPRC_ITER_STATUS_LAST
*/
struct dprc_res_ids_range_desc {
int base_id;
int last_id;
enum dprc_iter_status iter_status;
};
int dprc_get_res_ids(struct fsl_mc_io *mc_io,
u32 cmd_flags,
u16 token,
char *type,
struct dprc_res_ids_range_desc *range_desc);
/* Region flags */
/* Cacheable - Indicates that region should be mapped as cacheable */
#define DPRC_REGION_CACHEABLE 0x00000001
......@@ -490,57 +298,6 @@ int dprc_get_obj_region(struct fsl_mc_io *mc_io,
u8 region_index,
struct dprc_region_desc *region_desc);
int dprc_set_obj_label(struct fsl_mc_io *mc_io,
u32 cmd_flags,
u16 token,
char *obj_type,
int obj_id,
char *label);
/**
* struct dprc_endpoint - Endpoint description for link connect/disconnect
* operations
* @type: Endpoint object type: NULL terminated string
* @id: Endpoint object ID
* @if_id: Interface ID; should be set for endpoints with multiple
* interfaces ("dpsw", "dpdmux"); for others, always set to 0
*/
struct dprc_endpoint {
char type[16];
int id;
int if_id;
};
/**
* struct dprc_connection_cfg - Connection configuration.
* Used for virtual connections only
* @committed_rate: Committed rate (Mbits/s)
* @max_rate: Maximum rate (Mbits/s)
*/
struct dprc_connection_cfg {
u32 committed_rate;
u32 max_rate;
};
int dprc_connect(struct fsl_mc_io *mc_io,
u32 cmd_flags,
u16 token,
const struct dprc_endpoint *endpoint1,
const struct dprc_endpoint *endpoint2,
const struct dprc_connection_cfg *cfg);
int dprc_disconnect(struct fsl_mc_io *mc_io,
u32 cmd_flags,
u16 token,
const struct dprc_endpoint *endpoint);
int dprc_get_connection(struct fsl_mc_io *mc_io,
u32 cmd_flags,
u16 token,
const struct dprc_endpoint *endpoint1,
struct dprc_endpoint *endpoint2,
int *state);
int dprc_get_api_version(struct fsl_mc_io *mc_io,
u32 cmd_flags,
u16 *major_ver,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7