Received: from mail.onstor.com (66.201.51.107) by exch1.onstor.net
 (10.0.0.225) with Microsoft SMTP Server id 8.1.311.2; Thu, 23 Apr 2009
 10:23:16 -0700
Received: from psmtp.com ([64.18.0.169]) by mail.onstor.com with Microsoft
 SMTPSVC(6.0.3790.3959);	 Thu, 23 Apr 2009 10:23:16 -0700
Received: from source ([213.58.128.207]) by exprod5mx249.postini.com
 ([64.18.4.10]) with SMTP;	Thu, 23 Apr 2009 12:23:15 CDT
Received: from localhost.localdomain ([127.0.0.1]:40604 "EHLO
	ftp.linux-mips.org") by ftp.linux-mips.org with ESMTP	id S20022724AbZDWPLN
 (ORCPT <rfc822;andy.sharp@onstor.com>);	Thu, 23 Apr 2009 16:11:13 +0100
Received: with ECARTIS (v1.0.0; list linux-mips); Thu, 23 Apr 2009 16:10:54
 +0100 (BST)
Received: from mba.ocn.ne.jp ([122.1.235.107]:57563 "HELO smtp.mba.ocn.ne.jp")
	by ftp.linux-mips.org with SMTP id S20022675AbZDWPKp (ORCPT
	<rfc822;linux-mips@linux-mips.org>); Thu, 23 Apr 2009 16:10:45 +0100
Received: from localhost.localdomain (p8154-ipad310funabasi.chiba.ocn.ne.jp
 [123.217.210.154])	by smtp.mba.ocn.ne.jp (Postfix) with ESMTP	id 7631CA9A8;
 Fri, 24 Apr 2009 00:10:36 +0900 (JST)
From: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
To: "linux-mips@linux-mips.org" <linux-mips@linux-mips.org>
CC: "ralf@linux-mips.org" <ralf@linux-mips.org>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Thu, 23 Apr 2009 08:10:36 -0700
Subject: [PATCH] TXx9: micro optimization for clocksource and clock_event
Thread-Topic: [PATCH] TXx9: micro optimization for clocksource and
 clock_event
Thread-Index: AcnEODCnja85bcz3SGyYlxdTF07Ygg==
Message-ID: <1240499436-8246-1-git-send-email-anemo@mba.ocn.ne.jp>
Accept-Language: en-US
Content-Language: en-US
X-MS-Exchange-Organization-AuthAs: Internal
X-MS-Exchange-Organization-AuthMechanism: 0b
X-MS-Exchange-Organization-AuthSource: exch1.onstor.net
X-MS-Has-Attach:
X-Auto-Response-Suppress: All
X-MS-TNEF-Correlator:
x-originalarrivaltime: 23 Apr 2009 17:23:16.0169 (UTC)
 FILETIME=[3024A390:01C9C438]
errors-to: linux-mips-bounce@linux-mips.org
x-pstn-levels: (S:64.72054/99.90000 CV:99.9000 FC:95.5390 LC:95.5390
 R:95.9108 P:95.9108 M:97.0282 C:98.6951 )
x-pstn-neptune: 0/0/0.00/0
x-ems-proccessed: 2K3Xl1OQTInXD6xxuA8z3Q==
x-ems-stamp: vU4lLuSJPwW/8T0yKD7zAA==
x-list: linux-mips
x-archive-position: 22441
x-ecartis-version: Ecartis v1.0.0
x-original-sender: anemo@mba.ocn.ne.jp
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

Use container structure for clocksource, clock_event_device and hold a
pointer to txx9_tmr_reg in it.

This saves a few instructions in clocksource and clock_event handlers.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
---
 arch/mips/kernel/cevt-txx9.c |   67 +++++++++++++++++++++++++++-----------=
----
 1 files changed, 43 insertions(+), 24 deletions(-)

diff --git a/arch/mips/kernel/cevt-txx9.c b/arch/mips/kernel/cevt-txx9.c
index 2e911e3..0037f21 100644
--- a/arch/mips/kernel/cevt-txx9.c
+++ b/arch/mips/kernel/cevt-txx9.c
@@ -20,22 +20,29 @@
 #define TIMER_CCD	0	/* 1/2 */
 #define TIMER_CLK(imclk)	((imclk) / (2 << TIMER_CCD))
=20
-static struct txx9_tmr_reg __iomem *txx9_cs_tmrptr;
+struct txx9_clocksource {
+	struct clocksource cs;
+	struct txx9_tmr_reg __iomem *tmrptr;
+};
=20
 static cycle_t txx9_cs_read(struct clocksource *cs)
 {
-	return __raw_readl(&txx9_cs_tmrptr->trr);
+	struct txx9_clocksource *txx9_cs =3D
+		container_of(cs, struct txx9_clocksource, cs);
+	return __raw_readl(&txx9_cs->tmrptr->trr);
 }
=20
 /* Use 1 bit smaller width to use full bits in that width */
 #define TXX9_CLOCKSOURCE_BITS (TXX9_TIMER_BITS - 1)
=20
-static struct clocksource txx9_clocksource =3D {
-	.name		=3D "TXx9",
-	.rating		=3D 200,
-	.read		=3D txx9_cs_read,
-	.mask		=3D CLOCKSOURCE_MASK(TXX9_CLOCKSOURCE_BITS),
-	.flags		=3D CLOCK_SOURCE_IS_CONTINUOUS,
+static struct txx9_clocksource txx9_clocksource =3D {
+	.cs =3D {
+		.name		=3D "TXx9",
+		.rating		=3D 200,
+		.read		=3D txx9_cs_read,
+		.mask		=3D CLOCKSOURCE_MASK(TXX9_CLOCKSOURCE_BITS),
+		.flags		=3D CLOCK_SOURCE_IS_CONTINUOUS,
+	},
 };
=20
 void __init txx9_clocksource_init(unsigned long baseaddr,
@@ -43,8 +50,8 @@ void __init txx9_clocksource_init(unsigned long baseaddr,
 {
 	struct txx9_tmr_reg __iomem *tmrptr;
=20
-	clocksource_set_clock(&txx9_clocksource, TIMER_CLK(imbusclk));
-	clocksource_register(&txx9_clocksource);
+	clocksource_set_clock(&txx9_clocksource.cs, TIMER_CLK(imbusclk));
+	clocksource_register(&txx9_clocksource.cs);
=20
 	tmrptr =3D ioremap(baseaddr, sizeof(struct txx9_tmr_reg));
 	__raw_writel(TCR_BASE, &tmrptr->tcr);
@@ -53,10 +60,13 @@ void __init txx9_clocksource_init(unsigned long baseadd=
r,
 	__raw_writel(TXx9_TMITMR_TZCE, &tmrptr->itmr);
 	__raw_writel(1 << TXX9_CLOCKSOURCE_BITS, &tmrptr->cpra);
 	__raw_writel(TCR_BASE | TXx9_TMTCR_TCE, &tmrptr->tcr);
-	txx9_cs_tmrptr =3D tmrptr;
+	txx9_clocksource.tmrptr =3D tmrptr;
 }
=20
-static struct txx9_tmr_reg __iomem *txx9_tmrptr;
+struct txx9_clock_event_device {
+	struct clock_event_device cd;
+	struct txx9_tmr_reg __iomem *tmrptr;
+};
=20
 static void txx9tmr_stop_and_clear(struct txx9_tmr_reg __iomem *tmrptr)
 {
@@ -69,7 +79,9 @@ static void txx9tmr_stop_and_clear(struct txx9_tmr_reg __=
iomem *tmrptr)
 static void txx9tmr_set_mode(enum clock_event_mode mode,
 			     struct clock_event_device *evt)
 {
-	struct txx9_tmr_reg __iomem *tmrptr =3D txx9_tmrptr;
+	struct txx9_clock_event_device *txx9_cd =3D
+		container_of(evt, struct txx9_clock_event_device, cd);
+	struct txx9_tmr_reg __iomem *tmrptr =3D txx9_cd->tmrptr;
=20
 	txx9tmr_stop_and_clear(tmrptr);
 	switch (mode) {
@@ -99,7 +111,9 @@ static void txx9tmr_set_mode(enum clock_event_mode mode,
 static int txx9tmr_set_next_event(unsigned long delta,
 				  struct clock_event_device *evt)
 {
-	struct txx9_tmr_reg __iomem *tmrptr =3D txx9_tmrptr;
+	struct txx9_clock_event_device *txx9_cd =3D
+		container_of(evt, struct txx9_clock_event_device, cd);
+	struct txx9_tmr_reg __iomem *tmrptr =3D txx9_cd->tmrptr;
=20
 	txx9tmr_stop_and_clear(tmrptr);
 	/* start timer */
@@ -108,18 +122,22 @@ static int txx9tmr_set_next_event(unsigned long delta=
,
 	return 0;
 }
=20
-static struct clock_event_device txx9tmr_clock_event_device =3D {
-	.name		=3D "TXx9",
-	.features	=3D CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
-	.rating		=3D 200,
-	.set_mode	=3D txx9tmr_set_mode,
-	.set_next_event	=3D txx9tmr_set_next_event,
+static struct txx9_clock_event_device txx9_clock_event_device =3D {
+	.cd =3D {
+		.name		=3D "TXx9",
+		.features	=3D CLOCK_EVT_FEAT_PERIODIC |
+				  CLOCK_EVT_FEAT_ONESHOT,
+		.rating		=3D 200,
+		.set_mode	=3D txx9tmr_set_mode,
+		.set_next_event	=3D txx9tmr_set_next_event,
+	},
 };
=20
 static irqreturn_t txx9tmr_interrupt(int irq, void *dev_id)
 {
-	struct clock_event_device *cd =3D &txx9tmr_clock_event_device;
-	struct txx9_tmr_reg __iomem *tmrptr =3D txx9_tmrptr;
+	struct txx9_clock_event_device *txx9_cd =3D dev_id;
+	struct clock_event_device *cd =3D &txx9_cd->cd;
+	struct txx9_tmr_reg __iomem *tmrptr =3D txx9_cd->tmrptr;
=20
 	__raw_writel(0, &tmrptr->tisr);	/* ack interrupt */
 	cd->event_handler(cd);
@@ -130,19 +148,20 @@ static struct irqaction txx9tmr_irq =3D {
 	.handler	=3D txx9tmr_interrupt,
 	.flags		=3D IRQF_DISABLED | IRQF_PERCPU,
 	.name		=3D "txx9tmr",
+	.dev_id		=3D &txx9_clock_event_device,
 };
=20
 void __init txx9_clockevent_init(unsigned long baseaddr, int irq,
 				 unsigned int imbusclk)
 {
-	struct clock_event_device *cd =3D &txx9tmr_clock_event_device;
+	struct clock_event_device *cd =3D &txx9_clock_event_device.cd;
 	struct txx9_tmr_reg __iomem *tmrptr;
=20
 	tmrptr =3D ioremap(baseaddr, sizeof(struct txx9_tmr_reg));
 	txx9tmr_stop_and_clear(tmrptr);
 	__raw_writel(TIMER_CCD, &tmrptr->ccdr);
 	__raw_writel(0, &tmrptr->itmr);
-	txx9_tmrptr =3D tmrptr;
+	txx9_clock_event_device.tmrptr =3D tmrptr;
=20
 	clockevent_set_clock(cd, TIMER_CLK(imbusclk));
 	cd->max_delta_ns =3D
--=20
1.5.6.3


