| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20250305121705.2143540-1-y-abhilashchandra@ti.com>
Date: Wed, 5 Mar 2025 17:47:05 +0530
From: Yemike Abhilash Chandra <y-abhilashchandra@...com>
To: <tomi.valkeinen@...asonboard.com>, <mchehab@...nel.org>
CC: <linux-media@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
<vaishnav.a@...com>, <u-kumar1@...com>, <r-donadkar@...com>
Subject: [PATCH RFC] media: i2c: ds90ub960: Enable second i2c interface
The DS90UB960-Q1 includes a second I2C interface for independent control
of the deserializer and remote devices. However, the current driver does
not utilize it, thus restricting users to either CSI TX0 or CSI TX1 on
the primary I2C interface. Enable the second I2C interface, allowing
flexible routing where CSI TX0 can be used on the primary and CSI TX1 on
the secondary, or vice versa by enabling appropriate ports in DT. To
achieve the same only modify the bits relevant to the enabled RX and TX
ports of that interface and during probe and enable_streams call, few
registers were being reset to HW reset state, these operations are not
necessary for functionality and resets the state when secondary I2C
interface is probed, thus drop them.
DS90UB960 data sheet: https://www.ti.com/lit/ds/symlink/ds90ub960-q1.pdf
Signed-off-by: Yemike Abhilash Chandra <y-abhilashchandra@...com>
---
drivers/media/i2c/ds90ub960.c | 64 +++++++++++++++++++++++++++--------
1 file changed, 49 insertions(+), 15 deletions(-)
diff --git a/drivers/media/i2c/ds90ub960.c b/drivers/media/i2c/ds90ub960.c
index 5dde8452739b..4c0052e05071 100644
--- a/drivers/media/i2c/ds90ub960.c
+++ b/drivers/media/i2c/ds90ub960.c
@@ -73,6 +73,9 @@
#define UB960_NUM_BC_GPIOS 4
+#define UB960_ALL_RX_PORTS_MASK GENMASK(3, 0)
+#define UB960_CSI_TX0 BIT(4)
+
/*
* Register map
*
@@ -111,6 +114,7 @@
#define UB960_SR_SCL_HIGH_TIME 0x0a
#define UB960_SR_SCL_LOW_TIME 0x0b
#define UB960_SR_RX_PORT_CTL 0x0c
+#define UB960_SR_RX_PORT_CTL_BCC_MAP GENMASK(7, 4)
#define UB960_SR_IO_CTL 0x0d
#define UB960_SR_GPIO_PIN_STS 0x0e
#define UB960_SR_GPIO_INPUT_CTL 0x0f
@@ -524,6 +528,8 @@ struct ub960_data {
u32 tx_data_rate; /* Nominal data rate (Gb/s) */
s64 tx_link_freq[1];
+ u8 rx_mask;
+ u8 tx_mask;
struct i2c_atr *atr;
@@ -2168,6 +2174,17 @@ static void ub960_init_rx_port_ub9702(struct ub960_data *priv,
static int ub960_init_rx_ports(struct ub960_data *priv)
{
unsigned int nport;
+ u8 enabled_rxports_mask;
+ u8 enabled_rxports;
+ int ret;
+
+ /* Configure i2c interface for RX ports */
+ enabled_rxports_mask = FIELD_PREP(UB960_SR_RX_PORT_CTL_BCC_MAP, priv->rx_mask);
+ enabled_rxports = (priv->tx_mask & UB960_CSI_TX0) ? 0x00 : enabled_rxports_mask;
+
+ ret = ub960_update_bits(priv, UB960_SR_RX_PORT_CTL, enabled_rxports_mask, enabled_rxports);
+ if (ret)
+ return ret;
for (nport = 0; nport < priv->hw_data->num_rxports; nport++) {
struct ub960_rxport *rxport = priv->rxports[nport];
@@ -2509,14 +2526,6 @@ static int ub960_configure_ports_for_streaming(struct ub960_data *priv,
}
}
- /* Configure RX ports */
-
- /*
- * Keep all port forwardings disabled by default. Forwarding will be
- * enabled in ub960_enable_rx_port.
- */
- fwd_ctl = GENMASK(7, 4);
-
for (unsigned int nport = 0; nport < priv->hw_data->num_rxports;
nport++) {
struct ub960_rxport *rxport = priv->rxports[nport];
@@ -2570,9 +2579,9 @@ static int ub960_configure_ports_for_streaming(struct ub960_data *priv,
fwd_ctl &= ~BIT(nport); /* forward to TX0 */
}
- ub960_write(priv, UB960_SR_FWD_CTL1, fwd_ctl);
+ ret = ub960_update_bits(priv, UB960_SR_FWD_CTL1, priv->rx_mask, fwd_ctl);
- return 0;
+ return ret;
}
static void ub960_update_streaming_status(struct ub960_data *priv)
@@ -3574,6 +3583,32 @@ static int ub960_parse_dt_txports(struct ub960_data *priv)
return 0;
}
+static int ub960_parse_active_ports(struct ub960_data *priv)
+{
+ struct device *dev = &priv->client->dev;
+ int nport;
+
+ priv->rx_mask = 0;
+ priv->tx_mask = 0;
+
+ for (nport = 0; nport < priv->hw_data->num_rxports + priv->hw_data->num_txports; nport++) {
+ struct fwnode_handle *ep_fwnode;
+
+ ep_fwnode = fwnode_graph_get_endpoint_by_id(dev_fwnode(dev), nport, 0, 0);
+ if (!ep_fwnode)
+ continue;
+
+ if (nport < priv->hw_data->num_rxports)
+ priv->rx_mask |= BIT(nport);
+ else
+ priv->tx_mask |= BIT(nport);
+
+ fwnode_handle_put(ep_fwnode);
+ }
+
+ return 0;
+}
+
static int ub960_parse_dt(struct ub960_data *priv)
{
int ret;
@@ -3900,11 +3935,6 @@ static int ub960_enable_core_hw(struct ub960_data *priv)
!!(dev_sts & BIT(4)), refclk_freq,
clk_get_rate(priv->refclk) / HZ_PER_MHZ);
- /* Disable all RX ports by default */
- ret = ub960_write(priv, UB960_SR_RX_PORT_CTL, 0);
- if (ret)
- goto err_pd_gpio;
-
/* release GPIO lock */
if (priv->hw_data->is_ub9702) {
ret = ub960_update_bits(priv, UB960_SR_RESET,
@@ -3969,6 +3999,10 @@ static int ub960_probe(struct i2c_client *client)
if (ret)
goto err_mutex_destroy;
+ ret = ub960_parse_active_ports(priv);
+ if (ret)
+ goto err_disable_core_hw;
+
ret = ub960_parse_dt(priv);
if (ret)
goto err_disable_core_hw;
--
2.34.1
Powered by blists - more mailing lists