Hi Tony,

Thank you for the patch.

On Mon, Feb 24, 2020 at 11:12:28AM -0800, Tony Lindgren wrote:

In order to probe display subsystem (DSS) components with ti-sysc interconnect target module without legacy platform data and using devicetree, we need to update dss probing a bit.

In the device tree, we will be defining the data also for the interconnect target modules as DSS really is a private interconnect. There is some information about that in 4460 TRM in "Figure 10-3. DSS Integration" for example where it mentions "32-bit interconnect (SLX)".

The changes we need to make are:

1. Parse also device tree subnodes for the compatible property fixup

2. Update the component code to consider device tree subnodes

Cc: dri-devel@lists.freedesktop.org Cc: Jyri Sarha jsarha@ti.com Cc: Laurent Pinchart laurent.pinchart@ideasonboard.com Cc: Tomi Valkeinen tomi.valkeinen@ti.com Signed-off-by: Tony Lindgren tony@atomide.com

Reviewed-by: Laurent Pinchart laurent.pinchart@ideasonboard.com

---

This is needed for dropping DSS platform data that I'll be posting seprately. If this looks OK, can you guys please test and ack?

---

drivers/gpu/drm/omapdrm/dss/dss.c | 25 ++++++++++++++++--- .../gpu/drm/omapdrm/dss/omapdss-boot-init.c | 25 +++++++++++++------ 2 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c b/drivers/gpu/drm/omapdrm/dss/dss.c --- a/drivers/gpu/drm/omapdrm/dss/dss.c +++ b/drivers/gpu/drm/omapdrm/dss/dss.c @@ -1339,9 +1339,15 @@ static int dss_component_compare(struct device *dev, void *data) return dev == child; }

+struct dss_component_match_data {

• struct device *dev;
• struct component_match **match;

+};

static int dss_add_child_component(struct device *dev, void *data) {

• struct component_match **match = data;

• struct dss_component_match_data *cmatch = data;

• struct component_match **match = cmatch->match;

  /*

  • HACK

@@ -1352,7 +1358,17 @@ static int dss_add_child_component(struct device *dev, void *data) if (strstr(dev_name(dev), "rfbi")) return 0;

• component_match_add(dev->parent, match, dss_component_compare, dev);

• /*

• * Handle possible interconnect target modules defined within the DSS.
  

• * The DSS components can be children of an interconnect target module
  

• * after the device tree has been updated for the module data.
  

• * See also omapdss_boot_init() for compatible fixup.
  

• */
  

• if (strstr(dev_name(dev), "target-module"))

• return device_for_each_child(dev, cmatch,
  

• 			     dss_add_child_component);
  

• component_match_add(cmatch->dev, match, dss_component_compare, dev);

  return 0;

} @@ -1395,6 +1411,7 @@ static int dss_probe_hardware(struct dss_device *dss) static int dss_probe(struct platform_device *pdev) { const struct soc_device_attribute *soc;

• struct dss_component_match_data cmatch; struct component_match *match = NULL; struct resource *dss_mem; struct dss_device *dss;

@@ -1472,7 +1489,9 @@ static int dss_probe(struct platform_device *pdev)

omapdss_gather_components(&pdev->dev);

• device_for_each_child(&pdev->dev, &match, dss_add_child_component);

• cmatch.dev = &pdev->dev;

• cmatch.match = &match;

• device_for_each_child(&pdev->dev, &cmatch, dss_add_child_component);

  r = component_master_add_with_match(&pdev->dev, &dss_component_ops, match); if (r)

diff --git a/drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c b/drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c --- a/drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c +++ b/drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c @@ -183,9 +183,24 @@ static const struct of_device_id omapdss_of_fixups_whitelist[] __initconst = { {}, };

+static void __init omapdss_find_children(struct device_node *np) +{

• struct device_node *child;
• for_each_available_child_of_node(np, child) {

• if (!of_find_property(child, "compatible", NULL))
  

• 	continue;
  

• omapdss_walk_device(child, true);
  

• if (of_device_is_compatible(child, "ti,sysc"))
  

• 	omapdss_find_children(child);
  

• }

+}

static int __init omapdss_boot_init(void) {

• struct device_node *dss, *child;

• struct device_node *dss;

  INIT_LIST_HEAD(&dss_conv_list);

@@ -195,13 +210,7 @@ static int __init omapdss_boot_init(void) return 0;

omapdss_walk_device(dss, true);

• for_each_available_child_of_node(dss, child) {

• if (!of_find_property(child, "compatible", NULL))
  

• 	continue;
  

• omapdss_walk_device(child, true);
  

• }

• omapdss_find_children(dss);

  while (!list_empty(&dss_conv_list)) { struct dss_conv_node *n;

On 24/02/2020 21:12, Tony Lindgren wrote:

The display subsystem (DSS) needs the child outputs disabled for reset. In order to prepare to probe DSS without legacy platform data, let's implement sysc_pre_reset_quirk_dss() similar to what we have for the platform data with omap_dss_reset().

Note that we cannot directly use the old omap_dss_reset() without platform data callbacks and updating omap_dss_reset() to understand struct device. And we will be dropping omap_dss_reset() anyways when all the SoCs are probing with device tree, so let's not mess with the legacy code at all.

Cc: Jyri Sarha jsarha@ti.com Cc: Laurent Pinchart laurent.pinchart@ideasonboard.com Cc: Tomi Valkeinen tomi.valkeinen@ti.com Signed-off-by: Tony Lindgren tony@atomide.com

---

drivers/bus/ti-sysc.c | 131 +++++++++++++++++++++++++- include/linux/platform_data/ti-sysc.h | 1 + 2 files changed, 129 insertions(+), 3 deletions(-)

diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c --- a/drivers/bus/ti-sysc.c +++ b/drivers/bus/ti-sysc.c @@ -1303,11 +1303,11 @@ static const struct sysc_revision_quirk sysc_revision_quirks[] = { SYSC_QUIRK("dcan", 0x48480000, 0x20, -ENODEV, -ENODEV, 0xa3170504, 0xffffffff, SYSC_QUIRK_CLKDM_NOAUTO), SYSC_QUIRK("dss", 0x4832a000, 0, 0x10, 0x14, 0x00000020, 0xffffffff,

•    SYSC_QUIRK_OPT_CLKS_IN_RESET),
  

•    SYSC_QUIRK_OPT_CLKS_IN_RESET | SYSC_MODULE_QUIRK_DSS_RESET),
  

  SYSC_QUIRK("dss", 0x58000000, 0, -ENODEV, 0x14, 0x00000040, 0xffffffff,

•    SYSC_QUIRK_OPT_CLKS_IN_RESET),
  

•    SYSC_QUIRK_OPT_CLKS_IN_RESET | SYSC_MODULE_QUIRK_DSS_RESET),
  

  SYSC_QUIRK("dss", 0x58000000, 0, -ENODEV, 0x14, 0x00000061, 0xffffffff,

•    SYSC_QUIRK_OPT_CLKS_IN_RESET),
  

•    SYSC_QUIRK_OPT_CLKS_IN_RESET | SYSC_MODULE_QUIRK_DSS_RESET),
  

  SYSC_QUIRK("dwc3", 0x48880000, 0, 0x10, -ENODEV, 0x500a0200, 0xffffffff, SYSC_QUIRK_CLKDM_NOAUTO), SYSC_QUIRK("dwc3", 0x488c0000, 0, 0x10, -ENODEV, 0x500a0200, 0xffffffff,

@@ -1468,6 +1468,128 @@ static void sysc_init_revision_quirks(struct sysc *ddata) } }

+/*

• • DSS needs dispc outputs disabled to reset modules. Returns mask of
• • enabled DSS interrupts. Eventually we may be able to do this on
• • dispc init rather than top-level DSS init.
• */

+static u32 sysc_quirk_dispc(struct sysc *ddata, int dispc_offset,

• 	    bool disable)
  

+{

• bool lcd_en, digit_en, lcd2_en = false, lcd3_en = false;
• const int lcd_en_mask = BIT(0), digit_en_mask = BIT(1);
• int manager_count;
• bool framedonetv_irq;
• u32 val, irq_mask = 0;
• switch (sysc_soc->soc) {
• case SOC_2420 ... SOC_3630:

• manager_count = 2;
  

• framedonetv_irq = false;
  

• break;
  

• case SOC_4430 ... SOC_4470:

• manager_count = 3;
  

• break;
  

• case SOC_5430:
• case SOC_DRA7:

• manager_count = 4;
  

• break;
  

• case SOC_AM4:

• manager_count = 1;
  

• break;
  

• case SOC_UNKNOWN:
• default:

• return 0;
  

• };
• /* Remap the whole module range to be able to reset dispc outputs */
• devm_iounmap(ddata->dev, ddata->module_va);
• ddata->module_va = devm_ioremap(ddata->dev,

• 			ddata->module_pa,
  

• 			ddata->module_size);
  

Why is this needed? The range is not mapped when sysc_pre_reset_quirk_dss() is called? This will unmap and remap twice, as this function is called twice. And then left mapped.

• if (!ddata->module_va)

• return -EIO;
  

• /* DISP_CONTROL */
• val = sysc_read(ddata, dispc_offset + 0x40);

Defines for dss/dispc register offsets could have been copied from the platform display.c and used in this file.

• lcd_en = val & lcd_en_mask;
• digit_en = val & digit_en_mask;
• if (lcd_en)

• irq_mask |= BIT(0);			/* FRAMEDONE */
  

• if (digit_en) {

• if (framedonetv_irq)
  

• 	irq_mask |= BIT(24);		/* FRAMEDONETV */
  

• else
  

• 	irq_mask |= BIT(2) | BIT(3);	/* EVSYNC bits */
  

• }
• if (disable & (lcd_en | digit_en))

• sysc_write(ddata, dispc_offset + 0x40,
  

• 	   val & ~(lcd_en_mask | digit_en_mask));
  

• if (manager_count <= 2)

• return irq_mask;
  

• /* DISPC_CONTROL2 */
• val = sysc_read(ddata, dispc_offset + 0x238);
• lcd2_en = val & lcd_en_mask;
• if (lcd2_en)

• irq_mask |= BIT(22);			/* FRAMEDONE2 */
  

• if (disable && lcd2_en)

• sysc_write(ddata, dispc_offset + 0x238,
  

• 	   val & ~lcd_en_mask);
  

• if (manager_count <= 3)

• return irq_mask;
  

• /* DISPC_CONTROL3 */
• val = sysc_read(ddata, dispc_offset + 0x848);
• lcd3_en = val & lcd_en_mask;
• if (lcd3_en)

• irq_mask |= BIT(30);			/* FRAMEDONE3 */
  

• if (disable && lcd3_en)

• sysc_write(ddata, dispc_offset + 0x848,
  

• 	   val & ~lcd_en_mask);
  

• return irq_mask;

+}

+/* DSS needs child outputs disabled and SDI registers cleared for reset */ +static void sysc_pre_reset_quirk_dss(struct sysc *ddata) +{

• const int dispc_offset = 0x1000;
• int error;
• u32 irq_mask, val;
• /* Get enabled outputs */
• irq_mask = sysc_quirk_dispc(ddata, dispc_offset, false);
• if (!irq_mask)

• return;
  

• /* Clear IRQSTATUS */
• sysc_write(ddata, 0x1000 + 0x18, irq_mask);

dispc_offset instead of 0x1000.

• /* Disable outputs */
• val = sysc_quirk_dispc(ddata, dispc_offset, true);
• /* Poll IRQSTATUS */
• error = readl_poll_timeout(ddata->module_va + dispc_offset + 0x18,

• 		   val, val != irq_mask, 100, 50);
  

• if (error)

• dev_warn(ddata->dev, "%s: timed out %08x !+ %08x\n",
  

• 	 __func__, val, irq_mask);
  

• if (sysc_soc->soc == SOC_3430) {

• /* Clear DSS_SDI_CONTROL */
  

• sysc_write(ddata, dispc_offset + 0x44, 0);
  

• /* Clear DSS_PLL_CONTROL */
  

• sysc_write(ddata, dispc_offset + 0x48, 0);
  

These are not dispc registers, but dss registers.

• }
• /* Clear DSS_CONTROL to switch DSS clock sources to PRCM if not */
• sysc_write(ddata, dispc_offset + 0x40, 0);

Same here.

Tomi

* Tony Lindgren tony@atomide.com [200303 15:14]:

• Tomi Valkeinen tomi.valkeinen@ti.com [200303 06:03]:

...

On 24/02/2020 21:12, Tony Lindgren wrote:

...

• if (sysc_soc->soc == SOC_3430) {

• /* Clear DSS_SDI_CONTROL */
  

• sysc_write(ddata, dispc_offset + 0x44, 0);
  

• /* Clear DSS_PLL_CONTROL */
  

• sysc_write(ddata, dispc_offset + 0x48, 0);
  

These are not dispc registers, but dss registers.

Ouch. Thanks for catching this, will include in the fix.

...

...

• }
• /* Clear DSS_CONTROL to switch DSS clock sources to PRCM if not */
• sysc_write(ddata, dispc_offset + 0x40, 0);

Same here.

Below is a fix using dispc offset for dss registers.

Regards,

Tony

8< ----------------------

From tony Mon Sep 17 00:00:00 2001

From: Tony Lindgren tony@atomide.com Date: Tue, 3 Mar 2020 07:17:43 -0800 Subject: [PATCH] bus: ti-sysc: Fix wrong offset for display subsystem reset quirk

Commit 7324a7a0d5e2 ("bus: ti-sysc: Implement display subsystem reset quirk") added support for DSS reset, but is using dispc offset also for DSS also registers as reported by Tomi Valkeinen tomi.valkeinen@ti.com. Also, we're not using dispc_offset for dispc IRQSTATUS register so let's fix that too.

Fixes: 7324a7a0d5e2 ("bus: ti-sysc: Implement display subsystem reset quirk") Reported-by: Tomi Valkeinen tomi.valkeinen@ti.com Signed-off-by: Tony Lindgren tony@atomide.com --- drivers/bus/ti-sysc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/bus/ti-sysc.c b/drivers/bus/ti-sysc.c --- a/drivers/bus/ti-sysc.c +++ b/drivers/bus/ti-sysc.c @@ -1566,7 +1566,7 @@ static void sysc_pre_reset_quirk_dss(struct sysc *ddata) return;

/* Clear IRQSTATUS */ - sysc_write(ddata, 0x1000 + 0x18, irq_mask); + sysc_write(ddata, dispc_offset + 0x18, irq_mask);

/* Disable outputs */ val = sysc_quirk_dispc(ddata, dispc_offset, true); @@ -1580,14 +1580,14 @@ static void sysc_pre_reset_quirk_dss(struct sysc *ddata)

if (sysc_soc->soc == SOC_3430) { /* Clear DSS_SDI_CONTROL */ - sysc_write(ddata, dispc_offset + 0x44, 0); + sysc_write(ddata, 0x44, 0);

/* Clear DSS_PLL_CONTROL */ - sysc_write(ddata, dispc_offset + 0x48, 0); + sysc_write(ddata, 0x48, 0); }

/* Clear DSS_CONTROL to switch DSS clock sources to PRCM if not */ - sysc_write(ddata, dispc_offset + 0x40, 0); + sysc_write(ddata, 0x40, 0); }

/* 1-wire needs module's internal clocks enabled for reset */