Skip to contentSkip to conversation

OMAP4: pm.c extensions for OMAP4 support

PATCH Superseded Thara Gopinath 3 participants 5 messages Aug 17, 2010 – Aug 30, 2010

Subsystems (4)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 OMAP4: pm.c extensions for OMAP4 support

OMAP4 has an iva device and a dsp devcice where as OMAP2/3 has only an iva device. In this file the iva device in the system is registered under the name dsp_dev and the API to retrieve the iva device is omap2_get_dsp_device. This patch renames the dsp_dev to iva_dev, renames omap2_get_dsp_device to omap2_get_iva_device, registers dsp_dev for OMAP4 and adds a new API omap4_get_dsp_device to retrieve the dep_dev.

---
v2: Removed fixing of l3_main hwmod for OMAP4 as Benoit has
already submitted a pach fixing the same.

 arch/arm/mach-omap2/pm.c                 |   19 ++++++++++++++-----
 arch/arm/plat-omap/include/plat/common.h |    3 ++-
 2 files changed, 16 insertions(+), 6 deletions(-)
arch/arm/mach-omap2/pm.c +14 -5
index 68f9f2e..a98b5e8 100644
@@ -21,8 +21,9 @@
 static struct omap_device_pm_latency *pm_lats;
 
 static struct device *mpu_dev;
-static struct device *dsp_dev;
+static struct device *iva_dev;
 static struct device *l3_dev;
+static struct device *dsp_dev;
 
 struct device *omap2_get_mpuss_device(void)
 {
@@ -30,10 +31,10 @@ struct device *omap2_get_mpuss_device(void)
 	return mpu_dev;
 }
 
-struct device *omap2_get_dsp_device(void)
+struct device *omap2_get_iva_device(void)
 {
-	WARN_ON_ONCE(!dsp_dev);
-	return dsp_dev;
+	WARN_ON_ONCE(!iva_dev);
+	return iva_dev;
 }
 
 struct device *omap2_get_l3_device(void)
@@ -42,6 +43,13 @@ struct device *omap2_get_l3_device(void)
 	return l3_dev;
 }
 
+struct device *omap4_get_dsp_device(void)
+{
+	WARN_ON_ONCE(!dsp_dev);
+	return dsp_dev;
+}
+EXPORT_SYMBOL(omap4_get_dsp_device);
+
 /* static int _init_omap_device(struct omap_hwmod *oh, void *user) */
 static int _init_omap_device(char *name, struct device **new_dev)
 {
@@ -69,7 +77,8 @@ static int _init_omap_device(char *name, struct device **new_dev)
 static void omap2_init_processor_devices(void)
 {
 	_init_omap_device("mpu", &mpu_dev);
-	_init_omap_device("iva", &dsp_dev);
+	_init_omap_device("iva", &iva_dev);
+	_init_omap_device("dsp", &dsp_dev);
 	_init_omap_device("l3_main", &l3_dev);
 }
 
arch/arm/plat-omap/include/plat/common.h +2 -1
index 9776b41..c45dbb9 100644
@@ -91,7 +91,8 @@ void omap3_map_io(void);
 })
 
 extern struct device *omap2_get_mpuss_device(void);
-extern struct device *omap2_get_dsp_device(void);
+extern struct device *omap2_get_iva_device(void);
 extern struct device *omap2_get_l3_device(void);
+extern struct device *omap4_get_dsp_device(void);
 
 #endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */
Signature · 1 line
1.7.0.4
#1 lore raw
Quoted 2 lines · Thara Gopinath

OMAP4 has an iva device and a dsp devcice where as OMAP2/3 has only an iva device. In this file the iva device in the

a bit confused regarding this -> IVA on OMAP3 was a C64 DSP. OMAP3 also had iva accelerators, but ARM does not directly talk to the accellerators. C64 did (that was why we had the dspbridge to talk to the C64). Could you clarify the intent of the patch?

Quoted 85 lines

system is registered under the name dsp_dev and the API to retrieve the iva device is omap2_get_dsp_device. This patch renames the dsp_dev to iva_dev, renames omap2_get_dsp_device to omap2_get_iva_device, registers dsp_dev for OMAP4 and adds a new API omap4_get_dsp_device to retrieve the dep_dev.

---
v2: Removed fixing of l3_main hwmod for OMAP4 as Benoit has
already submitted a pach fixing the same.

  arch/arm/mach-omap2/pm.c                 |   19 ++++++++++++++-----
  arch/arm/plat-omap/include/plat/common.h |    3 ++-
  2 files changed, 16 insertions(+), 6 deletions(-)
arch/arm/mach-omap2/pm.c +14 -5
index 68f9f2e..a98b5e8 100644
@@ -21,8 +21,9 @@
  static struct omap_device_pm_latency *pm_lats;
 
  static struct device *mpu_dev;
-static struct device *dsp_dev;
+static struct device *iva_dev;
  static struct device *l3_dev;
+static struct device *dsp_dev;
 
  struct device *omap2_get_mpuss_device(void)
  {
@@ -30,10 +31,10 @@ struct device *omap2_get_mpuss_device(void)
  	return mpu_dev;
  }
 
-struct device *omap2_get_dsp_device(void)
+struct device *omap2_get_iva_device(void)
  {
-	WARN_ON_ONCE(!dsp_dev);
-	return dsp_dev;
+	WARN_ON_ONCE(!iva_dev);
+	return iva_dev;
  }
 
  struct device *omap2_get_l3_device(void)
@@ -42,6 +43,13 @@ struct device *omap2_get_l3_device(void)
  	return l3_dev;
  }
 
+struct device *omap4_get_dsp_device(void)
+{
+	WARN_ON_ONCE(!dsp_dev);
+	return dsp_dev;
+}
+EXPORT_SYMBOL(omap4_get_dsp_device);
+
  /* static int _init_omap_device(struct omap_hwmod *oh, void *user) */
  static int _init_omap_device(char *name, struct device **new_dev)
  {
@@ -69,7 +77,8 @@ static int _init_omap_device(char *name, struct device **new_dev)
  static void omap2_init_processor_devices(void)
  {
  	_init_omap_device("mpu",&mpu_dev);
-	_init_omap_device("iva",&dsp_dev);
+	_init_omap_device("iva",&iva_dev);
+	_init_omap_device("dsp",&dsp_dev);
  	_init_omap_device("l3_main",&l3_dev);
  }
 
arch/arm/plat-omap/include/plat/common.h +2 -1
index 9776b41..c45dbb9 100644
@@ -91,7 +91,8 @@ void omap3_map_io(void);
  })
 
  extern struct device *omap2_get_mpuss_device(void);
-extern struct device *omap2_get_dsp_device(void);
+extern struct device *omap2_get_iva_device(void);
  extern struct device *omap2_get_l3_device(void);
+extern struct device *omap4_get_dsp_device(void);
 
  #endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */
#2 lore raw
In reply to Thara Gopinath
Quoted 9 lines · Thara Gopinath

OMAP4 has an iva device and a dsp devcice where as OMAP2/3 has only an iva device. In this file the iva device in the system is registered under the name dsp_dev and the API to retrieve the iva device is omap2_get_dsp_device. This patch renames the dsp_dev to iva_dev, renames omap2_get_dsp_device to omap2_get_iva_device, registers dsp_dev for OMAP4 and adds a new API omap4_get_dsp_device to retrieve the dep_dev.

Quoted 4 lines

---
v2: Removed fixing of l3_main hwmod for OMAP4 as Benoit has
already submitted a pach fixing the same.

OK, applying this to pm-fixes.

Kevin

Quoted 71 lines
 arch/arm/mach-omap2/pm.c                 |   19 ++++++++++++++-----
 arch/arm/plat-omap/include/plat/common.h |    3 ++-
 2 files changed, 16 insertions(+), 6 deletions(-)
arch/arm/mach-omap2/pm.c +14 -5
index 68f9f2e..a98b5e8 100644
@@ -21,8 +21,9 @@
 static struct omap_device_pm_latency *pm_lats;
 
 static struct device *mpu_dev;
-static struct device *dsp_dev;
+static struct device *iva_dev;
 static struct device *l3_dev;
+static struct device *dsp_dev;
 
 struct device *omap2_get_mpuss_device(void)
 {
@@ -30,10 +31,10 @@ struct device *omap2_get_mpuss_device(void)
 	return mpu_dev;
 }
 
-struct device *omap2_get_dsp_device(void)
+struct device *omap2_get_iva_device(void)
 {
-	WARN_ON_ONCE(!dsp_dev);
-	return dsp_dev;
+	WARN_ON_ONCE(!iva_dev);
+	return iva_dev;
 }
 
 struct device *omap2_get_l3_device(void)
@@ -42,6 +43,13 @@ struct device *omap2_get_l3_device(void)
 	return l3_dev;
 }
 
+struct device *omap4_get_dsp_device(void)
+{
+	WARN_ON_ONCE(!dsp_dev);
+	return dsp_dev;
+}
+EXPORT_SYMBOL(omap4_get_dsp_device);
+
 /* static int _init_omap_device(struct omap_hwmod *oh, void *user) */
 static int _init_omap_device(char *name, struct device **new_dev)
 {
@@ -69,7 +77,8 @@ static int _init_omap_device(char *name, struct device **new_dev)
 static void omap2_init_processor_devices(void)
 {
 	_init_omap_device("mpu", &mpu_dev);
-	_init_omap_device("iva", &dsp_dev);
+	_init_omap_device("iva", &iva_dev);
+	_init_omap_device("dsp", &dsp_dev);
 	_init_omap_device("l3_main", &l3_dev);
 }
 
arch/arm/plat-omap/include/plat/common.h +2 -1
index 9776b41..c45dbb9 100644
@@ -91,7 +91,8 @@ void omap3_map_io(void);
 })
 
 extern struct device *omap2_get_mpuss_device(void);
-extern struct device *omap2_get_dsp_device(void);
+extern struct device *omap2_get_iva_device(void);
 extern struct device *omap2_get_l3_device(void);
+extern struct device *omap4_get_dsp_device(void);
 
 #endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */
#3 lore raw
Quoted 11 lines · Kevin Hilman
Quoted 9 lines · Thara Gopinath

OMAP4 has an iva device and a dsp devcice where as OMAP2/3 has only an iva device. In this file the iva device in the system is registered under the name dsp_dev and the API to retrieve the iva device is omap2_get_dsp_device. This patch renames the dsp_dev to iva_dev, renames omap2_get_dsp_device to omap2_get_iva_device, registers dsp_dev for OMAP4 and adds a new API omap4_get_dsp_device to retrieve the dep_dev.

Quoted 6 lines
Quoted 4 lines

---
v2: Removed fixing of l3_main hwmod for OMAP4 as Benoit has
already submitted a pach fixing the same.

OK, applying this to pm-fixes.

No second thought, not yet...

Quoted 47 lines
Quoted 47 lines
 arch/arm/mach-omap2/pm.c                 |   19 ++++++++++++++-----
 arch/arm/plat-omap/include/plat/common.h |    3 ++-
 2 files changed, 16 insertions(+), 6 deletions(-)
arch/arm/mach-omap2/pm.c +12 -4
index 68f9f2e..a98b5e8 100644
@@ -21,8 +21,9 @@
 static struct omap_device_pm_latency *pm_lats;
 
 static struct device *mpu_dev;
-static struct device *dsp_dev;
+static struct device *iva_dev;
 static struct device *l3_dev;
+static struct device *dsp_dev;
 
 struct device *omap2_get_mpuss_device(void)
 {
@@ -30,10 +31,10 @@ struct device *omap2_get_mpuss_device(void)
 	return mpu_dev;
 }
 
-struct device *omap2_get_dsp_device(void)
+struct device *omap2_get_iva_device(void)
 {
-	WARN_ON_ONCE(!dsp_dev);
-	return dsp_dev;
+	WARN_ON_ONCE(!iva_dev);
+	return iva_dev;
 }
 
 struct device *omap2_get_l3_device(void)
@@ -42,6 +43,13 @@ struct device *omap2_get_l3_device(void)
 	return l3_dev;
 }
 
+struct device *omap4_get_dsp_device(void)
+{
+	WARN_ON_ONCE(!dsp_dev);
+	return dsp_dev;
+}
+EXPORT_SYMBOL(omap4_get_dsp_device);
+
 /* static int _init_omap_device(struct omap_hwmod *oh, void *user) */
 static int _init_omap_device(char *name, struct device **new_dev)
Quoted 8 lines

arch/arm/mach-omap2/pm.c static int _init_omap_device(char *name, struct device **new_dev) · line 81

Quoted 8 lines
arch/arm/mach-omap2/pm.c +2 -1
 {
@@ -69,7 +77,8 @@ static int _init_omap_device(char *name, struct device **new_dev)
 static void omap2_init_processor_devices(void)
 {
 	_init_omap_device("mpu", &mpu_dev);
-	_init_omap_device("iva", &dsp_dev);
+	_init_omap_device("iva", &iva_dev);
+	_init_omap_device("dsp", &dsp_dev);

this one causes the noisy WARN to be tirggered on !OMAP4. Since !OMAP4
doesn't have a DSP, we shouldn't be warning users about a missing dsp hwmod.

Kevin

Quoted 17 lines
Quoted 17 lines
arch/arm/mach-omap2/pm.c +0 -0
 	_init_omap_device("l3_main", &l3_dev);
 }
 
arch/arm/plat-omap/include/plat/common.h +2 -1
index 9776b41..c45dbb9 100644
@@ -91,7 +91,8 @@ void omap3_map_io(void);
 })
 
 extern struct device *omap2_get_mpuss_device(void);
-extern struct device *omap2_get_dsp_device(void);
+extern struct device *omap2_get_iva_device(void);
 extern struct device *omap2_get_l3_device(void);
+extern struct device *omap4_get_dsp_device(void);
 
 #endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */
#4 lore raw
Quoted 81 lines
Quoted 81 lines

-----Original Message-----
From: Kevin Hilman [mailto:[email protected]]
Sent: Wednesday, August 25, 2010 4:43 AM
To: Gopinath, Thara
Cc: [email protected]; [email protected]; Sripathy, Vishwanath; Sawant, Anand
Subject: Re: [PATCH v2] OMAP4: pm.c extensions for OMAP4 support

Quoted 11 lines · Kevin Hilman
Quoted 9 lines · Thara Gopinath

OMAP4 has an iva device and a dsp devcice where as OMAP2/3 has only an iva device. In this file the iva device in the system is registered under the name dsp_dev and the API to retrieve the iva device is omap2_get_dsp_device. This patch renames the dsp_dev to iva_dev, renames omap2_get_dsp_device to omap2_get_iva_device, registers dsp_dev for OMAP4 and adds a new API omap4_get_dsp_device to retrieve the dep_dev.

Quoted 6 lines
Quoted 4 lines

---
v2: Removed fixing of l3_main hwmod for OMAP4 as Benoit has
already submitted a pach fixing the same.

OK, applying this to pm-fixes.

No second thought, not yet...

Quoted 51 lines
Quoted 51 lines
 arch/arm/mach-omap2/pm.c                 |   19 ++++++++++++++-----
 arch/arm/plat-omap/include/plat/common.h |    3 ++-
 2 files changed, 16 insertions(+), 6 deletions(-)
arch/arm/mach-omap2/pm.c +12 -4
index 68f9f2e..a98b5e8 100644
@@ -21,8 +21,9 @@
 static struct omap_device_pm_latency *pm_lats;
 
 static struct device *mpu_dev;
-static struct device *dsp_dev;
+static struct device *iva_dev;
 static struct device *l3_dev;
+static struct device *dsp_dev;
 
 struct device *omap2_get_mpuss_device(void)
 {
@@ -30,10 +31,10 @@ struct device *omap2_get_mpuss_device(void)
 	return mpu_dev;
 }
 
-struct device *omap2_get_dsp_device(void)
+struct device *omap2_get_iva_device(void)
 {
-	WARN_ON_ONCE(!dsp_dev);
-	return dsp_dev;
+	WARN_ON_ONCE(!iva_dev);
+	return iva_dev;
 }
 
 struct device *omap2_get_l3_device(void)
@@ -42,6 +43,13 @@ struct device *omap2_get_l3_device(void)
 	return l3_dev;
 }
 
+struct device *omap4_get_dsp_device(void)
+{
+	WARN_ON_ONCE(!dsp_dev);
+	return dsp_dev;
+}
+EXPORT_SYMBOL(omap4_get_dsp_device);
+
 /* static int _init_omap_device(struct omap_hwmod *oh, void *user) */
 static int _init_omap_device(char *name, struct device **new_dev)
 {
@@ -69,7 +77,8 @@ static int _init_omap_device(char *name, struct device **new_dev)
 static void omap2_init_processor_devices(void)
 {
Quoted 8 lines
Quoted 8 lines
Quoted 4 lines

arch/arm/mach-omap2/pm.c static int _init_omap_device(char *name, struct device **new_dev) · line 81

Quoted 4 lines
arch/arm/mach-omap2/pm.c +2 -1
 	_init_omap_device("mpu", &mpu_dev);
-	_init_omap_device("iva", &dsp_dev);
+	_init_omap_device("iva", &iva_dev);
+	_init_omap_device("dsp", &dsp_dev);

this one causes the noisy WARN to be tirggered on !OMAP4. Since !OMAP4
doesn't have a DSP, we shouldn't be warning users about a missing dsp hwmod.

Hello Kevin,

I will put a OMAP4 check across this and repost.

Regards
Thara

Quoted 21 lines
Quoted 21 lines

Kevin

Quoted 17 lines
Quoted 17 lines
arch/arm/mach-omap2/pm.c +0 -0
 	_init_omap_device("l3_main", &l3_dev);
 }
 
arch/arm/plat-omap/include/plat/common.h +2 -1
index 9776b41..c45dbb9 100644
@@ -91,7 +91,8 @@ void omap3_map_io(void);
 })
 
 extern struct device *omap2_get_mpuss_device(void);
-extern struct device *omap2_get_dsp_device(void);
+extern struct device *omap2_get_iva_device(void);
 extern struct device *omap2_get_l3_device(void);
+extern struct device *omap4_get_dsp_device(void);
 
 #endif /* __ARCH_ARM_MACH_OMAP_COMMON_H */