Upgrade Manage Complex (MC) flib API to 0.5.2. Rename directory fsl_mc to fsl-mc. Change the fsl-mc node in Linux device tree from "fsl,dprcr" to "fsl-mc". Print MC version info when appropriate. Signed-off-by: J. German Rivera <German.Rivera@freescale.com> Signed-off-by: Lijun Pan <Lijun.Pan@freescale.com> Reviewed-by: York Sun <yorksun@freescale.com>master
J. German Rivera
10 years ago
committed by
York Sun
parent
4f2532c4a4
commit
7b3bd9a798
@ -0,0 +1,91 @@ |
||||
/* Copyright 2014 Freescale Semiconductor Inc.
|
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
#include <fsl-mc/fsl_mc_sys.h> |
||||
#include <fsl-mc/fsl_mc_cmd.h> |
||||
#include <fsl-mc/fsl_dpmng.h> |
||||
#include "fsl_dpmng_cmd.h" |
||||
|
||||
int mc_get_version(struct fsl_mc_io *mc_io, struct mc_version *mc_ver_info) |
||||
{ |
||||
struct mc_command cmd = { 0 }; |
||||
int err; |
||||
|
||||
/* prepare command */ |
||||
cmd.header = mc_encode_cmd_header(DPMNG_CMDID_GET_VERSION, |
||||
MC_CMD_PRI_LOW, 0); |
||||
|
||||
/* send command to mc*/ |
||||
err = mc_send_command(mc_io, &cmd); |
||||
if (err) |
||||
return err; |
||||
|
||||
/* retrieve response parameters */ |
||||
DPMNG_RSP_GET_VERSION(cmd, mc_ver_info); |
||||
|
||||
return 0; |
||||
} |
||||
|
||||
int dpmng_reset_aiop(struct fsl_mc_io *mc_io, int container_id, |
||||
int aiop_tile_id) |
||||
{ |
||||
struct mc_command cmd = { 0 }; |
||||
|
||||
/* prepare command */ |
||||
cmd.header = mc_encode_cmd_header(DPMNG_CMDID_RESET_AIOP, |
||||
MC_CMD_PRI_LOW, 0); |
||||
DPMNG_CMD_RESET_AIOP(cmd, container_id, aiop_tile_id); |
||||
|
||||
/* send command to mc*/ |
||||
return mc_send_command(mc_io, &cmd); |
||||
} |
||||
|
||||
int dpmng_load_aiop(struct fsl_mc_io *mc_io, |
||||
int container_id, |
||||
int aiop_tile_id, |
||||
uint64_t img_iova, |
||||
uint32_t img_size) |
||||
{ |
||||
struct mc_command cmd = { 0 }; |
||||
|
||||
/* prepare command */ |
||||
cmd.header = mc_encode_cmd_header(DPMNG_CMDID_LOAD_AIOP, |
||||
MC_CMD_PRI_LOW, |
||||
0); |
||||
DPMNG_CMD_LOAD_AIOP(cmd, container_id, aiop_tile_id, img_size, |
||||
img_iova); |
||||
|
||||
/* send command to mc*/ |
||||
return mc_send_command(mc_io, &cmd); |
||||
} |
||||
|
||||
int dpmng_run_aiop(struct fsl_mc_io *mc_io, |
||||
int container_id, |
||||
int aiop_tile_id, |
||||
const struct dpmng_aiop_run_cfg *cfg) |
||||
{ |
||||
struct mc_command cmd = { 0 }; |
||||
|
||||
/* prepare command */ |
||||
cmd.header = mc_encode_cmd_header(DPMNG_CMDID_RUN_AIOP, |
||||
MC_CMD_PRI_LOW, |
||||
0); |
||||
DPMNG_CMD_RUN_AIOP(cmd, container_id, aiop_tile_id, cfg); |
||||
|
||||
/* send command to mc*/ |
||||
return mc_send_command(mc_io, &cmd); |
||||
} |
||||
|
||||
int dpmng_reset_mc_portal(struct fsl_mc_io *mc_io) |
||||
{ |
||||
struct mc_command cmd = { 0 }; |
||||
|
||||
/* prepare command */ |
||||
cmd.header = mc_encode_cmd_header(DPMNG_CMDID_RESET_MC_PORTAL, |
||||
MC_CMD_PRI_LOW, |
||||
0); |
||||
|
||||
/* send command to mc*/ |
||||
return mc_send_command(mc_io, &cmd); |
||||
} |
||||
@ -0,0 +1,49 @@ |
||||
/* Copyright 2014 Freescale Semiconductor Inc.
|
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
#ifndef __FSL_DPMNG_CMD_H |
||||
#define __FSL_DPMNG_CMD_H |
||||
|
||||
/* Command IDs */ |
||||
#define DPMNG_CMDID_GET_VERSION 0x831 |
||||
#define DPMNG_CMDID_RESET_AIOP 0x832 |
||||
#define DPMNG_CMDID_LOAD_AIOP 0x833 |
||||
#define DPMNG_CMDID_RUN_AIOP 0x834 |
||||
#define DPMNG_CMDID_RESET_MC_PORTAL 0x835 |
||||
|
||||
/* cmd, param, offset, width, type, arg_name */ |
||||
#define DPMNG_RSP_GET_VERSION(cmd, mc_ver_info) \ |
||||
do { \
|
||||
MC_RSP_OP(cmd, 0, 0, 32, uint32_t, mc_ver_info->revision); \
|
||||
MC_RSP_OP(cmd, 0, 32, 32, uint32_t, mc_ver_info->major); \
|
||||
MC_RSP_OP(cmd, 1, 0, 32, uint32_t, mc_ver_info->minor); \
|
||||
} while (0) |
||||
|
||||
/* cmd, param, offset, width, type, arg_name */ |
||||
#define DPMNG_CMD_RESET_AIOP(cmd, container_id, aiop_tile_id) \ |
||||
do { \
|
||||
MC_CMD_OP(cmd, 0, 0, 32, int, aiop_tile_id); \
|
||||
MC_CMD_OP(cmd, 0, 32, 32, int, container_id); \
|
||||
} while (0) |
||||
|
||||
/* cmd, param, offset, width, type, arg_name */ |
||||
#define DPMNG_CMD_LOAD_AIOP(cmd, container_id, aiop_tile_id, img_size, \ |
||||
img_iova) \
|
||||
do { \
|
||||
MC_CMD_OP(cmd, 0, 0, 32, int, aiop_tile_id); \
|
||||
MC_CMD_OP(cmd, 0, 32, 32, int, container_id); \
|
||||
MC_CMD_OP(cmd, 1, 0, 32, uint32_t, img_size); \
|
||||
MC_CMD_OP(cmd, 2, 0, 64, uint64_t, img_iova); \
|
||||
} while (0) |
||||
|
||||
/* cmd, param, offset, width, type, arg_name */ |
||||
#define DPMNG_CMD_RUN_AIOP(cmd, container_id, aiop_tile_id, cfg) \ |
||||
do { \
|
||||
MC_CMD_OP(cmd, 0, 0, 32, int, aiop_tile_id); \
|
||||
MC_CMD_OP(cmd, 0, 32, 32, int, container_id); \
|
||||
MC_CMD_OP(cmd, 1, 0, 32, uint32_t, cfg->cores_mask); \
|
||||
MC_CMD_OP(cmd, 2, 0, 64, uint64_t, cfg->options); \
|
||||
} while (0) |
||||
|
||||
#endif /* __FSL_DPMNG_CMD_H */ |
||||
@ -0,0 +1,63 @@ |
||||
/*
|
||||
* Freescale Layerscape MC I/O wrapper |
||||
* |
||||
* Copyright (C) 2014 Freescale Semiconductor, Inc. |
||||
* Author: German Rivera <German.Rivera@freescale.com> |
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
|
||||
#include <fsl-mc/fsl_mc_sys.h> |
||||
#include <fsl-mc/fsl_mc_cmd.h> |
||||
#include <common.h> |
||||
#include <errno.h> |
||||
#include <asm/io.h> |
||||
|
||||
#define MC_CMD_HDR_READ_CMDID(_hdr) \ |
||||
((uint16_t)u64_dec((_hdr), MC_CMD_HDR_CMDID_O, MC_CMD_HDR_CMDID_S)) |
||||
|
||||
/**
|
||||
* mc_send_command - Send MC command and wait for response |
||||
* |
||||
* @mc_io: Pointer to MC I/O object to be used |
||||
* @cmd: MC command buffer. On input, it contains the command to send to the MC. |
||||
* On output, it contains the response from the MC if any. |
||||
* |
||||
* Depending on the sharing option specified when creating the MC portal |
||||
* wrapper, this function will use a spinlock or mutex to ensure exclusive |
||||
* access to the MC portal from the point when the command is sent until a |
||||
* response is received from the MC. |
||||
*/ |
||||
int mc_send_command(struct fsl_mc_io *mc_io, |
||||
struct mc_command *cmd) |
||||
{ |
||||
enum mc_cmd_status status; |
||||
int timeout = 2000; |
||||
|
||||
mc_write_command(mc_io->mmio_regs, cmd); |
||||
|
||||
for ( ; ; ) { |
||||
status = mc_read_response(mc_io->mmio_regs, cmd); |
||||
if (status != MC_CMD_STATUS_READY) |
||||
break; |
||||
|
||||
if (--timeout == 0) { |
||||
printf("Error: Timeout waiting for MC response\n"); |
||||
return -ETIMEDOUT; |
||||
} |
||||
|
||||
udelay(500); |
||||
} |
||||
|
||||
if (status != MC_CMD_STATUS_OK) { |
||||
printf("Error: MC command failed (portal: %p, obj handle: %#x, command: %#x, status: %#x)\n", |
||||
mc_io->mmio_regs, |
||||
(unsigned int)MC_CMD_HDR_READ_AUTHID(cmd->header), |
||||
(unsigned int)MC_CMD_HDR_READ_CMDID(cmd->header), |
||||
(unsigned int)status); |
||||
|
||||
return -EIO; |
||||
} |
||||
|
||||
return 0; |
||||
} |
||||
@ -0,0 +1,121 @@ |
||||
/* Copyright 2014 Freescale Semiconductor Inc.
|
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
/*!
|
||||
* @file fsl_dpmng.h |
||||
* @brief Management Complex General API |
||||
*/ |
||||
|
||||
#ifndef __FSL_DPMNG_H |
||||
#define __FSL_DPMNG_H |
||||
|
||||
/*!
|
||||
* @Group grp_dpmng Management Complex General API |
||||
* |
||||
* @brief Contains general API for the Management Complex firmware |
||||
* @{ |
||||
*/ |
||||
|
||||
struct fsl_mc_io; |
||||
|
||||
/**
|
||||
* @brief Management Complex firmware version information |
||||
*/ |
||||
#define MC_VER_MAJOR 4 |
||||
#define MC_VER_MINOR 0 |
||||
|
||||
struct mc_version { |
||||
uint32_t major; |
||||
/*!< Major version number: incremented on API compatibility changes */ |
||||
uint32_t minor; |
||||
/*!< Minor version number: incremented on API additions (that are
|
||||
* backward compatible); reset when major version is incremented |
||||
*/ |
||||
uint32_t revision; |
||||
/*!< Internal revision number: incremented on implementation changes
|
||||
* and/or bug fixes that have no impact on API |
||||
*/ |
||||
}; |
||||
|
||||
/**
|
||||
* @brief Retrieves the Management Complex firmware version information |
||||
* |
||||
* @param[in] mc_io Pointer to opaque I/O object |
||||
* @param[out] mc_ver_info Pointer to version information structure |
||||
* |
||||
* @returns '0' on Success; Error code otherwise. |
||||
*/ |
||||
int mc_get_version(struct fsl_mc_io *mc_io, struct mc_version *mc_ver_info); |
||||
|
||||
/**
|
||||
* @brief Resets an AIOP tile |
||||
* |
||||
* @param[in] mc_io Pointer to opaque I/O object |
||||
* @param[in] container_id AIOP container ID |
||||
* @param[in] aiop_tile_id AIOP tile ID to reset |
||||
* |
||||
* @returns '0' on Success; Error code otherwise. |
||||
*/ |
||||
int dpmng_reset_aiop(struct fsl_mc_io *mc_io, |
||||
int container_id, |
||||
int aiop_tile_id); |
||||
|
||||
/**
|
||||
* @brief Loads an image to AIOP tile |
||||
* |
||||
* @param[in] mc_io Pointer to opaque I/O object |
||||
* @param[in] container_id AIOP container ID |
||||
* @param[in] aiop_tile_id AIOP tile ID to reset |
||||
* @param[in] img_iova I/O virtual address of AIOP ELF image |
||||
* @param[in] img_size Size of AIOP ELF image in memory (in bytes) |
||||
* |
||||
* @returns '0' on Success; Error code otherwise. |
||||
*/ |
||||
int dpmng_load_aiop(struct fsl_mc_io *mc_io, |
||||
int container_id, |
||||
int aiop_tile_id, |
||||
uint64_t img_iova, |
||||
uint32_t img_size); |
||||
|
||||
/**
|
||||
* @brief AIOP run configuration |
||||
*/ |
||||
struct dpmng_aiop_run_cfg { |
||||
uint32_t cores_mask; |
||||
/*!< Mask of AIOP cores to run (core 0 in most significant bit) */ |
||||
uint64_t options; |
||||
/*!< Execution options (currently none defined) */ |
||||
}; |
||||
|
||||
/**
|
||||
* @brief Starts AIOP tile execution |
||||
* |
||||
* @param[in] mc_io Pointer to MC portal's I/O object |
||||
* @param[in] container_id AIOP container ID |
||||
* @param[in] aiop_tile_id AIOP tile ID to reset |
||||
* @param[in] cfg AIOP run configuration |
||||
* |
||||
* @returns '0' on Success; Error code otherwise. |
||||
*/ |
||||
int dpmng_run_aiop(struct fsl_mc_io *mc_io, |
||||
int container_id, |
||||
int aiop_tile_id, |
||||
const struct dpmng_aiop_run_cfg *cfg); |
||||
|
||||
/**
|
||||
* @brief Resets MC portal |
||||
* |
||||
* This function closes all object handles (tokens) that are currently |
||||
* open in the MC portal on which the command is submitted. This allows |
||||
* cleanup of stale handles that belong to non-functional user processes. |
||||
* |
||||
* @param[in] mc_io Pointer to MC portal's I/O object |
||||
* |
||||
* @returns '0' on Success; Error code otherwise. |
||||
*/ |
||||
int dpmng_reset_mc_portal(struct fsl_mc_io *mc_io); |
||||
|
||||
/** @} */ |
||||
|
||||
#endif /* __FSL_DPMNG_H */ |
||||
@ -0,0 +1,132 @@ |
||||
/* Copyright 2014 Freescale Semiconductor Inc.
|
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
#ifndef __FSL_MC_CMD_H |
||||
#define __FSL_MC_CMD_H |
||||
|
||||
#define MC_CMD_NUM_OF_PARAMS 7 |
||||
|
||||
#define MAKE_UMASK64(_width) \ |
||||
((uint64_t)((_width) < 64 ? ((uint64_t)1 << (_width)) - 1 : -1)) |
||||
|
||||
static inline uint64_t u64_enc(int lsoffset, int width, uint64_t val) |
||||
{ |
||||
return (uint64_t)(((uint64_t)val & MAKE_UMASK64(width)) << lsoffset); |
||||
} |
||||
static inline uint64_t u64_dec(uint64_t val, int lsoffset, int width) |
||||
{ |
||||
return (uint64_t)((val >> lsoffset) & MAKE_UMASK64(width)); |
||||
} |
||||
|
||||
struct mc_command { |
||||
uint64_t header; |
||||
uint64_t params[MC_CMD_NUM_OF_PARAMS]; |
||||
}; |
||||
|
||||
enum mc_cmd_status { |
||||
MC_CMD_STATUS_OK = 0x0, /*!< Completed successfully */ |
||||
MC_CMD_STATUS_READY = 0x1, /*!< Ready to be processed */ |
||||
MC_CMD_STATUS_AUTH_ERR = 0x3, /*!< Authentication error */ |
||||
MC_CMD_STATUS_NO_PRIVILEGE = 0x4, /*!< No privilege */ |
||||
MC_CMD_STATUS_DMA_ERR = 0x5, /*!< DMA or I/O error */ |
||||
MC_CMD_STATUS_CONFIG_ERR = 0x6, /*!< Configuration error */ |
||||
MC_CMD_STATUS_TIMEOUT = 0x7, /*!< Operation timed out */ |
||||
MC_CMD_STATUS_NO_RESOURCE = 0x8, /*!< No resources */ |
||||
MC_CMD_STATUS_NO_MEMORY = 0x9, /*!< No memory available */ |
||||
MC_CMD_STATUS_BUSY = 0xA, /*!< Device is busy */ |
||||
MC_CMD_STATUS_UNSUPPORTED_OP = 0xB, /*!< Unsupported operation */ |
||||
MC_CMD_STATUS_INVALID_STATE = 0xC /*!< Invalid state */ |
||||
}; |
||||
|
||||
#define MC_CMD_HDR_CMDID_O 52 /* Command ID field offset */ |
||||
#define MC_CMD_HDR_CMDID_S 12 /* Command ID field size */ |
||||
#define MC_CMD_HDR_AUTHID_O 38 /* Authentication ID field offset */ |
||||
#define MC_CMD_HDR_AUTHID_S 10 /* Authentication ID field size */ |
||||
#define MC_CMD_HDR_STATUS_O 16 /* Status field offset */ |
||||
#define MC_CMD_HDR_STATUS_S 8 /* Status field size*/ |
||||
#define MC_CMD_HDR_PRI_O 15 /* Priority field offset */ |
||||
#define MC_CMD_HDR_PRI_S 1 /* Priority field size */ |
||||
|
||||
#define MC_CMD_HDR_READ_STATUS(_hdr) \ |
||||
((enum mc_cmd_status)u64_dec((_hdr), \
|
||||
MC_CMD_HDR_STATUS_O, MC_CMD_HDR_STATUS_S)) |
||||
|
||||
#define MC_CMD_HDR_READ_AUTHID(_hdr) \ |
||||
((uint16_t)u64_dec((_hdr), MC_CMD_HDR_AUTHID_O, MC_CMD_HDR_AUTHID_S)) |
||||
|
||||
#define MC_CMD_PRI_LOW 0 /*!< Low Priority command indication */ |
||||
#define MC_CMD_PRI_HIGH 1 /*!< High Priority command indication */ |
||||
|
||||
#define MC_CMD_OP(_cmd, _param, _offset, _width, _type, _arg) \ |
||||
((_cmd).params[_param] |= u64_enc((_offset), (_width), _arg)) |
||||
|
||||
#define MC_RSP_OP(_cmd, _param, _offset, _width, _type, _arg) \ |
||||
(_arg = (_type)u64_dec(_cmd.params[_param], (_offset), (_width))) |
||||
|
||||
static inline uint64_t mc_encode_cmd_header(uint16_t cmd_id, |
||||
uint8_t priority, |
||||
uint16_t auth_id) |
||||
{ |
||||
uint64_t hdr; |
||||
|
||||
hdr = u64_enc(MC_CMD_HDR_CMDID_O, MC_CMD_HDR_CMDID_S, cmd_id); |
||||
hdr |= u64_enc(MC_CMD_HDR_AUTHID_O, MC_CMD_HDR_AUTHID_S, auth_id); |
||||
hdr |= u64_enc(MC_CMD_HDR_PRI_O, MC_CMD_HDR_PRI_S, priority); |
||||
hdr |= u64_enc(MC_CMD_HDR_STATUS_O, MC_CMD_HDR_STATUS_S, |
||||
MC_CMD_STATUS_READY); |
||||
|
||||
return hdr; |
||||
} |
||||
|
||||
/**
|
||||
* mc_write_command - writes a command to a Management Complex (MC) portal |
||||
* |
||||
* @portal: pointer to an MC portal |
||||
* @cmd: pointer to a filled command |
||||
*/ |
||||
static inline void mc_write_command(struct mc_command __iomem *portal, |
||||
struct mc_command *cmd) |
||||
{ |
||||
int i; |
||||
|
||||
/* copy command parameters into the portal */ |
||||
for (i = 0; i < MC_CMD_NUM_OF_PARAMS; i++) |
||||
writeq(cmd->params[i], &portal->params[i]); |
||||
|
||||
/* submit the command by writing the header */ |
||||
writeq(cmd->header, &portal->header); |
||||
} |
||||
|
||||
/**
|
||||
* mc_read_response - reads the response for the last MC command from a |
||||
* Management Complex (MC) portal |
||||
* |
||||
* @portal: pointer to an MC portal |
||||
* @resp: pointer to command response buffer |
||||
* |
||||
* Returns MC_CMD_STATUS_OK on Success; Error code otherwise. |
||||
*/ |
||||
static inline enum mc_cmd_status mc_read_response( |
||||
struct mc_command __iomem *portal, |
||||
struct mc_command *resp) |
||||
{ |
||||
int i; |
||||
enum mc_cmd_status status; |
||||
|
||||
/* Copy command response header from MC portal: */ |
||||
resp->header = readq(&portal->header); |
||||
status = MC_CMD_HDR_READ_STATUS(resp->header); |
||||
if (status != MC_CMD_STATUS_OK) |
||||
return status; |
||||
|
||||
/* Copy command response data from MC portal: */ |
||||
for (i = 0; i < MC_CMD_NUM_OF_PARAMS; i++) |
||||
resp->params[i] = readq(&portal->params[i]); |
||||
|
||||
return status; |
||||
} |
||||
|
||||
int mc_send_command(struct fsl_mc_io *mc_io, struct mc_command *cmd); |
||||
|
||||
#endif /* __FSL_MC_CMD_H */ |
||||
@ -0,0 +1,26 @@ |
||||
/*
|
||||
* Freescale Layerscape Management Complex (MC) Environment-specific code |
||||
* |
||||
* Copyright (C) 2014 Freescale Semiconductor, Inc. |
||||
* |
||||
* SPDX-License-Identifier: GPL-2.0+ |
||||
*/ |
||||
|
||||
#ifndef _FSL_MC_SYS_H |
||||
#define _FSL_MC_SYS_H |
||||
|
||||
#include <asm/io.h> |
||||
|
||||
struct mc_command; |
||||
|
||||
/*
|
||||
* struct mc_portal_wrapper - MC command portal wrapper object |
||||
*/ |
||||
struct fsl_mc_io { |
||||
struct mc_command __iomem *mmio_regs; |
||||
}; |
||||
|
||||
int mc_send_command(struct fsl_mc_io *mc_io, |
||||
struct mc_command *cmd); |
||||
|
||||
#endif /* _FSL_MC_SYS_H */ |
||||
Loading…
Reference in new issue