Skip to content

Commit 17a3a30

Browse files
Demon000Wolfram Sang
authored andcommitted
i2c: atr: add passthrough flag
Some I2C ATRs can have other I2C ATRs as children. The I2C messages of the child ATRs need to be forwarded as-is if the parent I2C ATR can only do static mapping. In the case of GMSL, the deserializer I2C ATR actually doesn't have I2C address remapping hardware capabilities, but it is able to select which GMSL link to talk to, allowing it to change the address of the serializer. The child ATRs need to have their alias pools defined in such a way to prevent overlapping addresses between them, but there's no way around this without orchestration between multiple ATR instances. To allow for this use-case, add a flag that allows unmapped addresses to be passed through, since they are already remapped by the child ATRs. There's no case where an address that has not been remapped by the child ATR will hit the parent ATR. Signed-off-by: Cosmin Tanislav <demonsingur@gmail.com> Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Reviewed-by: Romain Gantois <romain.gantois@bootlin.com> Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
1 parent 1835530 commit 17a3a30

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

drivers/i2c/i2c-atr.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,9 @@ static int i2c_atr_map_msgs(struct i2c_atr_chan *chan, struct i2c_msg *msgs,
394394
c2a = i2c_atr_get_mapping_by_addr(chan, msgs[i].addr);
395395

396396
if (!c2a) {
397+
if (atr->flags & I2C_ATR_F_PASSTHROUGH)
398+
continue;
399+
397400
dev_err(atr->dev, "client 0x%02x not mapped!\n",
398401
msgs[i].addr);
399402

@@ -486,13 +489,13 @@ static int i2c_atr_smbus_xfer(struct i2c_adapter *adap, u16 addr,
486489

487490
c2a = i2c_atr_get_mapping_by_addr(chan, addr);
488491

489-
if (!c2a) {
492+
if (!c2a && !(atr->flags & I2C_ATR_F_PASSTHROUGH)) {
490493
dev_err(atr->dev, "client 0x%02x not mapped!\n", addr);
491494
mutex_unlock(&chan->alias_pairs_lock);
492495
return -ENXIO;
493496
}
494497

495-
alias = c2a->alias;
498+
alias = c2a ? c2a->alias : addr;
496499

497500
mutex_unlock(&chan->alias_pairs_lock);
498501

include/linux/i2c-atr.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,11 @@ struct i2c_atr;
2626
* devices being added or removed from a child bus.
2727
* The ATR pool will have to be big enough to accomodate all
2828
* devices expected to be added to the child buses.
29+
* @I2C_ATR_F_PASSTHROUGH: Allow unmapped incoming addresses to pass through
2930
*/
3031
enum i2c_atr_flags {
3132
I2C_ATR_F_STATIC = BIT(0),
33+
I2C_ATR_F_PASSTHROUGH = BIT(1),
3234
};
3335

3436
/**

0 commit comments

Comments
 (0)