Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

split arch/arm/pic/pic.c so that we can implement more efficient version of splfoo() while using pic framework.

Browse Source
This commit is contained in:
bsh 2011-03-11 03:16:13 +00:00
parent 563593515e
commit 0bbe6c8fa6
7 changed files with 104 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/arch/arm/gemini/files.gemini
View File

@ -1,4 +1,4 @@
# $NetBSD: files.gemini,v 1.10 2008/12/14 01:57:02 matt Exp $
# $NetBSD: files.gemini,v 1.11 2011/03/11 03:16:13 bsh Exp $
#
# Configuration info for GEMINI CPU support
# Based on omap/files.omap2
@ -38,7 +38,7 @@ file arch/arm/gemini/gemini_dma.c
##file arch/arm/gemini/gemini_nobyteacc_io.S obio
# GEMINI interrupt controller
device geminiicu: pic
device geminiicu: pic, pic_splfuncs
attach geminiicu at obio with geminiicu
file arch/arm/gemini/gemini_icu.c geminiicu needs-flag

4
sys/arch/arm/imx/files.imx31
View File

@ -1,4 +1,4 @@
# $NetBSD: files.imx31,v 1.6 2010/11/15 18:19:19 bsh Exp $
# $NetBSD: files.imx31,v 1.7 2011/03/11 03:16:13 bsh Exp $
#
# Configuration info for the Freescale i.MX31
#
@ -23,7 +23,7 @@ file arch/arm/imx/imx31_ahb.c ahb
# iMX AdVanced Interrupt Controller
include "arch/arm/pic/files.pic"
device avic: pic
device avic: pic, pic_splfuncs
attach avic at ahb
file arch/arm/imx/imx31_icu.c avic needs-flag
file arch/arm/arm32/irq_dispatch.S

4
sys/arch/arm/imx/files.imx51
View File

@ -1,4 +1,4 @@
# $NetBSD: files.imx51,v 1.2 2010/11/30 13:05:27 bsh Exp $
# $NetBSD: files.imx51,v 1.3 2011/03/11 03:16:13 bsh Exp $
#
# Configuration info for the Freescale i.MX51
#
@ -18,7 +18,7 @@ file arch/arm/imx/imx51_axi.c axi
# iMX51 TrustZone Interrupt Controller
include "arch/arm/pic/files.pic"
device tzic: pic
device tzic: pic, pic_splfuncs
attach tzic at axi
file arch/arm/imx/imx51_tzic.c tzic needs-flag
file arch/arm/arm32/irq_dispatch.S

4
sys/arch/arm/omap/files.omap2
View File

@ -1,4 +1,4 @@
# $NetBSD: files.omap2,v 1.7 2011/02/26 18:07:18 ahoka Exp $
# $NetBSD: files.omap2,v 1.8 2011/03/11 03:16:13 bsh Exp $
#
# Configuration info for Texas Instruments OMAP2/OMAP3 CPU support
# Based on xscale/files.pxa2x0
@ -32,7 +32,7 @@ file arch/arm/omap/omap_a4x_space.c obio
file arch/arm/xscale/pxa2x0_a4x_io.S obio
# OMAP2 interrupt controller
device omapicu: pic
device omapicu: pic, pic_splfuncs
attach omapicu at obio with omap2icu
file arch/arm/omap/omap2_icu.c (omap2 | omap3) & omapicu
file arch/arm/omap/omap2430_intr.c omap2 & !omapicu

4
sys/arch/arm/pic/files.pic
View File

@ -1,7 +1,9 @@
# $NetBSD: files.pic,v 1.2 2008/04/27 18:58:45 matt Exp $
# $NetBSD: files.pic,v 1.3 2011/03/11 03:16:14 bsh Exp $
#
# Configuration info for the common PIC code.
#
define pic
define pic_splfuncs
file arch/arm/pic/pic.c pic
file arch/arm/pic/pic_splfuncs.c pic & pic_splfuncs

54
sys/arch/arm/pic/pic.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: pic.c,v 1.7 2011/02/01 21:44:27 jakllsch Exp $ */
/* $NetBSD: pic.c,v 1.8 2011/03/11 03:16:14 bsh Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@ -28,7 +28,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.7 2011/02/01 21:44:27 jakllsch Exp $");
__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.8 2011/03/11 03:16:14 bsh Exp $");
#define _INTR_PRIVATE
#include <sys/param.h>
@ -158,7 +158,14 @@ pic_find_pending_irqs_by_ipl(struct pic_softc *pic, size_t irq_base,
return ipl_irq_mask;
irq_mask = __BIT(irq);
KASSERT(pic->pic_sources[irq_base + irq] != NULL);
#if 1
KASSERT(pic->pic_sources[irq_base + irq] != NULL);
#else
if (pic->pic_sources[irq_base + irq] == NULL) {
aprint_error("stray interrupt? irq_base=%zu irq=%d\n",
irq_base, irq);
} else
#endif
if (pic->pic_sources[irq_base + irq]->is_ipl == ipl)
ipl_irq_mask |= irq_mask;
@ -521,47 +528,6 @@ pic_disestablish_source(struct intrsource *is)
free(is, M_INTRSOURCE);
}
int
_splraise(int newipl)
{
struct cpu_info * const ci = curcpu();
const int oldipl = ci->ci_cpl;
KASSERT(newipl < NIPL);
if (newipl > ci->ci_cpl)
ci->ci_cpl = newipl;
return oldipl;
}
int
_spllower(int newipl)
{
struct cpu_info * const ci = curcpu();
const int oldipl = ci->ci_cpl;
KASSERT(panicstr || newipl <= ci->ci_cpl);
if (newipl < ci->ci_cpl) {
register_t psw = disable_interrupts(I32_bit);
ci->ci_intr_depth++;
pic_do_pending_ints(psw, newipl, NULL);
ci->ci_intr_depth--;
restore_interrupts(psw);
}
return oldipl;
}
void
splx(int savedipl)
{
struct cpu_info * const ci = curcpu();
KASSERT(savedipl < NIPL);
if (savedipl < ci->ci_cpl) {
register_t psw = disable_interrupts(I32_bit);
ci->ci_intr_depth++;
pic_do_pending_ints(psw, savedipl, NULL);
ci->ci_intr_depth--;
restore_interrupts(psw);
}
ci->ci_cpl = savedipl;
}
void *
intr_establish(int irq, int ipl, int type, int (*func)(void *), void *arg)
{

83
sys/arch/arm/pic/pic_splfuncs.c Normal file
View File

@ -0,0 +1,83 @@
/* $NetBSD: pic_splfuncs.c,v 1.1 2011/03/11 03:16:14 bsh Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
* by Matt Thomas.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
* ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
* TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: pic_splfuncs.c,v 1.1 2011/03/11 03:16:14 bsh Exp $");
#define _INTR_PRIVATE
#include <sys/param.h>
#include <sys/evcnt.h>
#include <sys/atomic.h>
#include <sys/malloc.h>
#include <sys/mallocvar.h>
#include <sys/atomic.h>
#include <arm/armreg.h>
#include <arm/cpu.h>
#include <arm/cpufunc.h>
#include <arm/pic/picvar.h>
int
_splraise(int newipl)
{
struct cpu_info * const ci = curcpu();
const int oldipl = ci->ci_cpl;
KASSERT(newipl < NIPL);
if (newipl > ci->ci_cpl)
ci->ci_cpl = newipl;
return oldipl;
}
int
_spllower(int newipl)
{
struct cpu_info * const ci = curcpu();
const int oldipl = ci->ci_cpl;
KASSERT(panicstr || newipl <= ci->ci_cpl);
if (newipl < ci->ci_cpl) {
register_t psw = disable_interrupts(I32_bit);
pic_do_pending_ints(psw, newipl, NULL);
restore_interrupts(psw);
}
return oldipl;
}
void
splx(int savedipl)
{
struct cpu_info * const ci = curcpu();
KASSERT(savedipl < NIPL);
if (savedipl < ci->ci_cpl) {
register_t psw = disable_interrupts(I32_bit);
pic_do_pending_ints(psw, savedipl, NULL);
restore_interrupts(psw);
}
ci->ci_cpl = savedipl;
}