UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: fsl-mc: update dpmcp binary interface to v3.0 

Signed-off-by: Stuart Yoder <stuart.yoder@nxp.com>
Acked-by: German Rivera <german.rivera@nxp.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Stuart Yoder 2016-04-11 11:48:48 -05:00 committed by Greg Kroah-Hartman
parent 7dc0818367
commit f8274454bc
3 changed files with 6 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/fsl-mc/bus/dpmcp-cmd.h
View File

@ -33,8 +33,8 @@
#define _FSL_DPMCP_CMD_H #define _FSL_DPMCP_CMD_H
/* DPMCP Version */ /* DPMCP Version */
#define DPMCP_VER_MAJOR 2 #define DPMCP_VER_MAJOR 3
#define DPMCP_VER_MINOR 1 #define DPMCP_VER_MINOR 0
/* Command IDs */ /* Command IDs */
#define DPMCP_CMDID_CLOSE 0x800 #define DPMCP_CMDID_CLOSE 0x800
@ -52,6 +52,5 @@
#define DPMCP_CMDID_SET_IRQ_MASK 0x014 #define DPMCP_CMDID_SET_IRQ_MASK 0x014
#define DPMCP_CMDID_GET_IRQ_MASK 0x015 #define DPMCP_CMDID_GET_IRQ_MASK 0x015
#define DPMCP_CMDID_GET_IRQ_STATUS 0x016 #define DPMCP_CMDID_GET_IRQ_STATUS 0x016
#define DPMCP_CMDID_CLEAR_IRQ_STATUS 0x017
#endif /* _FSL_DPMCP_CMD_H */ #endif /* _FSL_DPMCP_CMD_H */

35
drivers/staging/fsl-mc/bus/dpmcp.c
View File

@ -213,7 +213,7 @@ int dpmcp_set_irq(struct fsl_mc_io *mc_io,
cmd.params[0] |= mc_enc(0, 8, irq_index); cmd.params[0] |= mc_enc(0, 8, irq_index);
cmd.params[0] |= mc_enc(32, 32, irq_cfg->val); cmd.params[0] |= mc_enc(32, 32, irq_cfg->val);
cmd.params[1] |= mc_enc(0, 64, irq_cfg->paddr); cmd.params[1] |= mc_enc(0, 64, irq_cfg->paddr);
cmd.params[2] |= mc_enc(0, 32, irq_cfg->user_irq_id); cmd.params[2] |= mc_enc(0, 32, irq_cfg->irq_num);
/* send command to mc*/ /* send command to mc*/
return mc_send_command(mc_io, &cmd); return mc_send_command(mc_io, &cmd);
@ -254,7 +254,7 @@ int dpmcp_get_irq(struct fsl_mc_io *mc_io,
/* retrieve response parameters */ /* retrieve response parameters */
irq_cfg->val = (u32)mc_dec(cmd.params[0], 0, 32); irq_cfg->val = (u32)mc_dec(cmd.params[0], 0, 32);
irq_cfg->paddr = (u64)mc_dec(cmd.params[1], 0, 64); irq_cfg->paddr = (u64)mc_dec(cmd.params[1], 0, 64);
irq_cfg->user_irq_id = (int)mc_dec(cmd.params[2], 0, 32); irq_cfg->irq_num = (int)mc_dec(cmd.params[2], 0, 32);
*type = (int)mc_dec(cmd.params[2], 32, 32); *type = (int)mc_dec(cmd.params[2], 32, 32);
return 0; return 0;
} }
@ -434,37 +434,6 @@ int dpmcp_get_irq_status(struct fsl_mc_io *mc_io,
return 0; return 0;
} }
/**
* dpmcp_clear_irq_status() - Clear a pending interrupt's status
*
* @mc_io: Pointer to MC portal's I/O object
* @cmd_flags: Command flags; one or more of 'MC_CMD_FLAG_'
* @token: Token of DPMCP object
* @irq_index: The interrupt index to configure
* @status: Bits to clear (W1C) - one bit per cause:
* 0 = don't change
* 1 = clear status bit
*
* Return: '0' on Success; Error code otherwise.
*/
int dpmcp_clear_irq_status(struct fsl_mc_io *mc_io,
u32 cmd_flags,
u16 token,
u8 irq_index,
u32 status)
{
struct mc_command cmd = { 0 };
/* prepare command */
cmd.header = mc_encode_cmd_header(DPMCP_CMDID_CLEAR_IRQ_STATUS,
cmd_flags, token);
cmd.params[0] |= mc_enc(0, 32, status);
cmd.params[0] |= mc_enc(32, 8, irq_index);
/* send command to mc*/
return mc_send_command(mc_io, &cmd);
}
/** /**
* dpmcp_get_attributes - Retrieve DPMCP attributes. * dpmcp_get_attributes - Retrieve DPMCP attributes.
* *

10
drivers/staging/fsl-mc/bus/dpmcp.h
View File

@ -82,12 +82,12 @@ int dpmcp_reset(struct fsl_mc_io *mc_io,
* struct dpmcp_irq_cfg - IRQ configuration * struct dpmcp_irq_cfg - IRQ configuration
* @paddr: Address that must be written to signal a message-based interrupt * @paddr: Address that must be written to signal a message-based interrupt
* @val: Value to write into irq_addr address * @val: Value to write into irq_addr address
* @user_irq_id: A user defined number associated with this IRQ * @irq_num: A user defined number associated with this IRQ
*/ */
struct dpmcp_irq_cfg { struct dpmcp_irq_cfg {
uint64_t paddr; uint64_t paddr;
uint32_t val; uint32_t val;
int user_irq_id; int irq_num;
}; };
int dpmcp_set_irq(struct fsl_mc_io *mc_io, int dpmcp_set_irq(struct fsl_mc_io *mc_io,
@ -133,12 +133,6 @@ int dpmcp_get_irq_status(struct fsl_mc_io *mc_io,
uint8_t irq_index, uint8_t irq_index,
uint32_t *status); uint32_t *status);
int dpmcp_clear_irq_status(struct fsl_mc_io *mc_io,
uint32_t cmd_flags,
uint16_t token,
uint8_t irq_index,
uint32_t status);
/** /**
* struct dpmcp_attr - Structure representing DPMCP attributes * struct dpmcp_attr - Structure representing DPMCP attributes
* @id: DPMCP object ID * @id: DPMCP object ID