Author: imp
Date: Thu Jul 12 02:58:45 2012
New Revision: 238389
URL: http://svn.freebsd.org/changeset/base/238389
Log:
Export the interrupt status vector via soc_data. Set the interrupt
priorities in the AIC in the atmelarm driver before attaching the
children. Delete redunant copies of the code.
Modified:
head/sys/arm/at91/at91.c
head/sys/arm/at91/at91rm9200.c
head/sys/arm/at91/at91sam9260.c
head/sys/arm/at91/at91sam9g20.c
head/sys/arm/at91/at91sam9x25.c
head/sys/arm/at91/at91var.h
Modified: head/sys/arm/at91/at91.c
==============================================================================
--- head/sys/arm/at91/at91.c Thu Jul 12 02:15:06 2012 (r238388)
+++ head/sys/arm/at91/at91.c Thu Jul 12 02:58:45 2012 (r238389)
@@ -247,10 +247,12 @@ at91_attach(device_t dev)
{
struct at91_softc *sc = device_get_softc(dev);
const struct pmap_devmap *pdevmap;
+ int i;
at91_softc = sc;
sc->sc_st = &at91_bs_tag;
sc->sc_sh = AT91_BASE;
+ sc->sc_aic_sh = AT91_BASE + AT91_SYS_BASE;
sc->dev = dev;
sc->sc_irq_rman.rm_type = RMAN_ARRAY;
@@ -269,13 +271,35 @@ at91_attach(device_t dev)
panic("at91_attach: failed to set up memory rman");
}
+ /*
+ * Setup the interrupt table.
+ */
+ if (soc_info.soc_data == NULL || soc_info.soc_data->soc_irq_prio ==
NULL)
+ panic("Interrupt priority table missing\n");
+ for (i = 0; i < 32; i++) {
+ bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SVR +
+ i * 4, i);
+ /* Priority. */
+ bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SMR + i * 4,
+ soc_info.soc_data->soc_irq_prio[i]);
+ if (i < 8)
+ bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_EOICR,
+ 1);
+ }
+
+ bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SPU, 32);
+ /* No debug. */
+ bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_DCR, 0);
+ /* Disable and clear all interrupts. */
+ bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_IDCR, 0xffffffff);
+ bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_ICCR, 0xffffffff);
/*
- * Our device list will be added automatically by the cpu device
+ * Our device list will be added automatically by the cpu device
* e.g. at91rm9200.c when it is identified. To ensure that the
* CPU and PMC are attached first any other "identified" devices
* call BUS_ADD_CHILD(9) with an "order" of at least 2.
- */
+ */
bus_generic_probe(dev);
bus_generic_attach(dev);
Modified: head/sys/arm/at91/at91rm9200.c
==============================================================================
--- head/sys/arm/at91/at91rm9200.c Thu Jul 12 02:15:06 2012
(r238388)
+++ head/sys/arm/at91/at91rm9200.c Thu Jul 12 02:58:45 2012
(r238389)
@@ -183,8 +183,6 @@ at91_attach(device_t dev)
{
struct at91_pmc_clock *clk;
struct at91rm92_softc *sc = device_get_softc(dev);
- int i;
-
struct at91_softc *at91sc = device_get_softc(device_get_parent(dev));
sc->sc_st = at91sc->sc_st;
@@ -195,31 +193,6 @@ at91_attach(device_t dev)
AT91RM92_SYS_SIZE, &sc->sc_sys_sh) != 0)
panic("Enable to map system registers");
- if (bus_space_subregion(sc->sc_st, sc->sc_sh, AT91RM92_AIC_BASE,
- AT91RM92_AIC_SIZE, &sc->sc_aic_sh) != 0)
- panic("Enable to map system registers");
-
- /* XXX Hack to tell atmelarm about the AIC */
- at91sc->sc_aic_sh = sc->sc_aic_sh;
-
- for (i = 0; i < 32; i++) {
- bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SVR +
- i * 4, i);
- /* Priority. */
- bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SMR + i * 4,
- at91_irq_prio[i]);
- if (i < 8)
- bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_EOICR,
- 1);
- }
-
- bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SPU, 32);
- /* No debug. */
- bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_DCR, 0);
- /* Disable and clear all interrupts. */
- bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_IDCR, 0xffffffff);
- bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_ICCR, 0xffffffff);
-
/* Disable all interrupts for RTC (0xe24 == RTC_IDR) */
bus_space_write_4(sc->sc_st, sc->sc_sys_sh, 0xe24, 0xffffffff);
@@ -283,7 +256,8 @@ DRIVER_MODULE(at91rm920, atmelarm, at91r
static struct at91_soc_data soc_data = {
.soc_delay = at91_st_delay,
- .soc_reset = at91_st_cpu_reset
+ .soc_reset = at91_st_cpu_reset,
+ .soc_irq_prio = at91_irq_prio,
};
AT91_SOC(AT91_T_RM9200, &soc_data);
Modified: head/sys/arm/at91/at91sam9260.c
==============================================================================
--- head/sys/arm/at91/at91sam9260.c Thu Jul 12 02:15:06 2012
(r238388)
+++ head/sys/arm/at91/at91sam9260.c Thu Jul 12 02:58:45 2012
(r238389)
@@ -51,8 +51,6 @@ struct at91sam9_softc {
device_t dev;
bus_space_tag_t sc_st;
bus_space_handle_t sc_sh;
- bus_space_handle_t sc_sys_sh;
- bus_space_handle_t sc_aic_sh;
bus_space_handle_t sc_matrix_sh;
};
@@ -184,43 +182,13 @@ at91_attach(device_t dev)
{
struct at91_pmc_clock *clk;
struct at91sam9_softc *sc = device_get_softc(dev);
- int i;
-
struct at91_softc *at91sc = device_get_softc(device_get_parent(dev));
+ uint32_t i;
sc->sc_st = at91sc->sc_st;
sc->sc_sh = at91sc->sc_sh;
sc->dev = dev;
- if (bus_space_subregion(sc->sc_st, sc->sc_sh, AT91SAM9260_SYS_BASE,
- AT91SAM9260_SYS_SIZE, &sc->sc_sys_sh) != 0)
- panic("Enable to map system registers");
-
- if (bus_space_subregion(sc->sc_st, sc->sc_sh, AT91SAM9260_AIC_BASE,
- AT91SAM9260_AIC_SIZE, &sc->sc_aic_sh) != 0)
- panic("Enable to map system registers");
-
- /* XXX Hack to tell atmelarm about the AIC */
- at91sc->sc_aic_sh = sc->sc_aic_sh;
-
- for (i = 0; i < 32; i++) {
- bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SVR +
- i * 4, i);
- /* Priority. */
- bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SMR + i * 4,
- at91_irq_prio[i]);
- if (i < 8)
- bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_EOICR,
- 1);
- }
-
- bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SPU, 32);
- /* No debug. */
- bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_DCR, 0);
- /* Disable and clear all interrupts. */
- bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_IDCR, 0xffffffff);
- bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_ICCR, 0xffffffff);
-
if (bus_space_subregion(sc->sc_st, sc->sc_sh,
AT91SAM9260_MATRIX_BASE, AT91SAM9260_MATRIX_SIZE,
&sc->sc_matrix_sh) != 0)
@@ -299,7 +267,8 @@ DRIVER_MODULE(at91sam9260, atmelarm, at9
static struct at91_soc_data soc_data = {
.soc_delay = at91_pit_delay,
- .soc_reset = at91_rst_cpu_reset
+ .soc_reset = at91_rst_cpu_reset,
+ .soc_irq_prio = at91_irq_prio,
};
AT91_SOC(AT91_T_SAM9260, &soc_data);
Modified: head/sys/arm/at91/at91sam9g20.c
==============================================================================
--- head/sys/arm/at91/at91sam9g20.c Thu Jul 12 02:15:06 2012
(r238388)
+++ head/sys/arm/at91/at91sam9g20.c Thu Jul 12 02:58:45 2012
(r238389)
@@ -51,8 +51,6 @@ struct at91sam9_softc {
device_t dev;
bus_space_tag_t sc_st;
bus_space_handle_t sc_sh;
- bus_space_handle_t sc_sys_sh;
- bus_space_handle_t sc_aic_sh;
bus_space_handle_t sc_matrix_sh;
};
@@ -191,47 +189,13 @@ at91_attach(device_t dev)
{
struct at91_pmc_clock *clk;
struct at91sam9_softc *sc = device_get_softc(dev);
- int i;
-
struct at91_softc *at91sc = device_get_softc(device_get_parent(dev));
+ uint32_t i;
sc->sc_st = at91sc->sc_st;
sc->sc_sh = at91sc->sc_sh;
sc->dev = dev;
- /*
- * XXX These values work for the RM9200, SAM926[01], and SAM9G20
- * will have to fix this when we want to support anything else. XXX
- */
- if (bus_space_subregion(sc->sc_st, sc->sc_sh, AT91SAM9G20_SYS_BASE,
- AT91SAM9G20_SYS_SIZE, &sc->sc_sys_sh) != 0)
- panic("Enable to map system registers");
-
- if (bus_space_subregion(sc->sc_st, sc->sc_sh, AT91SAM9G20_AIC_BASE,
- AT91SAM9G20_AIC_SIZE, &sc->sc_aic_sh) != 0)
- panic("Enable to map system registers");
-
- /* XXX Hack to tell atmelarm about the AIC */
- at91sc->sc_aic_sh = sc->sc_aic_sh;
-
- for (i = 0; i < 32; i++) {
- bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SVR +
- i * 4, i);
- /* Priority. */
- bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SMR + i * 4,
- at91_irq_prio[i]);
- if (i < 8)
- bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_EOICR,
- 1);
- }
-
- bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SPU, 32);
- /* No debug. */
- bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_DCR, 0);
- /* Disable and clear all interrupts. */
- bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_IDCR, 0xffffffff);
- bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_ICCR, 0xffffffff);
-
if (bus_space_subregion(sc->sc_st, sc->sc_sh,
AT91SAM9G20_MATRIX_BASE, AT91SAM9G20_MATRIX_SIZE,
&sc->sc_matrix_sh) != 0)
@@ -301,7 +265,8 @@ DRIVER_MODULE(at91sam, atmelarm, at91sam
static struct at91_soc_data soc_data = {
.soc_delay = at91_pit_delay,
- .soc_reset = at91_rst_cpu_reset
+ .soc_reset = at91_rst_cpu_reset,
+ .soc_irq_prio = at91_irq_prio,
};
AT91_SOC(AT91_T_SAM9G20, &soc_data);
Modified: head/sys/arm/at91/at91sam9x25.c
==============================================================================
--- head/sys/arm/at91/at91sam9x25.c Thu Jul 12 02:15:06 2012
(r238388)
+++ head/sys/arm/at91/at91sam9x25.c Thu Jul 12 02:58:45 2012
(r238389)
@@ -51,8 +51,6 @@ struct at91sam9x25_softc {
device_t dev;
bus_space_tag_t sc_st;
bus_space_handle_t sc_sh;
- bus_space_handle_t sc_sys_sh;
- bus_space_handle_t sc_aic_sh;
};
/*
@@ -193,47 +191,12 @@ at91_attach(device_t dev)
{
struct at91_pmc_clock *clk;
struct at91sam9x25_softc *sc = device_get_softc(dev);
- int i;
-
struct at91_softc *at91sc = device_get_softc(device_get_parent(dev));
sc->sc_st = at91sc->sc_st;
sc->sc_sh = at91sc->sc_sh;
sc->dev = dev;
- /*
- * XXX These values work for the RM9200, SAM926[01], and SAM9X25
- * will have to fix this when we want to support anything else. XXX
- */
- if (bus_space_subregion(sc->sc_st, sc->sc_sh, AT91SAM9X25_SYS_BASE,
- AT91SAM9X25_SYS_SIZE, &sc->sc_sys_sh) != 0)
- panic("Enable to map system registers");
-
- if (bus_space_subregion(sc->sc_st, sc->sc_sh, AT91SAM9X25_AIC_BASE,
- AT91SAM9X25_AIC_SIZE, &sc->sc_aic_sh) != 0)
- panic("Enable to map system registers");
-
- /* XXX Hack to tell atmelarm about the AIC */
- at91sc->sc_aic_sh = sc->sc_aic_sh;
-
- for (i = 0; i < 32; i++) {
- bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SVR +
- i * 4, i);
- /* Priority. */
- bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SMR + i * 4,
- at91_irq_prio[i]);
- if (i < 8)
- bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_EOICR,
- 1);
- }
-
- bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_SPU, 32);
- /* No debug. */
- bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_DCR, 0);
- /* Disable and clear all interrupts. */
- bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_IDCR, 0xffffffff);
- bus_space_write_4(sc->sc_st, sc->sc_aic_sh, IC_ICCR, 0xffffffff);
-
/* Update USB device port clock info */
clk = at91_pmc_clock_ref("udpck");
clk->pmc_mask = PMC_SCER_UDP_SAM9;
@@ -290,7 +253,8 @@ DRIVER_MODULE(at91sam9x25, atmelarm, at9
static struct at91_soc_data soc_data = {
.soc_delay = at91_pit_delay,
- .soc_reset = at91_rst_cpu_reset
+ .soc_reset = at91_rst_cpu_reset,
+ .soc_irq_prio = at91_irq_prio,
};
AT91_SOC_SUB(AT91_T_SAM9X5, AT91_ST_SAM9X25, &soc_data);
Modified: head/sys/arm/at91/at91var.h
==============================================================================
--- head/sys/arm/at91/at91var.h Thu Jul 12 02:15:06 2012 (r238388)
+++ head/sys/arm/at91/at91var.h Thu Jul 12 02:58:45 2012 (r238389)
@@ -108,6 +108,7 @@ typedef void (*cpu_reset_t)(void);
struct at91_soc_data {
DELAY_t soc_delay;
cpu_reset_t soc_reset;
+ const int *soc_irq_prio;
};
struct at91_soc_info {
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
