Skip to content

Commit dbd6654

Browse files
pgajcdnsbbrezillon
authored andcommitted
i3c: master: cdns: add data hold delay support
This patch adds support for THD_DEL (Data Hold Delay) to Cadence I3C master constoller driver. As per MIPI I3C Specification 1.0, Table 75 (page 142) defines non-zero minimal tHD_PP timing on master output (Fig 65). This setting allows to meet this timing on master's soc outputs, regardless of PCB balancing. Signed-off-by: Przemyslaw Gaj <[email protected]> Signed-off-by: Boris Brezillon <[email protected]>
1 parent e42617b commit dbd6654

File tree

1 file changed

+44
-5
lines changed

1 file changed

+44
-5
lines changed

drivers/i3c/master/i3c-master-cdns.c

Lines changed: 44 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <linux/slab.h>
2323
#include <linux/spinlock.h>
2424
#include <linux/workqueue.h>
25+
#include <linux/of_device.h>
2526

2627
#define DEV_ID 0x0
2728
#define DEV_ID_I3C_MASTER 0x5034
@@ -60,6 +61,7 @@
6061
#define CTRL_HALT_EN BIT(30)
6162
#define CTRL_MCS BIT(29)
6263
#define CTRL_MCS_EN BIT(28)
64+
#define CTRL_THD_DELAY(x) (((x) << 24) & GENMASK(25, 24))
6365
#define CTRL_HJ_DISEC BIT(8)
6466
#define CTRL_MST_ACK BIT(7)
6567
#define CTRL_HJ_ACK BIT(6)
@@ -70,6 +72,7 @@
7072
#define CTRL_MIXED_FAST_BUS_MODE 2
7173
#define CTRL_MIXED_SLOW_BUS_MODE 3
7274
#define CTRL_BUS_MODE_MASK GENMASK(1, 0)
75+
#define THD_DELAY_MAX 3
7376

7477
#define PRESCL_CTRL0 0x14
7578
#define PRESCL_CTRL0_I2C(x) ((x) << 16)
@@ -388,6 +391,10 @@ struct cdns_i3c_xfer {
388391
struct cdns_i3c_cmd cmds[0];
389392
};
390393

394+
struct cdns_i3c_data {
395+
u8 thd_delay_ns;
396+
};
397+
391398
struct cdns_i3c_master {
392399
struct work_struct hj_work;
393400
struct i3c_master_controller base;
@@ -408,6 +415,7 @@ struct cdns_i3c_master {
408415
struct clk *pclk;
409416
struct cdns_i3c_master_caps caps;
410417
unsigned long i3c_scl_lim;
418+
const struct cdns_i3c_data *devdata;
411419
};
412420

413421
static inline struct cdns_i3c_master *
@@ -1181,6 +1189,20 @@ static int cdns_i3c_master_do_daa(struct i3c_master_controller *m)
11811189
return 0;
11821190
}
11831191

1192+
static u8 cdns_i3c_master_calculate_thd_delay(struct cdns_i3c_master *master)
1193+
{
1194+
unsigned long sysclk_rate = clk_get_rate(master->sysclk);
1195+
u8 thd_delay = DIV_ROUND_UP(master->devdata->thd_delay_ns,
1196+
(NSEC_PER_SEC / sysclk_rate));
1197+
1198+
/* Every value greater than 3 is not valid. */
1199+
if (thd_delay > THD_DELAY_MAX)
1200+
thd_delay = THD_DELAY_MAX;
1201+
1202+
/* CTLR_THD_DEL value is encoded. */
1203+
return (THD_DELAY_MAX - thd_delay);
1204+
}
1205+
11841206
static int cdns_i3c_master_bus_init(struct i3c_master_controller *m)
11851207
{
11861208
struct cdns_i3c_master *master = to_cdns_i3c_master(m);
@@ -1264,6 +1286,15 @@ static int cdns_i3c_master_bus_init(struct i3c_master_controller *m)
12641286
* We will issue ENTDAA afterwards from the threaded IRQ handler.
12651287
*/
12661288
ctrl |= CTRL_HJ_ACK | CTRL_HJ_DISEC | CTRL_HALT_EN | CTRL_MCS_EN;
1289+
1290+
/*
1291+
* Configure data hold delay based on device-specific data.
1292+
*
1293+
* MIPI I3C Specification 1.0 defines non-zero minimal tHD_PP timing on
1294+
* master output. This setting allows to meet this timing on master's
1295+
* SoC outputs, regardless of PCB balancing.
1296+
*/
1297+
ctrl |= CTRL_THD_DELAY(cdns_i3c_master_calculate_thd_delay(master));
12671298
writel(ctrl, master->regs + CTRL);
12681299

12691300
cdns_i3c_master_enable(master);
@@ -1521,6 +1552,15 @@ static void cdns_i3c_master_hj(struct work_struct *work)
15211552
i3c_master_do_daa(&master->base);
15221553
}
15231554

1555+
static struct cdns_i3c_data cdns_i3c_devdata = {
1556+
.thd_delay_ns = 10,
1557+
};
1558+
1559+
static const struct of_device_id cdns_i3c_master_of_ids[] = {
1560+
{ .compatible = "cdns,i3c-master", .data = &cdns_i3c_devdata },
1561+
{ /* sentinel */ },
1562+
};
1563+
15241564
static int cdns_i3c_master_probe(struct platform_device *pdev)
15251565
{
15261566
struct cdns_i3c_master *master;
@@ -1532,6 +1572,10 @@ static int cdns_i3c_master_probe(struct platform_device *pdev)
15321572
if (!master)
15331573
return -ENOMEM;
15341574

1575+
master->devdata = of_device_get_match_data(&pdev->dev);
1576+
if (!master->devdata)
1577+
return -EINVAL;
1578+
15351579
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
15361580
master->regs = devm_ioremap_resource(&pdev->dev, res);
15371581
if (IS_ERR(master->regs))
@@ -1631,11 +1675,6 @@ static int cdns_i3c_master_remove(struct platform_device *pdev)
16311675
return 0;
16321676
}
16331677

1634-
static const struct of_device_id cdns_i3c_master_of_ids[] = {
1635-
{ .compatible = "cdns,i3c-master" },
1636-
{ /* sentinel */ },
1637-
};
1638-
16391678
static struct platform_driver cdns_i3c_master = {
16401679
.probe = cdns_i3c_master_probe,
16411680
.remove = cdns_i3c_master_remove,

0 commit comments

Comments
 (0)