Received: from milmhbs1.lsil.com (147.145.21.209) by coscas01.lsi.com
 (172.21.36.60) with Microsoft SMTP Server id 8.1.393.1; Tue, 13 Oct 2009
 09:53:21 -0600
Received: from mail1.lsil.com (mail1.lsil.com [147.145.40.21])	by
 milmhbs1.lsil.com (8.12.11/8.12.11) with ESMTP id n9DFrLp1013135	for
 <andy.sharp@lsi.com>; Tue, 13 Oct 2009 08:53:21 -0700
Received: from psmtp.com (na3sys009amx183.postini.com [74.125.149.164])	by
 mail1.lsil.com (8.12.11/8.12.11) with SMTP id n9DFrJ81012345	for
 <andy.sharp@lsi.com>; Tue, 13 Oct 2009 08:53:19 -0700 (PDT)
Received: from source ([78.24.191.182]) by na3sys009amx183.postini.com
 ([74.125.148.14]) with SMTP;	Tue, 13 Oct 2009 08:53:20 PDT
Received: from localhost.localdomain ([127.0.0.1]:40042 "EHLO
	eddie.linux-mips.org" rhost-flags-OK-OK-OK-FAIL) by ftp.linux-mips.org	with
 ESMTP id S1493083AbZJMPxR (ORCPT <rfc822;andy.sharp@lsi.com>);	Tue, 13 Oct
 2009 17:53:17 +0200
Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 13 Oct 2009 17:52:59
 +0200 (CEST)
Received: from mail3.caviumnetworks.com ([12.108.191.235]:17383 "EHLO
	mail3.caviumnetworks.com" rhost-flags-OK-OK-OK-OK)	by ftp.linux-mips.org with
 ESMTP id S1493189AbZJMPwx (ORCPT	<rfc822;linux-mips@linux-mips.org>); Tue, 13
 Oct 2009 17:52:53 +0200
Received: from caexch01.caveonetworks.com (Not Verified[192.168.16.9]) by
 mail3.caviumnetworks.com with MailMarshal (v6,5,4,7535)	id <B4ad4a23e0000>;
 Tue, 13 Oct 2009 08:52:31 -0700
Received: from caexch01.caveonetworks.com ([192.168.16.9]) by
 caexch01.caveonetworks.com with Microsoft SMTPSVC(6.0.3790.3959);	 Tue, 13
 Oct 2009 08:52:32 -0700
Received: from dd1.caveonetworks.com ([12.108.191.236]) by
 caexch01.caveonetworks.com over TLS secured channel with Microsoft
 SMTPSVC(6.0.3790.3959);	 Tue, 13 Oct 2009 08:52:32 -0700
Received: from dd1.caveonetworks.com (localhost.localdomain [127.0.0.1])	by
 dd1.caveonetworks.com (8.14.2/8.14.2) with ESMTP id n9DFqUdY022080;	Tue, 13
 Oct 2009 08:52:30 -0700
Received: (from ddaney@localhost)	by dd1.caveonetworks.com
 (8.14.2/8.14.2/Submit) id n9DFqTBI022078;	Tue, 13 Oct 2009 08:52:29 -0700
From: David Daney <ddaney@caviumnetworks.com>
To: "linux-mips@linux-mips.org" <linux-mips@linux-mips.org>,
	"ralf@linux-mips.org" <ralf@linux-mips.org>
CC: David Daney <ddaney@caviumnetworks.com>
Sender: "linux-mips-bounce@linux-mips.org" <linux-mips-bounce@linux-mips.org>
Date: Tue, 13 Oct 2009 09:52:28 -0600
Subject: [PATCH 1/2] MIPS: Octeon: Use
 write_lock_irqsave/write_unlock_irqrestore when setting irq affinity.
Thread-Topic: [PATCH 1/2] MIPS: Octeon: Use
 write_lock_irqsave/write_unlock_irqrestore when setting irq affinity.
Thread-Index: AcpMHUo0QG8ZCircQzW+w94IjQFb3A==
Message-ID: <1255449149-22054-1-git-send-email-ddaney@caviumnetworks.com>
References: <4AD4A1E9.1080309@caviumnetworks.com>
In-Reply-To: <4AD4A1E9.1080309@caviumnetworks.com>
Accept-Language: en-US
Content-Language: en-US
X-MS-Exchange-Organization-AuthAs: Anonymous
X-MS-Exchange-Organization-AuthSource: coscas01.lsi.com
X-MS-Has-Attach:
X-Auto-Response-Suppress: All
X-MS-TNEF-Correlator:
x-scanned-by: MIMEDefang 2.39
errors-to: linux-mips-bounce@linux-mips.org
x-originalarrivaltime: 13 Oct 2009 15:52:32.0472 (UTC)
 FILETIME=[2CE92580:01CA4C1D]
x-pstn-levels: (S:62.12270/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-settings: 3 (1.0000:1.0000) s cv gt3 gt2 gt1 r p m c 
x-pstn-addresses: from <ddaney@caviumnetworks.com> [db-null] 
x-pstn-neptune: 0/0/0.00/0
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0

Since the locks are used from interrupt context we need the
irqsave/irqrestore versions of the locking functions.

Signed-off-by: David Daney <ddaney@caviumnetworks.com>
---
 arch/mips/cavium-octeon/octeon-irq.c |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/arch/mips/cavium-octeon/octeon-irq.c b/arch/mips/cavium-octeon=
/octeon-irq.c
index 384f184..0bda5c5 100644
--- a/arch/mips/cavium-octeon/octeon-irq.c
+++ b/arch/mips/cavium-octeon/octeon-irq.c
@@ -182,9 +182,10 @@ static void octeon_irq_ciu0_disable(unsigned int irq)
 static int octeon_irq_ciu0_set_affinity(unsigned int irq, const struct cpu=
mask *dest)
 {
 	int cpu;
+	unsigned long flags;
 	int bit =3D irq - OCTEON_IRQ_WORKQ0;	/* Bit 0-63 of EN0 */
=20
-	write_lock(&octeon_irq_ciu0_rwlock);
+	write_lock_irqsave(&octeon_irq_ciu0_rwlock, flags);
 	for_each_online_cpu(cpu) {
 		int coreid =3D cpu_logical_map(cpu);
 		uint64_t en0 =3D
@@ -200,7 +201,7 @@ static int octeon_irq_ciu0_set_affinity(unsigned int ir=
q, const struct cpumask *
 	 * of them are done.
 	 */
 	cvmx_read_csr(CVMX_CIU_INTX_EN0(cvmx_get_core_num() * 2));
-	write_unlock(&octeon_irq_ciu0_rwlock);
+	write_unlock_irqrestore(&octeon_irq_ciu0_rwlock, flags);
=20
 	return 0;
 }
@@ -299,9 +300,10 @@ static void octeon_irq_ciu1_disable(unsigned int irq)
 static int octeon_irq_ciu1_set_affinity(unsigned int irq, const struct cpu=
mask *dest)
 {
 	int cpu;
+	unsigned long flags;
 	int bit =3D irq - OCTEON_IRQ_WDOG0;	/* Bit 0-63 of EN1 */
=20
-	write_lock(&octeon_irq_ciu1_rwlock);
+	write_lock_irqsave(&octeon_irq_ciu1_rwlock, flags);
 	for_each_online_cpu(cpu) {
 		int coreid =3D cpu_logical_map(cpu);
 		uint64_t en1 =3D
@@ -318,7 +320,7 @@ static int octeon_irq_ciu1_set_affinity(unsigned int ir=
q, const struct cpumask *
 	 * of them are done.
 	 */
 	cvmx_read_csr(CVMX_CIU_INTX_EN1(cvmx_get_core_num() * 2 + 1));
-	write_unlock(&octeon_irq_ciu1_rwlock);
+	write_unlock_irqrestore(&octeon_irq_ciu1_rwlock, flags);
=20
 	return 0;
 }
--=20
1.6.0.6


