From: Ioana Ciornei <[email protected]>
This patch set adds a fix on the userspace support of the fsl-mc bus.
Other than that, a missing device type is added and some other commands
to the list of the accepted ones.
Dan Carpenter (1):
bus: fsl-mc: Fix test for end of loop
Ioana Ciornei (2):
bus: fsl-mc: add the dpdbg device type
bus: fsl-mc: list more commands as accepted through the ioctl
drivers/bus/fsl-mc/fsl-mc-bus.c | 6 ++++
drivers/bus/fsl-mc/fsl-mc-uapi.c | 52 +++++++++++++++++++++++++++++++-
2 files changed, 57 insertions(+), 1 deletion(-)
--
2.30.0
From: Dan Carpenter <[email protected]>
The "desc" pointer can't possibly be NULL here. If we can't find the
correct "desc" then tt points to the last element of the
fsl_mc_accepted_cmds[] array. Fix this by testing if
"i == FSL_MC_NUM_ACCEPTED_CMDS" instead.
Fixes: 2cf1e703f066 ("bus: fsl-mc: add fsl-mc userspace support")
Signed-off-by: Ioana Ciornei <[email protected]>
Signed-off-by: Dan Carpenter <[email protected]>
---
drivers/bus/fsl-mc/fsl-mc-uapi.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/bus/fsl-mc/fsl-mc-uapi.c b/drivers/bus/fsl-mc/fsl-mc-uapi.c
index eeb988c9f4bb..bdcd9d983a78 100644
--- a/drivers/bus/fsl-mc/fsl-mc-uapi.c
+++ b/drivers/bus/fsl-mc/fsl-mc-uapi.c
@@ -338,7 +338,7 @@ static int fsl_mc_command_check(struct fsl_mc_device *mc_dev,
if ((cmdid & desc->cmdid_mask) == desc->cmdid_value)
break;
}
- if (!desc) {
+ if (i == FSL_MC_NUM_ACCEPTED_CMDS) {
dev_err(&mc_dev->dev, "MC command 0x%04x: cmdid not accepted\n", cmdid);
return -EACCES;
}
--
2.30.0
From: Ioana Ciornei <[email protected]>
Add some new MC firmware commands that can be received through the
userspace ioctl interface - *get_max_frame_length and *_get_counter.
Signed-off-by: Ioana Ciornei <[email protected]>
---
drivers/bus/fsl-mc/fsl-mc-uapi.c | 50 ++++++++++++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/drivers/bus/fsl-mc/fsl-mc-uapi.c b/drivers/bus/fsl-mc/fsl-mc-uapi.c
index bdcd9d983a78..9c4c1395fcdb 100644
--- a/drivers/bus/fsl-mc/fsl-mc-uapi.c
+++ b/drivers/bus/fsl-mc/fsl-mc-uapi.c
@@ -60,6 +60,13 @@ enum fsl_mc_cmd_index {
DPNI_GET_PRIM_MAC,
DPNI_GET_STATISTICS,
DPNI_GET_LINK_STATE,
+ DPNI_GET_MAX_FRAME_LENGTH,
+ DPSW_GET_TAILDROP,
+ DPSW_SET_TAILDROP,
+ DPSW_IF_GET_COUNTER,
+ DPSW_IF_GET_MAX_FRAME_LENGTH,
+ DPDMUX_GET_COUNTER,
+ DPDMUX_IF_GET_MAX_FRAME_LENGTH,
GET_ATTR,
GET_IRQ_MASK,
GET_IRQ_STATUS,
@@ -261,6 +268,49 @@ static struct fsl_mc_cmd_desc fsl_mc_accepted_cmds[] = {
.token = true,
.size = 8,
},
+ [DPNI_GET_MAX_FRAME_LENGTH] = {
+ .cmdid_value = 0x2170,
+ .cmdid_mask = 0xFFF0,
+ .token = true,
+ .size = 8,
+ },
+ [DPSW_GET_TAILDROP] = {
+ .cmdid_value = 0x0A80,
+ .cmdid_mask = 0xFFF0,
+ .token = true,
+ .size = 14,
+ },
+ [DPSW_SET_TAILDROP] = {
+ .cmdid_value = 0x0A90,
+ .cmdid_mask = 0xFFF0,
+ .token = true,
+ .size = 24,
+ .flags = FSL_MC_CAP_NET_ADMIN_NEEDED,
+ },
+ [DPSW_IF_GET_COUNTER] = {
+ .cmdid_value = 0x0340,
+ .cmdid_mask = 0xFFF0,
+ .token = true,
+ .size = 11,
+ },
+ [DPSW_IF_GET_MAX_FRAME_LENGTH] = {
+ .cmdid_value = 0x0450,
+ .cmdid_mask = 0xFFF0,
+ .token = true,
+ .size = 10,
+ },
+ [DPDMUX_GET_COUNTER] = {
+ .cmdid_value = 0x0b20,
+ .cmdid_mask = 0xFFF0,
+ .token = true,
+ .size = 11,
+ },
+ [DPDMUX_IF_GET_MAX_FRAME_LENGTH] = {
+ .cmdid_value = 0x0a20,
+ .cmdid_mask = 0xFFF0,
+ .token = true,
+ .size = 10,
+ },
[GET_ATTR] = {
.cmdid_value = 0x0040,
.cmdid_mask = 0xFFF0,
--
2.30.0
On 2/8/2021 7:09 PM, Ioana Ciornei wrote:
> From: Ioana Ciornei <[email protected]>
>
> This patch set adds a fix on the userspace support of the fsl-mc bus.
> Other than that, a missing device type is added and some other commands
> to the list of the accepted ones.
>
> Dan Carpenter (1):
> bus: fsl-mc: Fix test for end of loop
>
> Ioana Ciornei (2):
> bus: fsl-mc: add the dpdbg device type
> bus: fsl-mc: list more commands as accepted through the ioctl
>
> drivers/bus/fsl-mc/fsl-mc-bus.c | 6 ++++
> drivers/bus/fsl-mc/fsl-mc-uapi.c | 52 +++++++++++++++++++++++++++++++-
> 2 files changed, 57 insertions(+), 1 deletion(-)
>
For the series:
Acked-by: Laurentiu Tudor <[email protected]>
---
Best Regards, Laurentiu
On Mon, Feb 08, 2021 at 07:09:47PM +0200, Ioana Ciornei wrote:
> From: Dan Carpenter <[email protected]>
>
> The "desc" pointer can't possibly be NULL here. If we can't find the
> correct "desc" then tt points to the last element of the
> fsl_mc_accepted_cmds[] array. Fix this by testing if
> "i == FSL_MC_NUM_ACCEPTED_CMDS" instead.
>
> Fixes: 2cf1e703f066 ("bus: fsl-mc: add fsl-mc userspace support")
> Signed-off-by: Ioana Ciornei <[email protected]>
> Signed-off-by: Dan Carpenter <[email protected]>
Generally the tags are expected to go in chronological order:
Fixes: commit
Signed-off-by: Author
Acked-by: Whoever
Signed-off-by: Maintainer
regards,
dan carpenter
On Mon, Feb 08, 2021 at 09:58:10PM +0300, Dan Carpenter wrote:
> On Mon, Feb 08, 2021 at 07:09:47PM +0200, Ioana Ciornei wrote:
> > From: Dan Carpenter <[email protected]>
> >
> > The "desc" pointer can't possibly be NULL here. If we can't find the
> > correct "desc" then tt points to the last element of the
> > fsl_mc_accepted_cmds[] array. Fix this by testing if
> > "i == FSL_MC_NUM_ACCEPTED_CMDS" instead.
> >
> > Fixes: 2cf1e703f066 ("bus: fsl-mc: add fsl-mc userspace support")
> > Signed-off-by: Ioana Ciornei <[email protected]>
> > Signed-off-by: Dan Carpenter <[email protected]>
>
> Generally the tags are expected to go in chronological order:
>
> Fixes: commit
> Signed-off-by: Author
> Acked-by: Whoever
> Signed-off-by: Maintainer
>
Thanks! I didn't know that.
Ioana