iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bus/fsl-mc: Extend ICID size from 16bit to 32bit

Browse Source 
In virtual machines the device-id range is defined
between 0x10000-0x20000. The reason for using such a
large range is to avoid overlapping with the PCI range.

Reviewed-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
Acked-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
Signed-off-by: Bharat Bhushan <Bharat.Bhushan@nxp.com>
Signed-off-by: Laurentiu Tudor <laurentiu.tudor@nxp.com>
Signed-off-by: Diana Craciun <diana.craciun@oss.nxp.com>
Link: https://lore.kernel.org/r/20200929085441.17448-13-diana.craciun@oss.nxp.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Bharat Bhushan
2020-09-29 11:54:40 +03:00
committed by Greg Kroah-Hartman
parent 0dadd95216
commit 273ee53ddf
4 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/bus/fsl-mc/dprc.c
View File

@ -360,7 +360,7 @@ int dprc_get_attributes(struct fsl_mc_io *mc_io,
/* retrieve response parameters */ /* retrieve response parameters */
rsp_params = (struct dprc_rsp_get_attributes *)cmd.params; rsp_params = (struct dprc_rsp_get_attributes *)cmd.params;
attr->container_id = le32_to_cpu(rsp_params->container_id); attr->container_id = le32_to_cpu(rsp_params->container_id);
attr->icid = le16_to_cpu(rsp_params->icid); attr->icid = le32_to_cpu(rsp_params->icid);
attr->options = le32_to_cpu(rsp_params->options); attr->options = le32_to_cpu(rsp_params->options);
attr->portal_id = le32_to_cpu(rsp_params->portal_id); attr->portal_id = le32_to_cpu(rsp_params->portal_id);

2
drivers/bus/fsl-mc/fsl-mc-bus.c
View File

@ -503,7 +503,7 @@ common_cleanup:
} }
static int get_dprc_icid(struct fsl_mc_io *mc_io, static int get_dprc_icid(struct fsl_mc_io *mc_io,
int container_id, u16 *icid) int container_id, u32 *icid)
{ {
struct dprc_attributes attr; struct dprc_attributes attr;
int error; int error;

5
drivers/bus/fsl-mc/fsl-mc-private.h
View File

@ -159,8 +159,7 @@ struct dprc_cmd_clear_irq_status {
struct dprc_rsp_get_attributes { struct dprc_rsp_get_attributes {
/* response word 0 */ /* response word 0 */
__le32 container_id; __le32 container_id;
__le16 icid; __le32 icid;
__le16 pad;
/* response word 1 */ /* response word 1 */
__le32 options; __le32 options;
__le32 portal_id; __le32 portal_id;
@ -337,7 +336,7 @@ int dprc_clear_irq_status(struct fsl_mc_io *mc_io,
*/ */
struct dprc_attributes { struct dprc_attributes {
int container_id; int container_id;
u16 icid; u32 icid;
int portal_id; int portal_id;
u64 options; u64 options;
}; };

2
include/linux/fsl/mc.h
View File

@ -195,7 +195,7 @@ struct fsl_mc_device {
struct device dev; struct device dev;
u64 dma_mask; u64 dma_mask;
u16 flags; u16 flags;
u16 icid; u32 icid;
u16 mc_handle; u16 mc_handle;
struct fsl_mc_io *mc_io; struct fsl_mc_io *mc_io;
struct fsl_mc_obj_desc obj_desc; struct fsl_mc_obj_desc obj_desc;