History

bus: ti-sysc: Make OCP reset work for sysstatus and sysconfig reset bits

We've had minimal OCP softreset support in ti-sysc interconnect target module driver only used for MCAN driver so far. But it turns out that MCAN has the sysstatus register resetdone bit inverted compared to most other modules. Let's make OCP softreset work for other typical cases with reset status in sysstatus or sysconfig register so we can use the new functions for sysc_enable_module() and sysc_disable_module() without "ti,hwmods" property in the following patches.

Tony Lindgren committed 7 years ago

Commit e0db94f1 parent 5aa91292 files · +55 −18Browse files

Unified · Split

2 files
  1. drivers/bus/ti-sysc.c +54 −18
  2. include/linux/platform_data/ti-sysc.h +1 −0
drivers/bus/ti-sysc.c+54−18
@@ -153,6 +153,26 @@ static u32 sysc_read_revision(struct sysc *ddata) · 152 unmodified lines
153 return sysc_read(ddata, offset);153 return sysc_read(ddata, offset);
154}154}
155 155
156static u32 sysc_read_sysconfig(struct sysc *ddata)
157{
158 int offset = ddata->offsets[SYSC_SYSCONFIG];
159
160 if (offset < 0)
161 return 0;
162
163 return sysc_read(ddata, offset);
164}
165
166static u32 sysc_read_sysstatus(struct sysc *ddata)
167{
168 int offset = ddata->offsets[SYSC_SYSSTATUS];
169
170 if (offset < 0)
171 return 0;
172
173 return sysc_read(ddata, offset);
174}
175
156static int sysc_add_named_clock_from_child(struct sysc *ddata,176static int sysc_add_named_clock_from_child(struct sysc *ddata,
157 const char *name,177 const char *name,
158 const char *optfck_name)178 const char *optfck_name)
@@ -1369,34 +1389,49 @@ static int sysc_rstctrl_reset_deassert(struct sysc *ddata, bool reset) · 1210 unmodified lines
1369 return reset_control_deassert(ddata->rsts);1389 return reset_control_deassert(ddata->rsts);
1370}1390}
1371 1391
1392/*
1393 * Note that the caller must ensure the interconnect target module is enabled
1394 * before calling reset. Otherwise reset will not complete.
1395 */
1372static int sysc_reset(struct sysc *ddata)1396static int sysc_reset(struct sysc *ddata)
1373{1397{
1374 int offset = ddata->offsets[SYSC_SYSCONFIG];1398 int sysc_offset, syss_offset, sysc_val, rstval, quirks, error = 0;
1375 int val;1399 u32 sysc_mask, syss_done;
1400
1401 sysc_offset = ddata->offsets[SYSC_SYSCONFIG];
1402 syss_offset = ddata->offsets[SYSC_SYSSTATUS];
1403 quirks = ddata->cfg.quirks;
1376 1404
1377 if (ddata->legacy_mode || offset < 0 ||1405 if (ddata->legacy_mode || sysc_offset < 0 ||
1406 ddata->cap->regbits->srst_shift < 0 ||
1378 ddata->cfg.quirks & SYSC_QUIRK_NO_RESET_ON_INIT)1407 ddata->cfg.quirks & SYSC_QUIRK_NO_RESET_ON_INIT)
1379 return 0;1408 return 0;
1380 1409
1381 /*1410 sysc_mask = BIT(ddata->cap->regbits->srst_shift);
1382 * Currently only support reset status in sysstatus.
1383 * Warn and return error in all other cases
1384 */
1385 if (!ddata->cfg.syss_mask) {
1386 dev_err(ddata->dev, "No ti,syss-mask. Reset failed\n");
1387 return -EINVAL;
1388 }
1389 1411
1390 val = sysc_read(ddata, offset);1412 if (ddata->cfg.quirks & SYSS_QUIRK_RESETDONE_INVERTED)
1391 val |= (0x1 << ddata->cap->regbits->srst_shift);1413 syss_done = 0;
1392 sysc_write(ddata, offset, val);1414 else
1415 syss_done = ddata->cfg.syss_mask;
1416
1417 sysc_val = sysc_read_sysconfig(ddata);
1418 sysc_val |= sysc_mask;
1419 sysc_write(ddata, sysc_offset, sysc_val);
1393 1420
1394 /* Poll on reset status */1421 /* Poll on reset status */
1395 offset = ddata->offsets[SYSC_SYSSTATUS];1422 if (syss_offset >= 0) {
1423 error = readx_poll_timeout(sysc_read_sysstatus, ddata, rstval,
1424 (rstval & ddata->cfg.syss_mask) ==
1425 syss_done,
1426 100, MAX_MODULE_SOFTRESET_WAIT);
1427
1428 } else if (ddata->cfg.quirks & SYSC_QUIRK_RESET_STATUS) {
1429 error = readx_poll_timeout(sysc_read_sysconfig, ddata, rstval,
1430 !(rstval & sysc_mask),
1431 100, MAX_MODULE_SOFTRESET_WAIT);
1432 }
1396 1433
1397 return readl_poll_timeout(ddata->module_va + offset, val,1434 return error;
1398 (val & ddata->cfg.syss_mask) == 0x0,
1399 100, MAX_MODULE_SOFTRESET_WAIT);
1400}1435}
1401 1436
1402/*1437/*
@@ -2099,6 +2134,7 @@ static const struct sysc_capabilities sysc_dra7_mcan = { · 696 unmodified lines
2099 .type = TI_SYSC_DRA7_MCAN,2134 .type = TI_SYSC_DRA7_MCAN,
2100 .sysc_mask = SYSC_DRA7_MCAN_ENAWAKEUP | SYSC_OMAP4_SOFTRESET,2135 .sysc_mask = SYSC_DRA7_MCAN_ENAWAKEUP | SYSC_OMAP4_SOFTRESET,
2101 .regbits = &sysc_regbits_dra7_mcan,2136 .regbits = &sysc_regbits_dra7_mcan,
2137 .mod_quirks = SYSS_QUIRK_RESETDONE_INVERTED,
2102};2138};
2103 2139
2104static int sysc_init_pdata(struct sysc *ddata)2140static int sysc_init_pdata(struct sysc *ddata)
include/linux/platform_data/ti-sysc.h+1−0
@@ -47,6 +47,7 @@ struct sysc_regbits { · 46 unmodified lines
47 s8 emufree_shift;47 s8 emufree_shift;
48};48};
49 49
50#define SYSS_QUIRK_RESETDONE_INVERTED BIT(14)
50#define SYSC_QUIRK_SWSUP_MSTANDBY BIT(13)51#define SYSC_QUIRK_SWSUP_MSTANDBY BIT(13)
51#define SYSC_QUIRK_SWSUP_SIDLE_ACT BIT(12)52#define SYSC_QUIRK_SWSUP_SIDLE_ACT BIT(12)
52#define SYSC_QUIRK_SWSUP_SIDLE BIT(11)53#define SYSC_QUIRK_SWSUP_SIDLE BIT(11)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t