Skip to contentSkip to conversation

ARM: dra7xx: hwmod: drop .modulemode from pcie1/2 hwmods

PATCH New grygorii.strashko at linaro.org 3 participants 12 messages Feb 3, 2015 – Feb 13, 2015

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: dra7xx: hwmod: drop .modulemode from pcie1/2 hwmods

From: Grygorii Strashko <[email protected]>

Now DRA7xx pcie1/2 hwmods define PRCM configuration as following:
.clkctrl_offs = DRA7XX_CM_PCIE_CLKSTCTRL_OFFSET, .rstctrl_offs = DRA7XX_RM_L3INIT_RSTCTRL_OFFSET,
.modulemode = MODULEMODE_SWCTRL,
which is completely wrong because DRA7XX_CM_PCIE_CLKSTCTRL_OFFSET is clockdomain ctrl register and NOT module ctrl register. And they have diffrent allowed values for bits[0,1]:
CLKTRCTRL?????????MODULEMODE?????????????????????????????????? 0x0:?NO_SLEEP?????0x0:?Module?is?disabled?by?SW.?????????????? 0x1:?SW_SLEEP?????0x1:?Module?is?managed?automatically?by?HW?? 0x2:?SW_WKUP??????0x2:?Module?is?explicitly?enabled.?????????? 0x3:?HW_AUTO??????0x3:?Reserved??

As result, following message can be seen during suspend:
"omap_hwmod: pcie1: _wait_target_disable failed"

Fix it by removing .modulemode from pcie1/2 hwmods and, in that way, prevent clockdomain ctrl register writing from HWMOD core.

---

More over, it looks like pcie1/2 hwmods are fake and have to be dropped at all. The real HWMODs are PCIESS1/2.
Unfortunatelly, not all information on PCIE is public, so
I could be wrong here.

---
 arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 2 --
 1 file changed, 2 deletions(-)
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +0 -2
index ffd6604..a428b2d 100644
@@ -1478,7 +1478,6 @@ static struct omap_hwmod dra7xx_pcie1_hwmod = {
 	.prcm = {
 		.omap4 = {
 			.clkctrl_offs	= DRA7XX_CM_PCIE_CLKSTCTRL_OFFSET,
-			.modulemode	= MODULEMODE_SWCTRL,
 		},
 	},
 };
@@ -1492,7 +1491,6 @@ static struct omap_hwmod dra7xx_pcie2_hwmod = {
 	.prcm = {
 		.omap4 = {
 			.clkctrl_offs = DRA7XX_CM_PCIE_CLKSTCTRL_OFFSET,
-			.modulemode   = MODULEMODE_SWCTRL,
 		},
 	},
 };
Signature · 1 line
1.9.1
#1 lore raw

PATCH 1/1 ARM: dra7xx: hwmod: drop .modulemode from pcie1/2 hwmods

Hi,

Quoted 15 lines · grygorii.strashko at linaro.org

From: Grygorii Strashko <[email protected]>

Now DRA7xx pcie1/2 hwmods define PRCM configuration as following:
.clkctrl_offs = DRA7XX_CM_PCIE_CLKSTCTRL_OFFSET, .rstctrl_offs = DRA7XX_RM_L3INIT_RSTCTRL_OFFSET,
.modulemode = MODULEMODE_SWCTRL,
which is completely wrong because DRA7XX_CM_PCIE_CLKSTCTRL_OFFSET is clockdomain ctrl register and NOT module ctrl register. And they have diffrent allowed values for bits[0,1]:
CLKTRCTRL?????????MODULEMODE?????????????????????????????????? 0x0:?NO_SLEEP?????0x0:?Module?is?disabled?by?SW.?????????????? 0x1:?SW_SLEEP?????0x1:?Module?is?managed?automatically?by?HW?? 0x2:?SW_WKUP??????0x2:?Module?is?explicitly?enabled.?????????? 0x3:?HW_AUTO??????0x3:?Reserved??

Quoted 5 lines

As result, following message can be seen during suspend:
"omap_hwmod: pcie1: _wait_target_disable failed"

Fix it by removing .modulemode from pcie1/2 hwmods and, in that way, prevent clockdomain ctrl register writing from HWMOD core.

Looks correct except for one change.

Quoted 6 lines

---

More over, it looks like pcie1/2 hwmods are fake and have to be dropped at all. The real HWMODs are PCIESS1/2.

Not sure I get this. You mean "dra7xx_pcie1_hwmod" should be replaced with "dra7xx_pciess1_hwmod"? Or you mean an entire new hwmod is missing?

Please note we still have to enable the clock domain and main clock. We've also purposefully omitted sysconfig from hwmod data since pcie reset (RM_PCIESS_RSTCTRL) should be done before accessing the syconfig register and the infrastructure for that is currently not present.

Quoted 11 lines

Unfortunatelly, not all information on PCIE is public, so I could be wrong here.

---
 arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 2 --
 1 file changed, 2 deletions(-)
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +0 -0
index ffd6604..a428b2d 100644

arch/arm/mach-omap2/omap_hwmod_7xx_data.c static struct omap_hwmod dra7xx_pcie1_hwmod = { · line 1481

Quoted 4 lines
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +0 -1
@@ -1478,7 +1478,6 @@ static struct omap_hwmod dra7xx_pcie1_hwmod = {
 	.prcm = {
 		.omap4 = {
 			.clkctrl_offs	= DRA7XX_CM_PCIE_CLKSTCTRL_OFFSET,
-			.modulemode	= MODULEMODE_SWCTRL,

I think the entire .prcm can be removed here.

arch/arm/mach-omap2/omap_hwmod_7xx_data.c static struct omap_hwmod dra7xx_pcie2_hwmod = { · line 1496

Quoted 12 lines
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +0 -1
 		},
 	},
 };
@@ -1492,7 +1491,6 @@ static struct omap_hwmod dra7xx_pcie2_hwmod = {
 	.prcm = {
 		.omap4 = {
 			.clkctrl_offs = DRA7XX_CM_PCIE_CLKSTCTRL_OFFSET,
-			.modulemode   = MODULEMODE_SWCTRL,
 		},
 	},
 };

Thanks
Kishon

#2 lore raw

PATCH 1/1 ARM: dra7xx: hwmod: drop .modulemode from pcie1/2 hwmods

Hi Kishon,

Quoted 32 lines · Kishon Vijay Abraham I
Quoted 15 lines · grygorii.strashko at linaro.org

From: Grygorii Strashko <[email protected]>

Now DRA7xx pcie1/2 hwmods define PRCM configuration as following:
.clkctrl_offs = DRA7XX_CM_PCIE_CLKSTCTRL_OFFSET, .rstctrl_offs = DRA7XX_RM_L3INIT_RSTCTRL_OFFSET,
.modulemode = MODULEMODE_SWCTRL,
which is completely wrong because DRA7XX_CM_PCIE_CLKSTCTRL_OFFSET is clockdomain ctrl register and NOT module ctrl register. And they have diffrent allowed values for bits[0,1]:
CLKTRCTRL?????????MODULEMODE?????????????????????????????????? 0x0:?NO_SLEEP?????0x0:?Module?is?disabled?by?SW.?????????????? 0x1:?SW_SLEEP?????0x1:?Module?is?managed?automatically?by?HW?? 0x2:?SW_WKUP??????0x2:?Module?is?explicitly?enabled.?????????? 0x3:?HW_AUTO??????0x3:?Reserved??

Quoted 5 lines

As result, following message can be seen during suspend:
"omap_hwmod: pcie1: _wait_target_disable failed"

Fix it by removing .modulemode from pcie1/2 hwmods and, in that way, prevent clockdomain ctrl register writing from HWMOD core.

Looks correct except for one change.

Quoted 6 lines

---

More over, it looks like pcie1/2 hwmods are fake and have to be dropped at all. The real HWMODs are PCIESS1/2.

Quoted 7 lines

Not sure I get this. You mean "dra7xx_pcie1_hwmod" should be replaced with "dra7xx_pciess1_hwmod"? Or you mean an entire new hwmod is missing?

Please note we still have to enable the clock domain and main clock. We've also purposefully omitted sysconfig from hwmod data since pcie reset (RM_PCIESS_RSTCTRL) should be done before accessing the syconfig register and the infrastructure for that is currently not present.

What I'm trying to say is that now PM control data mixed between "pcieX" and "pcieX-phy" hwmods. After this patch "pcieX" hwmods will actually do nothing (I assume that "pciex-phy" will be enabled before "pcieX"), and probably can be removed if "pcie_clkdm" could be attached to "pcieX-phy" hwmod instead.

More over, now, "pcie_clkdm" is connected to "pcieX" hwmod while MODULEMODE register is controlled by "pciex-phy" hwmod, so when pciess is going to be enabled the "l3init_clkdm" will be waken-up by hwmode core and not "pcie_clkdm" - as I can remember this is not good (we should alway wake-up clockdomain
and keep it in SWSUP mode while changing MODULEMODE and SYSC registers).

static struct omap_hwmod dra7xx_pcie1_hwmod = {
	.name		= "pcie1",
	.class		= &dra7xx_pcie_hwmod_class,
	.clkdm_name	= "pcie_clkdm",
	.main_clk	= "l4_root_clk_div",
static struct omap_hwmod dra7xx_pcie1_phy_hwmod = {
	.name		= "pcie1-phy",
	.class		= &dra7xx_pcie_phy_hwmod_class,
	.clkdm_name	= "l3init_clkdm",
	.main_clk	= "l4_root_clk_div",

So, in my opinion, some rework may be needed here. Am I right?

Quoted 7 lines
Quoted 7 lines

Unfortunatelly, not all information on PCIE is public, so I could be wrong here.

---
  arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 2 --
  1 file changed, 2 deletions(-)
Quoted 11 lines

arch/arm/mach-omap2/omap_hwmod_7xx_data.c static struct omap_hwmod dra7xx_pcie1_hwmod = { · line 1481

Quoted 9 lines
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +0 -1
index ffd6604..a428b2d 100644
@@ -1478,7 +1478,6 @@ static struct omap_hwmod dra7xx_pcie1_hwmod = {
  	.prcm = {
  		.omap4 = {
  			.clkctrl_offs	= DRA7XX_CM_PCIE_CLKSTCTRL_OFFSET,
-			.modulemode	= MODULEMODE_SWCTRL,

I think the entire .prcm can be removed here.

not sure. I've tried it and Kernel boot failed (on 3.14)

Quoted 16 lines

arch/arm/mach-omap2/omap_hwmod_7xx_data.c static struct omap_hwmod dra7xx_pcie2_hwmod = { · line 1496

Quoted 12 lines
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +0 -1
  		},
  	},
  };
@@ -1492,7 +1491,6 @@ static struct omap_hwmod dra7xx_pcie2_hwmod = {
  	.prcm = {
  		.omap4 = {
  			.clkctrl_offs = DRA7XX_CM_PCIE_CLKSTCTRL_OFFSET,
-			.modulemode   = MODULEMODE_SWCTRL,
  		},
  	},
  };

Thanks
Kishon

Signature · 2 lines
regards,
-grygorii
#3 lore raw

PATCH 1/1 ARM: dra7xx: hwmod: drop .modulemode from pcie1/2 hwmods

Hi,

Quoted 58 lines · Grygorii.Strashko at linaro.org

Hi Kishon,

Quoted 32 lines · Kishon Vijay Abraham I
Quoted 15 lines · grygorii.strashko at linaro.org

From: Grygorii Strashko <[email protected]>

Now DRA7xx pcie1/2 hwmods define PRCM configuration as following:
.clkctrl_offs = DRA7XX_CM_PCIE_CLKSTCTRL_OFFSET, .rstctrl_offs = DRA7XX_RM_L3INIT_RSTCTRL_OFFSET,
.modulemode = MODULEMODE_SWCTRL,
which is completely wrong because DRA7XX_CM_PCIE_CLKSTCTRL_OFFSET is clockdomain ctrl register and NOT module ctrl register. And they have diffrent allowed values for bits[0,1]:
CLKTRCTRL?????????MODULEMODE?????????????????????????????????? 0x0:?NO_SLEEP?????0x0:?Module?is?disabled?by?SW.?????????????? 0x1:?SW_SLEEP?????0x1:?Module?is?managed?automatically?by?HW?? 0x2:?SW_WKUP??????0x2:?Module?is?explicitly?enabled.?????????? 0x3:?HW_AUTO??????0x3:?Reserved??

Quoted 5 lines

As result, following message can be seen during suspend:
"omap_hwmod: pcie1: _wait_target_disable failed"

Fix it by removing .modulemode from pcie1/2 hwmods and, in that way, prevent clockdomain ctrl register writing from HWMOD core.

Looks correct except for one change.

Quoted 6 lines

---

More over, it looks like pcie1/2 hwmods are fake and have to be dropped at all. The real HWMODs are PCIESS1/2.

Quoted 7 lines

Not sure I get this. You mean "dra7xx_pcie1_hwmod" should be replaced with "dra7xx_pciess1_hwmod"? Or you mean an entire new hwmod is missing?

Please note we still have to enable the clock domain and main clock. We've also purposefully omitted sysconfig from hwmod data since pcie reset (RM_PCIESS_RSTCTRL) should be done before accessing the syconfig register and the infrastructure for that is currently not present.

What I'm trying to say is that now PM control data mixed between "pcieX" and "pcieX-phy" hwmods. After this patch "pcieX" hwmods will actually do nothing (I assume that "pciex-phy" will be enabled before "pcieX"), and probably can be removed if "pcie_clkdm" could be attached to "pcieX-phy" hwmod instead.

More over, now, "pcie_clkdm" is connected to "pcieX" hwmod while MODULEMODE register is controlled by "pciex-phy" hwmod, so when pciess is going to be enabled the "l3init_clkdm" will be waken-up by hwmode core and not "pcie_clkdm" - as I can remember this is not good (we should alway wake-up clockdomain
and keep it in SWSUP mode while changing MODULEMODE and SYSC registers).

static struct omap_hwmod dra7xx_pcie1_hwmod = {
	.name		= "pcie1",
	.class		= &dra7xx_pcie_hwmod_class,
	.clkdm_name	= "pcie_clkdm",
	.main_clk	= "l4_root_clk_div",
Quoted 8 lines
static struct omap_hwmod dra7xx_pcie1_phy_hwmod = {
	.name		= "pcie1-phy",
	.class		= &dra7xx_pcie_phy_hwmod_class,
	.clkdm_name	= "l3init_clkdm",
	.main_clk	= "l4_root_clk_div",

So, in my opinion, some rework may be needed here. Am I right?

you are right. We should have a single hwmod like dra7xx_pciess1_hwmod whose clkdm should be "pcie_clkdm" and whose clkctrl_offs should be DRA7XX_CM_L3INIT_PCIESS1_CLKCTRL_OFFSET (for controlling MODULEMODE). PCIE PHY shouldn't have a hwmod entry at all.

Thanks
Kishon

#4 lore raw

PATCH 1/1 ARM: dra7xx: hwmod: drop .modulemode from pcie1/2 hwmods

Quoted 70 lines · Kishon Vijay Abraham I

Hi,

Quoted 58 lines · Grygorii.Strashko at linaro.org

Hi Kishon,

Quoted 32 lines · Kishon Vijay Abraham I
Quoted 15 lines · grygorii.strashko at linaro.org

From: Grygorii Strashko <[email protected]>

Now DRA7xx pcie1/2 hwmods define PRCM configuration as following:
.clkctrl_offs = DRA7XX_CM_PCIE_CLKSTCTRL_OFFSET, .rstctrl_offs = DRA7XX_RM_L3INIT_RSTCTRL_OFFSET,
.modulemode = MODULEMODE_SWCTRL,
which is completely wrong because DRA7XX_CM_PCIE_CLKSTCTRL_OFFSET is clockdomain ctrl register and NOT module ctrl register. And they have diffrent allowed values for bits[0,1]:
CLKTRCTRL?????????MODULEMODE?????????????????????????????????? 0x0:?NO_SLEEP?????0x0:?Module?is?disabled?by?SW.?????????????? 0x1:?SW_SLEEP?????0x1:?Module?is?managed?automatically?by?HW?? 0x2:?SW_WKUP??????0x2:?Module?is?explicitly?enabled.?????????? 0x3:?HW_AUTO??????0x3:?Reserved??

Quoted 5 lines

As result, following message can be seen during suspend:
"omap_hwmod: pcie1: _wait_target_disable failed"

Fix it by removing .modulemode from pcie1/2 hwmods and, in that way, prevent clockdomain ctrl register writing from HWMOD core.

Looks correct except for one change.

Quoted 6 lines

---

More over, it looks like pcie1/2 hwmods are fake and have to be dropped at all. The real HWMODs are PCIESS1/2.

Quoted 7 lines

Not sure I get this. You mean "dra7xx_pcie1_hwmod" should be replaced with "dra7xx_pciess1_hwmod"? Or you mean an entire new hwmod is missing?

Please note we still have to enable the clock domain and main clock. We've also purposefully omitted sysconfig from hwmod data since pcie reset (RM_PCIESS_RSTCTRL) should be done before accessing the syconfig register and the infrastructure for that is currently not present.

What I'm trying to say is that now PM control data mixed between "pcieX" and "pcieX-phy" hwmods. After this patch "pcieX" hwmods will actually do nothing (I assume that "pciex-phy" will be enabled before "pcieX"), and probably can be removed if "pcie_clkdm" could be attached to "pcieX-phy" hwmod instead.

More over, now, "pcie_clkdm" is connected to "pcieX" hwmod while MODULEMODE register is controlled by "pciex-phy" hwmod, so when pciess is going to be enabled the "l3init_clkdm" will be waken-up by hwmode core and not "pcie_clkdm" - as I can remember this is not good (we should alway wake-up clockdomain
and keep it in SWSUP mode while changing MODULEMODE and SYSC registers).

static struct omap_hwmod dra7xx_pcie1_hwmod = {
	.name		= "pcie1",
	.class		= &dra7xx_pcie_hwmod_class,
	.clkdm_name	= "pcie_clkdm",
	.main_clk	= "l4_root_clk_div",
Quoted 8 lines
static struct omap_hwmod dra7xx_pcie1_phy_hwmod = {
	.name		= "pcie1-phy",
	.class		= &dra7xx_pcie_phy_hwmod_class,
	.clkdm_name	= "l3init_clkdm",
	.main_clk	= "l4_root_clk_div",

So, in my opinion, some rework may be needed here. Am I right?

Quoted 8 lines

you are right. We should have a single hwmod like dra7xx_pciess1_hwmod whose clkdm should be "pcie_clkdm" and whose clkctrl_offs should be DRA7XX_CM_L3INIT_PCIESS1_CLKCTRL_OFFSET (for controlling MODULEMODE). PCIE PHY shouldn't have a hwmod entry at all.

Thanks
Kishon

Could this patch be applied any way? It fixes real issue for me.

Signature · 2 lines
regards,
-grygorii
#5 lore raw

PATCH 1/1 ARM: dra7xx: hwmod: drop .modulemode from pcie1/2 hwmods

+tero

Hi,

Quoted 90 lines · Grygorii.Strashko at linaro.org
Quoted 89 lines · Kishon Vijay Abraham I

Hi,

Quoted 70 lines · Grygorii.Strashko at linaro.org

Hi Kishon,

Quoted 38 lines · Kishon Vijay Abraham I
Quoted 15 lines · grygorii.strashko at linaro.org

From: Grygorii Strashko <[email protected]>

Now DRA7xx pcie1/2 hwmods define PRCM configuration as following:
.clkctrl_offs = DRA7XX_CM_PCIE_CLKSTCTRL_OFFSET, .rstctrl_offs = DRA7XX_RM_L3INIT_RSTCTRL_OFFSET,
.modulemode = MODULEMODE_SWCTRL,
which is completely wrong because DRA7XX_CM_PCIE_CLKSTCTRL_OFFSET is clockdomain ctrl register and NOT module ctrl register. And they have diffrent allowed values for bits[0,1]:
CLKTRCTRL?????????MODULEMODE?????????????????????????????????? 0x0:?NO_SLEEP?????0x0:?Module?is?disabled?by?SW.?????????????? 0x1:?SW_SLEEP?????0x1:?Module?is?managed?automatically?by?HW?? 0x2:?SW_WKUP??????0x2:?Module?is?explicitly?enabled.?????????? 0x3:?HW_AUTO??????0x3:?Reserved??

Quoted 5 lines

As result, following message can be seen during suspend:
"omap_hwmod: pcie1: _wait_target_disable failed"

Fix it by removing .modulemode from pcie1/2 hwmods and, in that way, prevent clockdomain ctrl register writing from HWMOD core.

Looks correct except for one change.

Quoted 7 lines

---

More over, it looks like pcie1/2 hwmods are fake and have to be dropped at all.
The real HWMODs are PCIESS1/2.

Not sure I get this. You mean "dra7xx_pcie1_hwmod" should be replaced with
"dra7xx_pciess1_hwmod"? Or you mean an entire new hwmod is missing?

Quoted 6 lines

Please note we still have to enable the clock domain and main clock. We've also
purposefully omitted sysconfig from hwmod data since pcie reset (RM_PCIESS_RSTCTRL) should be done before accessing the syconfig register and
the infrastructure for that is currently not present.

What I'm trying to say is that now PM control data mixed between "pcieX" and "pcieX-phy" hwmods.
After this patch "pcieX" hwmods will actually do nothing (I assume that "pciex-phy" will be
enabled before "pcieX"), and probably can be removed if "pcie_clkdm" could be attached to "pcieX-phy" hwmod
instead.

More over, now, "pcie_clkdm" is connected to "pcieX" hwmod while MODULEMODE register is controlled
by "pciex-phy" hwmod, so when pciess is going to be enabled the "l3init_clkdm" will be waken-up by
hwmode core and not "pcie_clkdm" - as I can remember this is not good (we should alway wake-up clockdomain
and keep it in SWSUP mode while changing MODULEMODE and SYSC
registers).

static struct omap_hwmod dra7xx_pcie1_hwmod = {
.name = "pcie1",
.class = &dra7xx_pcie_hwmod_class,
.clkdm_name = "pcie_clkdm",
.main_clk = "l4_root_clk_div",

Quoted 8 lines

static struct omap_hwmod dra7xx_pcie1_phy_hwmod = {
.name = "pcie1-phy",
.class = &dra7xx_pcie_phy_hwmod_class,
.clkdm_name = "l3init_clkdm",
.main_clk = "l4_root_clk_div",

So, in my opinion, some rework may be needed here. Am I right?

you are right. We should have a single hwmod like dra7xx_pciess1_hwmod whose
clkdm should be "pcie_clkdm" and whose clkctrl_offs should be DRA7XX_CM_L3INIT_PCIESS1_CLKCTRL_OFFSET (for controlling MODULEMODE). PCIE PHY
shouldn't have a hwmod entry at all.

Quoted 5 lines
Quoted 3 lines

Thanks
Kishon

Could this patch be applied any way? It fixes real issue for me.

A proper fix should look something like below IMO

Thanks
Kishon

From 1c177d37ac46885a4dc17bacec33071ac23c56da Mon Sep 17 00:00:00 2001
From: Kishon Vijay Abraham I <[email protected]>
Date: Thu, 12 Feb 2015 11:55:08 +0530
Subject: [RFC PATCH] ARM: DRA7: hwmod_data: Fix hwmod data for pcie

Fixed hwmod data for pcie by having the correct module mode offset. Previously this module mode offset was part of pcie PHY which was wrong. Now this module mode offset was moved to pcie hwmod and removed the hwmod data
for pcie phy. While at that renamed pcie_hwmod to pciess_hwmod in order to match with the name given in TRM.

This helps to get rid of the following warning
"omap_hwmod: pcie1: _wait_target_disable failed"

[Grygorii.Strashko at linaro.org: Found the issue that actually caused
"omap_hwmod: pcie1: _wait_target_disable failed"]

---
this patch was created on 3.14 kernel after applying reset framework patches required for testing PCIe. I can port this to mainline if this patch is fine.

  arch/arm/boot/dts/dra7.dtsi               |    2 -
  arch/arm/mach-omap2/omap_hwmod_7xx_data.c |  107 
+++++++----------------------
  2 files changed, 26 insertions(+), 83 deletions(-)
arch/arm/boot/dts/dra7.dtsi +0 -2
index a4b1337..d7a1ff9 100644
@@ -1364,7 +1364,6 @@
  					      "wkupclk", "refclk",
  					      "div-clk", "phy-div";
  				#phy-cells = <0>;
-				ti,hwmods = "pcie1-phy";
  			};
 
  			pcie2_phy: pciephy at 4a095000 {
@@ -1383,7 +1382,6 @@
  					      "wkupclk", "refclk",
  					      "div-clk", "phy-div";
  				#phy-cells = <0>;
-				ti,hwmods = "pcie2-phy";
  			};
  		};
 
(quoted diff) +0 -0

b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
index 5ae755c..56f2c58 100644

arch/arm/mach-omap2/omap_hwmod_7xx_data.c +14 -51

99 lines not on this page · raw message

dra7xx_l4_cfg__ocp2scp3 = {
};

/* l3_main_1 -> pcie1 */
-static struct omap_hwmod_ocp_if dra7xx_l3_main_1__pcie1 = { +static struct omap_hwmod_ocp_if dra7xx_l3_main_1__pciess1 = {
.master = &dra7xx_l3_main_1_hwmod,
- .slave = &dra7xx_pcie1_hwmod,
+ .slave = &dra7xx_pciess1_hwmod,
.clk = "l3_iclk_div",
.user = OCP_USER_MPU | OCP_USER_SDMA,
};

/* l4_cfg -> pcie1 */
-static struct omap_hwmod_ocp_if dra7xx_l4_cfg__pcie1 = { +static struct omap_hwmod_ocp_if dra7xx_l4_cfg__pciess1 = {
.master = &dra7xx_l4_cfg_hwmod,
- .slave = &dra7xx_pcie1_hwmod,
+ .slave = &dra7xx_pciess1_hwmod,
.clk = "l4_root_clk_div",
.user = OCP_USER_MPU | OCP_USER_SDMA,
};

/* l3_main_1 -> pcie2 */
-static struct omap_hwmod_ocp_if dra7xx_l3_main_1__pcie2 = { +static struct omap_hwmod_ocp_if dra7xx_l3_main_1__pciess2 = {
.master = &dra7xx_l3_main_1_hwmod,
- .slave = &dra7xx_pcie2_hwmod,
+ .slave = &dra7xx_pciess2_hwmod,
.clk = "l3_iclk_div",
.user = OCP_USER_MPU | OCP_USER_SDMA,
};

/* l4_cfg -> pcie2 */
-static struct omap_hwmod_ocp_if dra7xx_l4_cfg__pcie2 = {
- .master = &dra7xx_l4_cfg_hwmod,
- .slave = &dra7xx_pcie2_hwmod,
- .clk = "l4_root_clk_div",
- .user = OCP_USER_MPU | OCP_USER_SDMA,
-};
-
-/* l4_cfg -> pcie1 phy */
-static struct omap_hwmod_ocp_if dra7xx_l4_cfg__pcie1_phy = {
- .master = &dra7xx_l4_cfg_hwmod,
- .slave = &dra7xx_pcie1_phy_hwmod,
- .clk = "l4_root_clk_div",
- .user = OCP_USER_MPU | OCP_USER_SDMA,
-};
-
-/* l4_cfg -> pcie2 phy */
-static struct omap_hwmod_ocp_if dra7xx_l4_cfg__pcie2_phy = { +static struct omap_hwmod_ocp_if dra7xx_l4_cfg__pciess2 = {
.master = &dra7xx_l4_cfg_hwmod,
- .slave = &dra7xx_pcie2_phy_hwmod,
+ .slave = &dra7xx_pciess2_hwmod,
.clk = "l4_root_clk_div",
.user = OCP_USER_MPU | OCP_USER_SDMA,
};
@@ -4153,12 +4100,10 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = {
&dra7xx_l4_cfg__mpu, &dra7xx_l4_cfg__ocp2scp1, &dra7xx_l4_cfg__ocp2scp3,
- &dra7xx_l3_main_1__pcie1,
- &dra7xx_l4_cfg__pcie1,
- &dra7xx_l3_main_1__pcie2,
- &dra7xx_l4_cfg__pcie2,
- &dra7xx_l4_cfg__pcie1_phy,
- &dra7xx_l4_cfg__pcie2_phy,
+ &dra7xx_l3_main_1__pciess1,
+ &dra7xx_l4_cfg__pciess1,
+ &dra7xx_l3_main_1__pciess2,
+ &dra7xx_l4_cfg__pciess2,
&dra7xx_l4_cfg__pruss1, /* AM57xx only */ &dra7xx_l4_cfg__pruss2, /* AM57xx only */ &dra7xx_l3_main_1__qspi,

Signature · 1 line
1.7.9.5
Quoted 1 line
#6 lore raw

PATCH 1/1 ARM: dra7xx: hwmod: drop .modulemode from pcie1/2 hwmods

Quoted 91 lines · Kishon Vijay Abraham I
Quoted 90 lines · Grygorii.Strashko at linaro.org
Quoted 89 lines · Kishon Vijay Abraham I

Hi,

Quoted 70 lines · Grygorii.Strashko at linaro.org

Hi Kishon,

Quoted 38 lines · Kishon Vijay Abraham I
Quoted 15 lines · grygorii.strashko at linaro.org

From: Grygorii Strashko <[email protected]>

Now DRA7xx pcie1/2 hwmods define PRCM configuration as following:
.clkctrl_offs = DRA7XX_CM_PCIE_CLKSTCTRL_OFFSET, .rstctrl_offs = DRA7XX_RM_L3INIT_RSTCTRL_OFFSET,
.modulemode = MODULEMODE_SWCTRL,
which is completely wrong because DRA7XX_CM_PCIE_CLKSTCTRL_OFFSET is clockdomain ctrl register and NOT module ctrl register. And they have diffrent allowed values for bits[0,1]:
CLKTRCTRL?????????MODULEMODE?????????????????????????????????? 0x0:?NO_SLEEP?????0x0:?Module?is?disabled?by?SW.?????????????? 0x1:?SW_SLEEP?????0x1:?Module?is?managed?automatically?by?HW?? 0x2:?SW_WKUP??????0x2:?Module?is?explicitly?enabled.?????????? 0x3:?HW_AUTO??????0x3:?Reserved??

Quoted 5 lines

As result, following message can be seen during suspend:
"omap_hwmod: pcie1: _wait_target_disable failed"

Fix it by removing .modulemode from pcie1/2 hwmods and, in that way, prevent clockdomain ctrl register writing from HWMOD core.

Looks correct except for one change.

Quoted 7 lines

---

More over, it looks like pcie1/2 hwmods are fake and have to be dropped at all.
The real HWMODs are PCIESS1/2.

Not sure I get this. You mean "dra7xx_pcie1_hwmod" should be replaced with
"dra7xx_pciess1_hwmod"? Or you mean an entire new hwmod is missing?

Quoted 6 lines

Please note we still have to enable the clock domain and main clock. We've also
purposefully omitted sysconfig from hwmod data since pcie reset (RM_PCIESS_RSTCTRL) should be done before accessing the syconfig register and
the infrastructure for that is currently not present.

What I'm trying to say is that now PM control data mixed between "pcieX" and "pcieX-phy" hwmods.
After this patch "pcieX" hwmods will actually do nothing (I assume that "pciex-phy" will be
enabled before "pcieX"), and probably can be removed if "pcie_clkdm" could be attached to "pcieX-phy" hwmod
instead.

More over, now, "pcie_clkdm" is connected to "pcieX" hwmod while MODULEMODE register is controlled
by "pciex-phy" hwmod, so when pciess is going to be enabled the "l3init_clkdm" will be waken-up by
hwmode core and not "pcie_clkdm" - as I can remember this is not good (we should alway wake-up clockdomain
and keep it in SWSUP mode while changing MODULEMODE and SYSC
registers).

static struct omap_hwmod dra7xx_pcie1_hwmod = {
.name = "pcie1",
.class = &dra7xx_pcie_hwmod_class,
.clkdm_name = "pcie_clkdm",
.main_clk = "l4_root_clk_div",

Quoted 8 lines

static struct omap_hwmod dra7xx_pcie1_phy_hwmod = {
.name = "pcie1-phy",
.class = &dra7xx_pcie_phy_hwmod_class,
.clkdm_name = "l3init_clkdm",
.main_clk = "l4_root_clk_div",

So, in my opinion, some rework may be needed here. Am I right?

you are right. We should have a single hwmod like dra7xx_pciess1_hwmod whose
clkdm should be "pcie_clkdm" and whose clkctrl_offs should be DRA7XX_CM_L3INIT_PCIESS1_CLKCTRL_OFFSET (for controlling MODULEMODE). PCIE PHY
shouldn't have a hwmod entry at all.

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines

Thanks
Kishon

Could this patch be applied any way? It fixes real issue for me.

A proper fix should look something like below IMO

Looks good for me and seems working.

Quoted 234 lines

From 1c177d37ac46885a4dc17bacec33071ac23c56da Mon Sep 17 00:00:00 2001
From: Kishon Vijay Abraham I <[email protected]>
Date: Thu, 12 Feb 2015 11:55:08 +0530
Subject: [RFC PATCH] ARM: DRA7: hwmod_data: Fix hwmod data for pcie

Fixed hwmod data for pcie by having the correct module mode offset. Previously this module mode offset was part of pcie PHY which was wrong. Now this module mode offset was moved to pcie hwmod and removed the hwmod data
for pcie phy. While at that renamed pcie_hwmod to pciess_hwmod in order to match with the name given in TRM.

This helps to get rid of the following warning
"omap_hwmod: pcie1: _wait_target_disable failed"

[Grygorii.Strashko at linaro.org: Found the issue that actually caused
"omap_hwmod: pcie1: _wait_target_disable failed"]

---
this patch was created on 3.14 kernel after applying reset framework patches
required for testing PCIe. I can port this to mainline if this patch is fine.

  arch/arm/boot/dts/dra7.dtsi               |    2 -
  arch/arm/mach-omap2/omap_hwmod_7xx_data.c |  107
+++++++----------------------
  2 files changed, 26 insertions(+), 83 deletions(-)
arch/arm/boot/dts/dra7.dtsi +0 -2
index a4b1337..d7a1ff9 100644
@@ -1364,7 +1364,6 @@
                            "wkupclk", "refclk",
                            "div-clk", "phy-div";
                  #phy-cells = <0>;
-                ti,hwmods = "pcie1-phy";
              };
 
              pcie2_phy: pciephy at 4a095000 {
@@ -1383,7 +1382,6 @@
                            "wkupclk", "refclk",
                            "div-clk", "phy-div";
                  #phy-cells = <0>;
-                ti,hwmods = "pcie2-phy";
              };
          };
 
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +22 -75
index 5ae755c..56f2c58 100644
@@ -1968,25 +1968,26 @@ static struct omap_hwmod dra7xx_ocp2scp3_hwmod = {
   *
   */
 
-static struct omap_hwmod_class dra7xx_pcie_hwmod_class = {
+static struct omap_hwmod_class dra7xx_pciess_hwmod_class = {
      .name    = "pcie",
  };
 
  /* pcie1 */
-static struct omap_hwmod_rst_info dra7xx_pcie1_resets[] = {
+static struct omap_hwmod_rst_info dra7xx_pciess1_resets[] = {
      { .name = "pcie", .rst_shift = 0 },
  };
 
-static struct omap_hwmod dra7xx_pcie1_hwmod = {
+static struct omap_hwmod dra7xx_pciess1_hwmod = {
      .name        = "pcie1",
-    .class        = &dra7xx_pcie_hwmod_class,
+    .class        = &dra7xx_pciess_hwmod_class,
      .clkdm_name    = "pcie_clkdm",
-    .rst_lines    = dra7xx_pcie1_resets,
-    .rst_lines_cnt    = ARRAY_SIZE(dra7xx_pcie1_resets),
+    .rst_lines    = dra7xx_pciess1_resets,
+    .rst_lines_cnt    = ARRAY_SIZE(dra7xx_pciess1_resets),
      .main_clk    = "l4_root_clk_div",
      .prcm = {
          .omap4 = {
-            .clkctrl_offs    = DRA7XX_CM_PCIE_CLKSTCTRL_OFFSET,
+            .clkctrl_offs = DRA7XX_CM_L3INIT_PCIESS1_CLKCTRL_OFFSET,
+            .context_offs = DRA7XX_RM_L3INIT_PCIESS1_CONTEXT_OFFSET,
              .rstctrl_offs    = DRA7XX_RM_L3INIT_RSTCTRL_OFFSET,
              .modulemode    = MODULEMODE_SWCTRL,
          },
@@ -1994,60 +1995,22 @@ static struct omap_hwmod dra7xx_pcie1_hwmod = {
  };
 
  /* pcie2 */
-static struct omap_hwmod_rst_info dra7xx_pcie2_resets[] = {
+static struct omap_hwmod_rst_info dra7xx_pciess2_resets[] = {
      { .name = "pcie", .rst_shift = 1 },
  };
 
-static struct omap_hwmod dra7xx_pcie2_hwmod = {
+static struct omap_hwmod dra7xx_pciess2_hwmod = {
      .name        = "pcie2",
-    .class        = &dra7xx_pcie_hwmod_class,
+    .class        = &dra7xx_pciess_hwmod_class,
      .clkdm_name    = "pcie_clkdm",
-    .rst_lines    = dra7xx_pcie2_resets,
-    .rst_lines_cnt    = ARRAY_SIZE(dra7xx_pcie2_resets),
-    .main_clk    = "l4_root_clk_div",
-    .prcm = {
-        .omap4 = {
-            .clkctrl_offs = DRA7XX_CM_PCIE_CLKSTCTRL_OFFSET,
-            .rstctrl_offs = DRA7XX_RM_L3INIT_RSTCTRL_OFFSET,
-            .modulemode   = MODULEMODE_SWCTRL,
-        },
-    },
-};
-
-/*
- * 'PCIE PHY' class
- *
- */
-
-static struct omap_hwmod_class dra7xx_pcie_phy_hwmod_class = {
-    .name    = "pcie-phy",
-};
-
-/* pcie1 phy */
-static struct omap_hwmod dra7xx_pcie1_phy_hwmod = {
-    .name        = "pcie1-phy",
-    .class        = &dra7xx_pcie_phy_hwmod_class,
-    .clkdm_name    = "l3init_clkdm",
-    .main_clk    = "l4_root_clk_div",
-    .prcm = {
-        .omap4 = {
-            .clkctrl_offs = DRA7XX_CM_L3INIT_PCIESS1_CLKCTRL_OFFSET,
-            .context_offs = DRA7XX_RM_L3INIT_PCIESS1_CONTEXT_OFFSET,
-            .modulemode   = MODULEMODE_SWCTRL,
-        },
-    },
-};
-
-/* pcie2 phy */
-static struct omap_hwmod dra7xx_pcie2_phy_hwmod = {
-    .name        = "pcie2-phy",
-    .class        = &dra7xx_pcie_phy_hwmod_class,
-    .clkdm_name    = "l3init_clkdm",
+    .rst_lines    = dra7xx_pciess2_resets,
+    .rst_lines_cnt    = ARRAY_SIZE(dra7xx_pciess2_resets),
      .main_clk    = "l4_root_clk_div",
      .prcm = {
          .omap4 = {
              .clkctrl_offs = DRA7XX_CM_L3INIT_PCIESS2_CLKCTRL_OFFSET,
              .context_offs = DRA7XX_RM_L3INIT_PCIESS2_CONTEXT_OFFSET,
+            .rstctrl_offs = DRA7XX_RM_L3INIT_RSTCTRL_OFFSET,
              .modulemode   = MODULEMODE_SWCTRL,
          },
      },
@@ -3621,49 +3584,33 @@ static struct omap_hwmod_ocp_if
 dra7xx_l4_cfg__ocp2scp3 = {
  };
 
  /* l3_main_1 -> pcie1 */
-static struct omap_hwmod_ocp_if dra7xx_l3_main_1__pcie1 = {
+static struct omap_hwmod_ocp_if dra7xx_l3_main_1__pciess1 = {
      .master        = &dra7xx_l3_main_1_hwmod,
-    .slave        = &dra7xx_pcie1_hwmod,
+    .slave        = &dra7xx_pciess1_hwmod,
      .clk        = "l3_iclk_div",
      .user        = OCP_USER_MPU | OCP_USER_SDMA,
  };
 
  /* l4_cfg -> pcie1 */
-static struct omap_hwmod_ocp_if dra7xx_l4_cfg__pcie1 = {
+static struct omap_hwmod_ocp_if dra7xx_l4_cfg__pciess1 = {
      .master        = &dra7xx_l4_cfg_hwmod,
-    .slave        = &dra7xx_pcie1_hwmod,
+    .slave        = &dra7xx_pciess1_hwmod,
      .clk        = "l4_root_clk_div",
      .user        = OCP_USER_MPU | OCP_USER_SDMA,
  };
 
  /* l3_main_1 -> pcie2 */
-static struct omap_hwmod_ocp_if dra7xx_l3_main_1__pcie2 = {
+static struct omap_hwmod_ocp_if dra7xx_l3_main_1__pciess2 = {
      .master        = &dra7xx_l3_main_1_hwmod,
-    .slave        = &dra7xx_pcie2_hwmod,
+    .slave        = &dra7xx_pciess2_hwmod,
      .clk        = "l3_iclk_div",
      .user        = OCP_USER_MPU | OCP_USER_SDMA,
  };
 
  /* l4_cfg -> pcie2 */
-static struct omap_hwmod_ocp_if dra7xx_l4_cfg__pcie2 = {
-    .master        = &dra7xx_l4_cfg_hwmod,
-    .slave        = &dra7xx_pcie2_hwmod,
-    .clk        = "l4_root_clk_div",
-    .user        = OCP_USER_MPU | OCP_USER_SDMA,
-};
-
-/* l4_cfg -> pcie1 phy */
-static struct omap_hwmod_ocp_if dra7xx_l4_cfg__pcie1_phy = {
-    .master        = &dra7xx_l4_cfg_hwmod,
-    .slave        = &dra7xx_pcie1_phy_hwmod,
-    .clk        = "l4_root_clk_div",
-    .user        = OCP_USER_MPU | OCP_USER_SDMA,
-};
-
-/* l4_cfg -> pcie2 phy */
-static struct omap_hwmod_ocp_if dra7xx_l4_cfg__pcie2_phy = {
+static struct omap_hwmod_ocp_if dra7xx_l4_cfg__pciess2 = {
      .master        = &dra7xx_l4_cfg_hwmod,
-    .slave        = &dra7xx_pcie2_phy_hwmod,
+    .slave        = &dra7xx_pciess2_hwmod,
      .clk        = "l4_root_clk_div",
      .user        = OCP_USER_MPU | OCP_USER_SDMA,
  };
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +4 -6
@@ -4153,12 +4100,10 @@ static struct omap_hwmod_ocp_if
 *dra7xx_hwmod_ocp_ifs[] __initdata = {
      &dra7xx_l4_cfg__mpu,
      &dra7xx_l4_cfg__ocp2scp1,
      &dra7xx_l4_cfg__ocp2scp3,
-    &dra7xx_l3_main_1__pcie1,
-    &dra7xx_l4_cfg__pcie1,
-    &dra7xx_l3_main_1__pcie2,
-    &dra7xx_l4_cfg__pcie2,
-    &dra7xx_l4_cfg__pcie1_phy,
-    &dra7xx_l4_cfg__pcie2_phy,
+    &dra7xx_l3_main_1__pciess1,
+    &dra7xx_l4_cfg__pciess1,
+    &dra7xx_l3_main_1__pciess2,
+    &dra7xx_l4_cfg__pciess2,
      &dra7xx_l4_cfg__pruss1, /* AM57xx only */
      &dra7xx_l4_cfg__pruss2, /* AM57xx only */
      &dra7xx_l3_main_1__qspi,
Signature · 2 lines
regards,
-grygorii
maintainer
#7 lore raw

PATCH 1/1 ARM: dra7xx: hwmod: drop .modulemode from pcie1/2 hwmods

Thanks guys.

Quoted 1 line · Grygorii.Strashko at linaro.org

Looks good for me and seems working.

Grygorii, can I add your Acked-by?

- Paul

#8 lore raw

PATCH 1/1 ARM: dra7xx: hwmod: drop .modulemode from pcie1/2 hwmods

Quoted 11 lines · Paul Walmsley

Thanks guys.

Quoted 1 line · Grygorii.Strashko at linaro.org

Looks good for me and seems working.

Grygorii, can I add your Acked-by?

- Paul

There is my "Signed-off-by" :)

Signature · 2 lines
regards,
-grygorii
maintainer
#9 lore raw

PATCH 1/1 ARM: dra7xx: hwmod: drop .modulemode from pcie1/2 hwmods

Quoted 7 lines · Grygorii.Strashko at linaro.org
Quoted 6 lines · Paul Walmsley

Thanks guys.

Quoted 1 line · Grygorii.Strashko at linaro.org

Looks good for me and seems working.

Quoted 7 lines
Quoted 5 lines

Grygorii, can I add your Acked-by?

- Paul

There is my "Signed-off-by" :)

OK thanks, queued for v3.20-rc.

- Paul

maintainer
#10 lore raw

PATCH 1/1 ARM: dra7xx: hwmod: drop .modulemode from pcie1/2 hwmods

Quoted 12 lines · Paul Walmsley
Quoted 10 lines · Grygorii.Strashko at linaro.org
Quoted 9 lines · Paul Walmsley

Thanks guys.

Quoted 1 line · Grygorii.Strashko at linaro.org

Looks good for me and seems working.

Grygorii, can I add your Acked-by?

Quoted 6 lines
Quoted 4 lines
Quoted 2 lines

- Paul

There is my "Signed-off-by" :)

OK thanks, queued for v3.20-rc.

Actually, could you guys test the updated patch? It had to be changed to apply on mainline and I don't have a DRA7xx board to test.

- Paul

Quoted 1 line

From 0f9a1ee083a7adbb2c867d5c8d25d7e5fcb38b07 Mon Sep 17 00:00:00 2001

From: Kishon Vijay Abraham I <[email protected]>
Date: Thu, 12 Feb 2015 09:29:31 -0700
Subject: [PATCH] ARM: DRA7: hwmod_data: Fix hwmod data for pcie

Fixed hwmod data for pcie by having the correct module mode offset. Previously this module mode offset was part of pcie PHY which was wrong. Now this module mode offset was moved to pcie hwmod and removed the hwmod data
for pcie phy. While at that renamed pcie_hwmod to pciess_hwmod in order to match with the name given in TRM.

This helps to get rid of the following warning
"omap_hwmod: pcie1: _wait_target_disable failed"

[Grygorii.Strashko at linaro.org: Found the issue that actually caused
"omap_hwmod: pcie1: _wait_target_disable failed"]

[paul at pwsan.com: updated to apply on mainline]
---
 arch/arm/boot/dts/dra7.dtsi               |   2 -
 arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 111 ++++++++++--------------------
 2 files changed, 35 insertions(+), 78 deletions(-)
arch/arm/boot/dts/dra7.dtsi +0 -2
index 5827fedafd43..18a904db32bb 100644
@@ -1111,7 +1111,6 @@
 					      "wkupclk", "refclk",
 					      "div-clk", "phy-div";
 				#phy-cells = <0>;
-				ti,hwmods = "pcie1-phy";
 			};
 
 			pcie2_phy: pciephy at 4a095000 {
@@ -1130,7 +1129,6 @@
 					      "wkupclk", "refclk",
 					      "div-clk", "phy-div";
 				#phy-cells = <0>;
-				ti,hwmods = "pcie2-phy";
 				status = "disabled";
 			};
 		};
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +35 -76

170 lines not on this page · raw message

Signature · 1 line
2.1.4
#11 lore raw

PATCH 1/1 ARM: dra7xx: hwmod: drop .modulemode from pcie1/2 hwmods

Hi Paul,

Quoted 17 lines · Paul Walmsley
Quoted 15 lines · Paul Walmsley
Quoted 13 lines · Grygorii.Strashko at linaro.org
Quoted 11 lines · Paul Walmsley

Thanks guys.

Quoted 1 line · Grygorii.Strashko at linaro.org

Looks good for me and seems working.

Grygorii, can I add your Acked-by?

- Paul

Quoted 6 lines
Quoted 3 lines
Quoted 1 line

There is my "Signed-off-by" :)

OK thanks, queued for v3.20-rc.

Actually, could you guys test the updated patch? It had to be changed to apply on mainline and I don't have a DRA7xx board to test.

We don't use resets used here in mainline. I'll send an updated patch for mainline.

Thanks
Kishon

Quoted 228 lines

- Paul

From 0f9a1ee083a7adbb2c867d5c8d25d7e5fcb38b07 Mon Sep 17 00:00:00 2001
From: Kishon Vijay Abraham I <[email protected]>
Date: Thu, 12 Feb 2015 09:29:31 -0700
Subject: [PATCH] ARM: DRA7: hwmod_data: Fix hwmod data for pcie

Fixed hwmod data for pcie by having the correct module mode offset. Previously this module mode offset was part of pcie PHY which was wrong. Now this module mode offset was moved to pcie hwmod and removed the hwmod data
for pcie phy. While at that renamed pcie_hwmod to pciess_hwmod in order to match with the name given in TRM.

This helps to get rid of the following warning
"omap_hwmod: pcie1: _wait_target_disable failed"

[Grygorii.Strashko at linaro.org: Found the issue that actually caused
"omap_hwmod: pcie1: _wait_target_disable failed"]

[paul at pwsan.com: updated to apply on mainline]
---
  arch/arm/boot/dts/dra7.dtsi               |   2 -
  arch/arm/mach-omap2/omap_hwmod_7xx_data.c | 111 ++++++++++--------------------
  2 files changed, 35 insertions(+), 78 deletions(-)
arch/arm/boot/dts/dra7.dtsi +0 -2
index 5827fedafd43..18a904db32bb 100644
@@ -1111,7 +1111,6 @@
  					      "wkupclk", "refclk",
  					      "div-clk", "phy-div";
  				#phy-cells = <0>;
-				ti,hwmods = "pcie1-phy";
  			};
 
  			pcie2_phy: pciephy at 4a095000 {
@@ -1130,7 +1129,6 @@
  					      "wkupclk", "refclk",
  					      "div-clk", "phy-div";
  				#phy-cells = <0>;
-				ti,hwmods = "pcie2-phy";
  				status = "disabled";
  			};
  		};
arch/arm/mach-omap2/omap_hwmod_7xx_data.c +35 -76
index e8692e7675b8..6a74a7ea8c95 100644
@@ -1466,29 +1466,43 @@ static struct omap_hwmod dra7xx_ocp2scp3_hwmod = {
   *
   */
 
-static struct omap_hwmod_class dra7xx_pcie_hwmod_class = {
+static struct omap_hwmod_class dra7xx_pciess_hwmod_class = {
  	.name	= "pcie",
  };
 
  /* pcie1 */
-static struct omap_hwmod dra7xx_pcie1_hwmod = {
+static struct omap_hwmod_rst_info dra7xx_pciess1_resets[] = {
+	{ .name = "pcie", .rst_shift = 0 },
+};
+
+static struct omap_hwmod dra7xx_pciess1_hwmod = {
  	.name		= "pcie1",
-	.class		= &dra7xx_pcie_hwmod_class,
+	.class		= &dra7xx_pciess_hwmod_class,
  	.clkdm_name	= "pcie_clkdm",
  	.main_clk	= "l4_root_clk_div",
+	.rst_lines	= dra7xx_pciess1_resets,
+	.rst_lines_cnt	= ARRAY_SIZE(dra7xx_pciess1_resets),
  	.prcm = {
  		.omap4 = {
-			.clkctrl_offs	= DRA7XX_CM_PCIE_CLKSTCTRL_OFFSET,
+			.clkctrl_offs	= DRA7XX_CM_L3INIT_PCIESS1_CLKCTRL_OFFSET,
+			.context_offs	= DRA7XX_RM_L3INIT_PCIESS1_CONTEXT_OFFSET,
  			.modulemode	= MODULEMODE_SWCTRL,
  		},
  	},
  };
 
  /* pcie2 */
-static struct omap_hwmod dra7xx_pcie2_hwmod = {
+
+static struct omap_hwmod_rst_info dra7xx_pciess2_resets[] = {
+	{ .name = "pcie", .rst_shift = 1 },
+};
+
+static struct omap_hwmod dra7xx_pciess2_hwmod = {
  	.name		= "pcie2",
-	.class		= &dra7xx_pcie_hwmod_class,
+	.class		= &dra7xx_pciess_hwmod_class,
  	.clkdm_name	= "pcie_clkdm",
+	.rst_lines	= dra7xx_pciess2_resets,
+	.rst_lines_cnt	= ARRAY_SIZE(dra7xx_pciess2_resets),
  	.main_clk	= "l4_root_clk_div",
  	.prcm = {
  		.omap4 = {
@@ -1498,44 +1512,7 @@ static struct omap_hwmod dra7xx_pcie2_hwmod = {
  	},
  };
 
-/*
- * 'PCIE PHY' class
- *
- */
 
-static struct omap_hwmod_class dra7xx_pcie_phy_hwmod_class = {
-	.name	= "pcie-phy",
-};
-
-/* pcie1 phy */
-static struct omap_hwmod dra7xx_pcie1_phy_hwmod = {
-	.name		= "pcie1-phy",
-	.class		= &dra7xx_pcie_phy_hwmod_class,
-	.clkdm_name	= "l3init_clkdm",
-	.main_clk	= "l4_root_clk_div",
-	.prcm = {
-		.omap4 = {
-			.clkctrl_offs = DRA7XX_CM_L3INIT_PCIESS1_CLKCTRL_OFFSET,
-			.context_offs = DRA7XX_RM_L3INIT_PCIESS1_CONTEXT_OFFSET,
-			.modulemode   = MODULEMODE_SWCTRL,
-		},
-	},
-};
-
-/* pcie2 phy */
-static struct omap_hwmod dra7xx_pcie2_phy_hwmod = {
-	.name		= "pcie2-phy",
-	.class		= &dra7xx_pcie_phy_hwmod_class,
-	.clkdm_name	= "l3init_clkdm",
-	.main_clk	= "l4_root_clk_div",
-	.prcm = {
-		.omap4 = {
-			.clkctrl_offs = DRA7XX_CM_L3INIT_PCIESS2_CLKCTRL_OFFSET,
-			.context_offs = DRA7XX_RM_L3INIT_PCIESS2_CONTEXT_OFFSET,
-			.modulemode   = MODULEMODE_SWCTRL,
-		},
-	},
-};
 
  /*
   * 'qspi' class
@@ -2877,50 +2854,34 @@ static struct omap_hwmod_ocp_if dra7xx_l4_cfg__ocp2scp3 = {
  	.user		= OCP_USER_MPU | OCP_USER_SDMA,
  };
 
-/* l3_main_1 -> pcie1 */
-static struct omap_hwmod_ocp_if dra7xx_l3_main_1__pcie1 = {
+/* l3_main_1 -> pciess1 */
+static struct omap_hwmod_ocp_if dra7xx_l3_main_1__pciess1 = {
  	.master		= &dra7xx_l3_main_1_hwmod,
-	.slave		= &dra7xx_pcie1_hwmod,
+	.slave		= &dra7xx_pciess1_hwmod,
  	.clk		= "l3_iclk_div",
  	.user		= OCP_USER_MPU | OCP_USER_SDMA,
  };
 
-/* l4_cfg -> pcie1 */
-static struct omap_hwmod_ocp_if dra7xx_l4_cfg__pcie1 = {
+/* l4_cfg -> pciess1 */
+static struct omap_hwmod_ocp_if dra7xx_l4_cfg__pciess1 = {
  	.master		= &dra7xx_l4_cfg_hwmod,
-	.slave		= &dra7xx_pcie1_hwmod,
+	.slave		= &dra7xx_pciess1_hwmod,
  	.clk		= "l4_root_clk_div",
  	.user		= OCP_USER_MPU | OCP_USER_SDMA,
  };
 
-/* l3_main_1 -> pcie2 */
-static struct omap_hwmod_ocp_if dra7xx_l3_main_1__pcie2 = {
+/* l3_main_1 -> pciess2 */
+static struct omap_hwmod_ocp_if dra7xx_l3_main_1__pciess2 = {
  	.master		= &dra7xx_l3_main_1_hwmod,
-	.slave		= &dra7xx_pcie2_hwmod,
+	.slave		= &dra7xx_pciess2_hwmod,
  	.clk		= "l3_iclk_div",
  	.user		= OCP_USER_MPU | OCP_USER_SDMA,
  };
 
  /* l4_cfg -> pcie2 */
-static struct omap_hwmod_ocp_if dra7xx_l4_cfg__pcie2 = {
-	.master		= &dra7xx_l4_cfg_hwmod,
-	.slave		= &dra7xx_pcie2_hwmod,
-	.clk		= "l4_root_clk_div",
-	.user		= OCP_USER_MPU | OCP_USER_SDMA,
-};
-
-/* l4_cfg -> pcie1 phy */
-static struct omap_hwmod_ocp_if dra7xx_l4_cfg__pcie1_phy = {
-	.master		= &dra7xx_l4_cfg_hwmod,
-	.slave		= &dra7xx_pcie1_phy_hwmod,
-	.clk		= "l4_root_clk_div",
-	.user		= OCP_USER_MPU | OCP_USER_SDMA,
-};
-
-/* l4_cfg -> pcie2 phy */
-static struct omap_hwmod_ocp_if dra7xx_l4_cfg__pcie2_phy = {
+static struct omap_hwmod_ocp_if dra7xx_l4_cfg__pciess2 = {
  	.master		= &dra7xx_l4_cfg_hwmod,
-	.slave		= &dra7xx_pcie2_phy_hwmod,
+	.slave		= &dra7xx_pciess2_hwmod,
  	.clk		= "l4_root_clk_div",
  	.user		= OCP_USER_MPU | OCP_USER_SDMA,
  };
@@ -3327,12 +3288,10 @@ static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = {
  	&dra7xx_l4_cfg__mpu,
  	&dra7xx_l4_cfg__ocp2scp1,
  	&dra7xx_l4_cfg__ocp2scp3,
-	&dra7xx_l3_main_1__pcie1,
-	&dra7xx_l4_cfg__pcie1,
-	&dra7xx_l3_main_1__pcie2,
-	&dra7xx_l4_cfg__pcie2,
-	&dra7xx_l4_cfg__pcie1_phy,
-	&dra7xx_l4_cfg__pcie2_phy,
+	&dra7xx_l3_main_1__pciess1,
+	&dra7xx_l4_cfg__pciess1,
+	&dra7xx_l3_main_1__pciess2,
+	&dra7xx_l4_cfg__pciess2,
  	&dra7xx_l3_main_1__qspi,
  	&dra7xx_l4_per3__rtcss,
  	&dra7xx_l4_cfg__sata,