From: Jan Kotas <jank@cadence.com>
To: <maxime.ripard@bootlin.com>, <mchehab@kernel.org>,
<robh+dt@kernel.org>, <mark.rutland@arm.com>
Cc: <rafalc@cadence.com>, <linux-media@vger.kernel.org>,
<devicetree@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Jan Kotas <jank@cadence.com>
Subject: [PATCH v2 2/3] media: Add lane checks for Cadence CSI2RX
Date: Thu, 5 Sep 2019 11:56:00 +0100 [thread overview]
Message-ID: <20190905105601.27034-3-jank@cadence.com> (raw)
In-Reply-To: <20190905105601.27034-1-jank@cadence.com>
This patch adds lane checks for CSI2RX, to prevent clock lane
being used as a data lane.
Signed-off-by: Jan Kotas <jank@cadence.com>
---
drivers/media/platform/cadence/cdns-csi2rx.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/drivers/media/platform/cadence/cdns-csi2rx.c b/drivers/media/platform/cadence/cdns-csi2rx.c
index 31ace114e..97ec09e72 100644
--- a/drivers/media/platform/cadence/cdns-csi2rx.c
+++ b/drivers/media/platform/cadence/cdns-csi2rx.c
@@ -2,7 +2,7 @@
/*
* Driver for Cadence MIPI-CSI2 RX Controller v1.3
*
- * Copyright (C) 2017 Cadence Design Systems Inc.
+ * Copyright (C) 2017-2019 Cadence Design Systems Inc.
*/
#include <linux/clk.h>
@@ -364,7 +364,7 @@ static int csi2rx_parse_dt(struct csi2rx_priv *csi2rx)
struct v4l2_fwnode_endpoint v4l2_ep = { .bus_type = 0 };
struct fwnode_handle *fwh;
struct device_node *ep;
- int ret;
+ int ret, i;
ep = of_graph_get_endpoint_by_regs(csi2rx->dev->of_node, 0, 0);
if (!ep)
@@ -395,6 +395,15 @@ static int csi2rx_parse_dt(struct csi2rx_priv *csi2rx)
return -EINVAL;
}
+ for (i = 0; i < csi2rx->num_lanes; i++) {
+ if (csi2rx->lanes[i] < 1) {
+ dev_err(csi2rx->dev, "Invalid lane[%d] number: %u\n",
+ i, csi2rx->lanes[i]);
+ of_node_put(ep);
+ return -EINVAL;
+ }
+ }
+
csi2rx->asd.match.fwnode = fwnode_graph_get_remote_port_parent(fwh);
csi2rx->asd.match_type = V4L2_ASYNC_MATCH_FWNODE;
of_node_put(ep);
--
2.15.0
next prev parent reply other threads:[~2019-09-05 10:56 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-05 10:55 [PATCH v2 0/3] media: Add support for Cadence CSI2RX version 2.1 Jan Kotas
2019-09-05 10:55 ` [PATCH v2 1/3] media: dt-bindings: Update bindings for Cadence CSI2RX Jan Kotas
2019-09-17 20:52 ` Rob Herring
2019-09-05 10:56 ` Jan Kotas [this message]
2019-09-06 7:54 ` [PATCH v2 2/3] media: Add lane checks " Sakari Ailus
2019-09-09 7:41 ` Jan Kotas
2019-09-09 7:51 ` Sakari Ailus
2019-09-09 8:12 ` Jan Kotas
2019-09-09 9:40 ` Sakari Ailus
2019-09-05 10:56 ` [PATCH v2 3/3] media: Add support for Cadence CSI2RX 2.1 Jan Kotas
2019-09-06 8:01 ` Sakari Ailus
2019-09-09 9:24 ` Jan Kotas
2019-09-09 9:41 ` Sakari Ailus
2019-09-05 12:01 ` [PATCH v2 0/3] media: Add support for Cadence CSI2RX version 2.1 Maxime Ripard
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=20190905105601.27034-3-jank@cadence.com \
--to=jank@cadence.com \
--cc=devicetree@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=maxime.ripard@bootlin.com \
--cc=mchehab@kernel.org \
--cc=rafalc@cadence.com \
--cc=robh+dt@kernel.org \
/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).