From: Diana Craciun <diana.craciun@nxp.com>
To: linux-kernel@vger.kernel.org, laurentiu.tudor@nxp.com,
gregkh@linuxfoundation.org
Cc: stuyoder@gmail.com, leoyang.li@nxp.com,
linux-arm-kernel@lists.infradead.org, bharatb.linux@gmail.com,
Bharat Bhushan <Bharat.Bhushan@nxp.com>,
Diana Craciun <diana.craciun@oss.nxp.com>
Subject: [PATCH v3 12/13] bus/fsl-mc: Extend ICID size from 16bit to 32bit
Date: Mon, 6 Jul 2020 15:42:42 +0300 [thread overview]
Message-ID: <20200706124243.10697-13-diana.craciun@nxp.com> (raw)
In-Reply-To: <20200706124243.10697-1-diana.craciun@nxp.com>
From: Bharat Bhushan <Bharat.Bhushan@nxp.com>
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.
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>
---
drivers/bus/fsl-mc/dprc.c | 2 +-
drivers/bus/fsl-mc/fsl-mc-bus.c | 2 +-
drivers/bus/fsl-mc/fsl-mc-private.h | 5 ++---
include/linux/fsl/mc.h | 2 +-
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/bus/fsl-mc/dprc.c b/drivers/bus/fsl-mc/dprc.c
index 44bde72bdea7..3f08752c2c19 100644
--- a/drivers/bus/fsl-mc/dprc.c
+++ b/drivers/bus/fsl-mc/dprc.c
@@ -360,7 +360,7 @@ int dprc_get_attributes(struct fsl_mc_io *mc_io,
/* retrieve response parameters */
rsp_params = (struct dprc_rsp_get_attributes *)cmd.params;
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->portal_id = le32_to_cpu(rsp_params->portal_id);
diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c
index bf4f01ddf846..f44a5e9d0c4a 100644
--- a/drivers/bus/fsl-mc/fsl-mc-bus.c
+++ b/drivers/bus/fsl-mc/fsl-mc-bus.c
@@ -461,7 +461,7 @@ static int get_dprc_attr(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;
int error;
diff --git a/drivers/bus/fsl-mc/fsl-mc-private.h b/drivers/bus/fsl-mc/fsl-mc-private.h
index 48255e8944bd..e6fcff12c68d 100644
--- a/drivers/bus/fsl-mc/fsl-mc-private.h
+++ b/drivers/bus/fsl-mc/fsl-mc-private.h
@@ -159,8 +159,7 @@ struct dprc_cmd_clear_irq_status {
struct dprc_rsp_get_attributes {
/* response word 0 */
__le32 container_id;
- __le16 icid;
- __le16 pad;
+ __le32 icid;
/* response word 1 */
__le32 options;
__le32 portal_id;
@@ -337,7 +336,7 @@ int dprc_clear_irq_status(struct fsl_mc_io *mc_io,
*/
struct dprc_attributes {
int container_id;
- u16 icid;
+ u32 icid;
int portal_id;
u64 options;
};
diff --git a/include/linux/fsl/mc.h b/include/linux/fsl/mc.h
index 8ee4e919e860..96e8d7e33858 100644
--- a/include/linux/fsl/mc.h
+++ b/include/linux/fsl/mc.h
@@ -195,7 +195,7 @@ struct fsl_mc_device {
struct device dev;
u64 dma_mask;
u16 flags;
- u16 icid;
+ u32 icid;
u16 mc_handle;
struct fsl_mc_io *mc_io;
struct fsl_mc_obj_desc obj_desc;
--
2.17.1
next prev parent reply other threads:[~2020-07-06 12:43 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-06 12:42 [PATCH v3 00/13] bus/fsl-mc: Extend mc-bus driver functionalities in preparation for mc-bus VFIO support Diana Craciun
2020-07-06 12:42 ` [PATCH v3 01/13] bus/fsl-mc: Do no longer export the total number of irqs outside dprc_scan_objects Diana Craciun
2020-07-06 12:42 ` [PATCH v3 02/13] bus/fsl-mc: Add a new parameter to dprc_scan_objects function Diana Craciun
2020-07-06 12:42 ` [PATCH v3 03/13] bus/fsl-mc: add support for 'driver_override' in the mc-bus Diana Craciun
2020-07-06 13:57 ` Andrew Lunn
2020-07-06 16:35 ` Diana Craciun OSS
2020-07-06 12:42 ` [PATCH v3 04/13] bus/fsl-mc: Set the QMAN/BMAN region flags Diana Craciun
2020-07-06 12:42 ` [PATCH v3 05/13] bus/fsl-mc: Cache the DPRC API version Diana Craciun
2020-07-06 12:42 ` [PATCH v3 06/13] bus/fsl-mc: Add dprc-reset-container support Diana Craciun
2020-07-06 12:42 ` [PATCH v3 07/13] bus/fsl-mc: Export a dprc scan function to be used by multiple entities Diana Craciun
2020-07-06 12:42 ` [PATCH v3 08/13] bus/fsl-mc: Export a cleanup function for DPRC Diana Craciun
2020-07-06 12:42 ` [PATCH v3 09/13] bus/fsl-mc: Add a container setup function Diana Craciun
2020-07-06 12:42 ` [PATCH v3 10/13] bus/fsl_mc: Do not rely on caller to provide non NULL mc_io Diana Craciun
2020-07-06 12:42 ` [PATCH v3 11/13] bus/fsl-mc: Export IRQ pool handling functions to be used by VFIO Diana Craciun
2020-07-06 12:42 ` Diana Craciun [this message]
2020-07-06 12:42 ` [PATCH v3 13/13] bus/fsl-mc: Add a new version for dprc_get_obj_region command Diana Craciun
2020-07-06 13:14 ` Laurentiu Tudor
2020-07-06 15:49 ` Diana Craciun OSS
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200706124243.10697-13-diana.craciun@nxp.com \
--to=diana.craciun@nxp.com \
--cc=Bharat.Bhushan@nxp.com \
--cc=bharatb.linux@gmail.com \
--cc=diana.craciun@oss.nxp.com \
--cc=gregkh@linuxfoundation.org \
--cc=laurentiu.tudor@nxp.com \
--cc=leoyang.li@nxp.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stuyoder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).