From 050396e533308f4d1c6ed55105a81eff1f402b9f Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 9 Apr 2012 06:13:06 +0000 Subject: [PATCH] sim: bfin: new PINT model Newer BF54x parts feature an updated GPIO block where all the interrupt handling is split off, so create a new model for the pin interrupts. This is missing the port forwarding aspects, but at least the register interface should be there. Signed-off-by: Mike Frysinger --- sim/bfin/ChangeLog | 11 ++ sim/bfin/configure | 1 + sim/bfin/configure.ac | 1 + sim/bfin/dv-bfin_pint.c | 298 ++++++++++++++++++++++++++++++++++++++++++++++++ sim/bfin/dv-bfin_pint.h | 24 ++++ sim/bfin/machs.c | 51 ++++++++- sim/bfin/machs.h | 1 + 7 files changed, 386 insertions(+), 1 deletion(-) create mode 100644 sim/bfin/dv-bfin_pint.c create mode 100644 sim/bfin/dv-bfin_pint.h diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog index 75cbf63..d27f888 100644 --- a/sim/bfin/ChangeLog +++ b/sim/bfin/ChangeLog @@ -1,5 +1,16 @@ 2012-04-09 Mike Frysinger + * configure.ac (SIM_AC_OPTION_HARDWARE): Add bfin_pint. + * configure: Regenerate. + * dv-bfin_pint.c, dv-bfin_pint.h: New device model. + * machs.c (bf542_dev): Add PINT register blocks. + (bf544_dev, bf547_dev): Likewise. + (PINT_PIQS): Define. + (bf54x_port): Add pint/gpio routing. + * machs.h (BFIN_MMR_PINT_SIZE): Define. + +2012-04-09 Mike Frysinger + * configure.ac (SIM_AC_OPTION_HARDWARE): Add bfin_gpio2. * configure: Regenerate. * dv-bfin_gpio2.c, dv-bfin_gpio2.h: New device model. diff --git a/sim/bfin/configure b/sim/bfin/configure index 3aadc21..286cda8 100755 --- a/sim/bfin/configure +++ b/sim/bfin/configure @@ -5376,6 +5376,7 @@ hardware="$hardware \ bfin_nfc \ bfin_otp \ bfin_pfmon \ + bfin_pint \ bfin_pll \ bfin_ppi \ bfin_rtc \ diff --git a/sim/bfin/configure.ac b/sim/bfin/configure.ac index 5cae416..edf09ba 100644 --- a/sim/bfin/configure.ac +++ b/sim/bfin/configure.ac @@ -31,6 +31,7 @@ SIM_AC_OPTION_HARDWARE(yes,,\ bfin_nfc \ bfin_otp \ bfin_pfmon \ + bfin_pint \ bfin_pll \ bfin_ppi \ bfin_rtc \ diff --git a/sim/bfin/dv-bfin_pint.c b/sim/bfin/dv-bfin_pint.c new file mode 100644 index 0000000..0fa3c7e --- /dev/null +++ b/sim/bfin/dv-bfin_pint.c @@ -0,0 +1,298 @@ +/* Blackfin Pin Interrupt (PINT) model + + Copyright (C) 2010-2012 Free Software Foundation, Inc. + Contributed by Analog Devices, Inc. and Mike Frysinger. + + This file is part of simulators. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#include "config.h" + +#include "sim-main.h" +#include "devices.h" +#include "dv-bfin_pint.h" + +struct bfin_pint +{ + bu32 base; + + /* Only accessed indirectly via the associated set/clear MMRs. */ + bu32 mask, edge, invert; + + /* Order after here is important -- matches hardware MMR layout. */ + bu32 mask_set; + bu32 mask_clear; + bu32 request; + bu32 assign; + bu32 edge_set; + bu32 edge_clear; + bu32 invert_set; + bu32 invert_clear; + bu32 pinstate; + bu32 latch; +}; +#define mmr_base() offsetof(struct bfin_pint, mask_set) +#define mmr_offset(mmr) (offsetof(struct bfin_pint, mmr) - mmr_base()) + +static const char * const mmr_names[] = +{ + "PINT_MASK_SET", "PINT_MASK_CLEAR", "PINT_REQUEST", "PINT_ASSIGN", + "PINT_EDGE_SET", "PINT_EDGE_CLEAR", "PINT_INVERT_SET", + "PINT_INVERT_CLEAR", "PINT_PINSTATE", "PINT_LATCH", +}; +#define mmr_name(off) mmr_names[(off) / 4] + +static unsigned +bfin_pint_io_write_buffer (struct hw *me, const void *source, int space, + address_word addr, unsigned nr_bytes) +{ + struct bfin_pint *pint = hw_data (me); + bu32 mmr_off; + bu32 value; + bu32 *valuep; + + if (nr_bytes == 4) + value = dv_load_4 (source); + else + value = dv_load_2 (source); + mmr_off = addr - pint->base; + valuep = (void *)((unsigned long)pint + mmr_base() + mmr_off); + + HW_TRACE_WRITE (); + + /* XXX: The hardware allows 16 or 32 bit accesses ... */ + dv_bfin_mmr_require_32 (me, addr, nr_bytes, true); + + switch (mmr_off) + { + case mmr_offset(request): + case mmr_offset(assign): + case mmr_offset(pinstate): + case mmr_offset(latch): + *valuep = value; + break; + case mmr_offset(mask_set): + dv_w1c_4 (&pint->mask, value, -1); + break; + case mmr_offset(mask_clear): + pint->mask |= value; + break; + case mmr_offset(edge_set): + dv_w1c_4 (&pint->edge, value, -1); + break; + case mmr_offset(edge_clear): + pint->edge |= value; + break; + case mmr_offset(invert_set): + dv_w1c_4 (&pint->invert, value, -1); + break; + case mmr_offset(invert_clear): + pint->invert |= value; + break; + default: + dv_bfin_mmr_invalid (me, addr, nr_bytes, true); + break; + } + +#if 0 + /* If updating masks, make sure we send updated port info. */ + switch (mmr_off) + { + case mmr_offset(dir): + case mmr_offset(data) ... mmr_offset(toggle): + bfin_pint_forward_ouput (me, pint, data); + break; + case mmr_offset(maska) ... mmr_offset(maska_toggle): + bfin_pint_forward_int (me, pint, pint->maska, 0); + break; + case mmr_offset(maskb) ... mmr_offset(maskb_toggle): + bfin_pint_forward_int (me, pint, pint->maskb, 1); + break; + } +#endif + + return nr_bytes; +} + +static unsigned +bfin_pint_io_read_buffer (struct hw *me, void *dest, int space, + address_word addr, unsigned nr_bytes) +{ + struct bfin_pint *pint = hw_data (me); + bu32 mmr_off; + bu32 *valuep; + + mmr_off = addr - pint->base; + valuep = (void *)((unsigned long)pint + mmr_base() + mmr_off); + + HW_TRACE_READ (); + + /* XXX: The hardware allows 16 or 32 bit accesses ... */ + dv_bfin_mmr_require_32 (me, addr, nr_bytes, false); + + switch (mmr_off) + { + case mmr_offset(request): + case mmr_offset(assign): + case mmr_offset(pinstate): + case mmr_offset(latch): + dv_store_4 (dest, *valuep); + break; + case mmr_offset(mask_set): + case mmr_offset(mask_clear): + dv_store_4 (dest, pint->mask); + break; + case mmr_offset(edge_set): + case mmr_offset(edge_clear): + dv_store_4 (dest, pint->edge); + break; + case mmr_offset(invert_set): + case mmr_offset(invert_clear): + dv_store_4 (dest, pint->invert); + break; + default: + dv_bfin_mmr_invalid (me, addr, nr_bytes, false); + break; + } + + return nr_bytes; +} + +#define ENC(bmap, piq) (((bmap) << 8) + (piq)) + +#define PIQ_PORTS(n) \ + { "piq0@"#n, ENC(n, 0), 0, input_port, }, \ + { "piq1@"#n, ENC(n, 1), 0, input_port, }, \ + { "piq2@"#n, ENC(n, 2), 0, input_port, }, \ + { "piq3@"#n, ENC(n, 3), 0, input_port, }, \ + { "piq4@"#n, ENC(n, 4), 0, input_port, }, \ + { "piq5@"#n, ENC(n, 5), 0, input_port, }, \ + { "piq6@"#n, ENC(n, 6), 0, input_port, }, \ + { "piq7@"#n, ENC(n, 7), 0, input_port, }, \ + { "piq8@"#n, ENC(n, 8), 0, input_port, }, \ + { "piq9@"#n, ENC(n, 9), 0, input_port, }, \ + { "piq10@"#n, ENC(n, 10), 0, input_port, }, \ + { "piq11@"#n, ENC(n, 11), 0, input_port, }, \ + { "piq12@"#n, ENC(n, 12), 0, input_port, }, \ + { "piq13@"#n, ENC(n, 13), 0, input_port, }, \ + { "piq14@"#n, ENC(n, 14), 0, input_port, }, \ + { "piq15@"#n, ENC(n, 15), 0, input_port, }, \ + { "piq16@"#n, ENC(n, 16), 0, input_port, }, \ + { "piq17@"#n, ENC(n, 17), 0, input_port, }, \ + { "piq18@"#n, ENC(n, 18), 0, input_port, }, \ + { "piq19@"#n, ENC(n, 19), 0, input_port, }, \ + { "piq20@"#n, ENC(n, 20), 0, input_port, }, \ + { "piq21@"#n, ENC(n, 21), 0, input_port, }, \ + { "piq22@"#n, ENC(n, 22), 0, input_port, }, \ + { "piq23@"#n, ENC(n, 23), 0, input_port, }, \ + { "piq24@"#n, ENC(n, 24), 0, input_port, }, \ + { "piq25@"#n, ENC(n, 25), 0, input_port, }, \ + { "piq26@"#n, ENC(n, 26), 0, input_port, }, \ + { "piq27@"#n, ENC(n, 27), 0, input_port, }, \ + { "piq28@"#n, ENC(n, 28), 0, input_port, }, \ + { "piq29@"#n, ENC(n, 29), 0, input_port, }, \ + { "piq30@"#n, ENC(n, 30), 0, input_port, }, \ + { "piq31@"#n, ENC(n, 31), 0, input_port, }, + +static const struct hw_port_descriptor bfin_pint_ports[] = +{ + { "stat", 0, 0, output_port, }, + PIQ_PORTS(0) + PIQ_PORTS(1) + PIQ_PORTS(2) + PIQ_PORTS(3) + PIQ_PORTS(4) + PIQ_PORTS(5) + PIQ_PORTS(6) + PIQ_PORTS(7) + { NULL, 0, 0, 0, }, +}; + +static void +bfin_pint_port_event (struct hw *me, int my_port, struct hw *source, + int source_port, int level) +{ + /* XXX: TODO. */ +} + +static void +attach_bfin_pint_regs (struct hw *me, struct bfin_pint *pint) +{ + address_word attach_address; + int attach_space; + unsigned attach_size; + reg_property_spec reg; + + if (hw_find_property (me, "reg") == NULL) + hw_abort (me, "Missing \"reg\" property"); + + if (!hw_find_reg_array_property (me, "reg", 0, ®)) + hw_abort (me, "\"reg\" property must contain three addr/size entries"); + + hw_unit_address_to_attach_address (hw_parent (me), + ®.address, + &attach_space, &attach_address, me); + hw_unit_size_to_attach_size (hw_parent (me), ®.size, &attach_size, me); + + if (attach_size != BFIN_MMR_PINT_SIZE) + hw_abort (me, "\"reg\" size must be %#x", BFIN_MMR_PINT_SIZE); + + hw_attach_address (hw_parent (me), + 0, attach_space, attach_address, attach_size, me); + + pint->base = attach_address; +} + +static void +bfin_pint_finish (struct hw *me) +{ + struct bfin_pint *pint; + + pint = HW_ZALLOC (me, struct bfin_pint); + + set_hw_data (me, pint); + set_hw_io_read_buffer (me, bfin_pint_io_read_buffer); + set_hw_io_write_buffer (me, bfin_pint_io_write_buffer); + set_hw_ports (me, bfin_pint_ports); + set_hw_port_event (me, bfin_pint_port_event); + + /* Initialize the PINT. */ + switch (dv_get_bus_num (me)) + { + case 0: + pint->assign = 0x00000101; + break; + case 1: + pint->assign = 0x01010000; + break; + case 2: + pint->assign = 0x00000101; + break; + case 3: + pint->assign = 0x02020303; + break; + default: + /* XXX: Should move this default into device tree. */ + hw_abort (me, "no support for PINT at this address yet"); + } + + attach_bfin_pint_regs (me, pint); +} + +const struct hw_descriptor dv_bfin_pint_descriptor[] = +{ + {"bfin_pint", bfin_pint_finish,}, + {NULL, NULL}, +}; diff --git a/sim/bfin/dv-bfin_pint.h b/sim/bfin/dv-bfin_pint.h new file mode 100644 index 0000000..4966d12 --- /dev/null +++ b/sim/bfin/dv-bfin_pint.h @@ -0,0 +1,24 @@ +/* Blackfin Pin Interrupt (PINT) model + + Copyright (C) 2010-2012 Free Software Foundation, Inc. + Contributed by Analog Devices, Inc. and Mike Frysinger. + + This file is part of simulators. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ + +#ifndef DV_BFIN_PINT_H +#define DV_BFIN_PINT_H + +#endif diff --git a/sim/bfin/machs.c b/sim/bfin/machs.c index 5267cfa..9d0f263 100644 --- a/sim/bfin/machs.c +++ b/sim/bfin/machs.c @@ -1,7 +1,7 @@ /* Simulator for Analog Devices Blackfin processors. Copyright (C) 2005-2012 Free Software Foundation, Inc. - Contributed by Analog Devices, Inc. + Contributed by Analog Devices, Inc. and Mike Frysinger. This file is part of simulators. @@ -914,6 +914,10 @@ static const struct bfin_dev_layout bf542_dev[] = DEVICE (0xFFC00A00, BF54X_MMR_EBIU_AMC_SIZE, "bfin_ebiu_amc"), DEVICE (0xFFC00A20, BFIN_MMR_EBIU_DDRC_SIZE, "bfin_ebiu_ddrc"), _DEVICE (0xFFC01300, BFIN_MMR_EPPI_SIZE, "bfin_eppi@1", 1), + DEVICE (0xFFC01400, BFIN_MMR_PINT_SIZE, "bfin_pint@0"), + DEVICE (0xFFC01430, BFIN_MMR_PINT_SIZE, "bfin_pint@1"), + _DEVICE (0xFFC01460, BFIN_MMR_PINT_SIZE, "bfin_pint@2", 2), + _DEVICE (0xFFC01490, BFIN_MMR_PINT_SIZE, "bfin_pint@3", 2), DEVICE (0xFFC014C0, BFIN_MMR_GPIO2_SIZE, "bfin_gpio2@0"), DEVICE (0xFFC014E0, BFIN_MMR_GPIO2_SIZE, "bfin_gpio2@1"), DEVICE (0xFFC01500, BFIN_MMR_GPIO2_SIZE, "bfin_gpio2@2"), @@ -954,6 +958,10 @@ static const struct bfin_dev_layout bf544_dev[] = DEVICE (0xFFC00A20, BFIN_MMR_EBIU_DDRC_SIZE, "bfin_ebiu_ddrc"), _DEVICE (0xFFC01000, BFIN_MMR_EPPI_SIZE, "bfin_eppi@0", 1), _DEVICE (0xFFC01300, BFIN_MMR_EPPI_SIZE, "bfin_eppi@1", 1), + DEVICE (0xFFC01400, BFIN_MMR_PINT_SIZE, "bfin_pint@0"), + DEVICE (0xFFC01430, BFIN_MMR_PINT_SIZE, "bfin_pint@1"), + _DEVICE (0xFFC01460, BFIN_MMR_PINT_SIZE, "bfin_pint@2", 2), + _DEVICE (0xFFC01490, BFIN_MMR_PINT_SIZE, "bfin_pint@3", 2), DEVICE (0xFFC014C0, BFIN_MMR_GPIO2_SIZE, "bfin_gpio2@0"), DEVICE (0xFFC014E0, BFIN_MMR_GPIO2_SIZE, "bfin_gpio2@1"), DEVICE (0xFFC01500, BFIN_MMR_GPIO2_SIZE, "bfin_gpio2@2"), @@ -995,6 +1003,10 @@ static const struct bfin_dev_layout bf547_dev[] = DEVICE (0xFFC00A20, BFIN_MMR_EBIU_DDRC_SIZE, "bfin_ebiu_ddrc"), _DEVICE (0xFFC01000, BFIN_MMR_EPPI_SIZE, "bfin_eppi@0", 1), _DEVICE (0xFFC01300, BFIN_MMR_EPPI_SIZE, "bfin_eppi@1", 1), + DEVICE (0xFFC01400, BFIN_MMR_PINT_SIZE, "bfin_pint@0"), + DEVICE (0xFFC01430, BFIN_MMR_PINT_SIZE, "bfin_pint@1"), + _DEVICE (0xFFC01460, BFIN_MMR_PINT_SIZE, "bfin_pint@2", 2), + _DEVICE (0xFFC01490, BFIN_MMR_PINT_SIZE, "bfin_pint@3", 2), DEVICE (0xFFC014C0, BFIN_MMR_GPIO2_SIZE, "bfin_gpio2@0"), DEVICE (0xFFC014E0, BFIN_MMR_GPIO2_SIZE, "bfin_gpio2@1"), DEVICE (0xFFC01500, BFIN_MMR_GPIO2_SIZE, "bfin_gpio2@2"), @@ -1034,6 +1046,23 @@ static const struct bfin_dmac_layout bf54x_dmac[] = #define bf547_dmac bf54x_dmac #define bf548_dmac bf54x_dmac #define bf549_dmac bf54x_dmac +#define PINT_PIQS(p, b, g) \ + PORT (p, "piq0@"#b, g, "p0"), \ + PORT (p, "piq1@"#b, g, "p1"), \ + PORT (p, "piq2@"#b, g, "p2"), \ + PORT (p, "piq3@"#b, g, "p3"), \ + PORT (p, "piq4@"#b, g, "p4"), \ + PORT (p, "piq5@"#b, g, "p5"), \ + PORT (p, "piq6@"#b, g, "p6"), \ + PORT (p, "piq7@"#b, g, "p7"), \ + PORT (p, "piq8@"#b, g, "p8"), \ + PORT (p, "piq9@"#b, g, "p9"), \ + PORT (p, "piq10@"#b, g, "p10"), \ + PORT (p, "piq11@"#b, g, "p11"), \ + PORT (p, "piq12@"#b, g, "p12"), \ + PORT (p, "piq13@"#b, g, "p13"), \ + PORT (p, "piq14@"#b, g, "p14"), \ + PORT (p, "piq15@"#b, g, "p15") static const struct bfin_port_layout bf54x_port[] = { SIC (0, 0, "bfin_pll", "pll"), @@ -1056,7 +1085,11 @@ static const struct bfin_port_layout bf54x_port[] = SIC (0, 17, "bfin_gptimer@9", "stat"), SIC (0, 18, "bfin_gptimer@10", "stat"), SIC (0, 19, "bfin_pint@0", "stat"), + PINT_PIQS ("bfin_pint@0", 0, "bfin_gpio2@0"), + PINT_PIQS ("bfin_pint@0", 1, "bfin_gpio2@1"), SIC (0, 20, "bfin_pint@1", "stat"), + PINT_PIQS ("bfin_pint@1", 0, "bfin_gpio2@0"), + PINT_PIQS ("bfin_pint@1", 1, "bfin_gpio2@1"), SIC (0, 21, "bfin_dma@256", "di"), /* mdma0 */ SIC (0, 21, "bfin_dma@257", "di"), /* mdma0 */ SIC (0, 22, "bfin_dma@258", "di"), /* mdma1 */ @@ -1138,7 +1171,23 @@ static const struct bfin_port_layout bf54x_port[] = SIC (2, 28, "bfin_gptimer@6", "stat"), SIC (2, 29, "bfin_gptimer@7", "stat"), SIC (2, 30, "bfin_pint@2", "stat"), + PINT_PIQS ("bfin_pint@2", 0, "bfin_gpio2@2"), + PINT_PIQS ("bfin_pint@2", 1, "bfin_gpio2@3"), + PINT_PIQS ("bfin_pint@2", 2, "bfin_gpio2@4"), + PINT_PIQS ("bfin_pint@2", 3, "bfin_gpio2@5"), + PINT_PIQS ("bfin_pint@2", 4, "bfin_gpio2@6"), + PINT_PIQS ("bfin_pint@2", 5, "bfin_gpio2@7"), + PINT_PIQS ("bfin_pint@2", 6, "bfin_gpio2@8"), + PINT_PIQS ("bfin_pint@2", 7, "bfin_gpio2@9"), SIC (2, 31, "bfin_pint@3", "stat"), + PINT_PIQS ("bfin_pint@3", 0, "bfin_gpio2@2"), + PINT_PIQS ("bfin_pint@3", 1, "bfin_gpio2@3"), + PINT_PIQS ("bfin_pint@3", 2, "bfin_gpio2@4"), + PINT_PIQS ("bfin_pint@3", 3, "bfin_gpio2@5"), + PINT_PIQS ("bfin_pint@3", 4, "bfin_gpio2@6"), + PINT_PIQS ("bfin_pint@3", 5, "bfin_gpio2@7"), + PINT_PIQS ("bfin_pint@3", 6, "bfin_gpio2@8"), + PINT_PIQS ("bfin_pint@3", 7, "bfin_gpio2@9"), }; #define bf542_port bf54x_port #define bf544_port bf54x_port diff --git a/sim/bfin/machs.h b/sim/bfin/machs.h index e37d2c7..27a8656 100644 --- a/sim/bfin/machs.h +++ b/sim/bfin/machs.h @@ -89,6 +89,7 @@ enum { 0xFFC03600 0x10 - Control 0xFFC03680 0x10 - Data */ #define BFIN_MMR_OTP_SIZE 0xa0 +#define BFIN_MMR_PINT_SIZE 0x28 #define BFIN_MMR_PLL_BASE 0xFFC00000 #define BFIN_MMR_PLL_SIZE (4 * 6) #define BFIN_MMR_PPI_SIZE (4 * 5) -- 2.7.4