X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=blobdiff_plain;f=src%2Fflash%2Fnor%2Fstellaris.c;h=27b66325a363d48be00310d428cf6189b94adade;hp=39c189c43b5903b5aa4d84c9f2586f33379245af;hb=571db89aa13554d5c5e38e88233927d3149edc3a;hpb=889a306fc8cb266462b630b19ebf8a319d07c9f0 diff --git a/src/flash/nor/stellaris.c b/src/flash/nor/stellaris.c index 39c189c43b..27b66325a3 100644 --- a/src/flash/nor/stellaris.c +++ b/src/flash/nor/stellaris.c @@ -18,21 +18,22 @@ * You should have received a copy of the GNU General Public License * * along with this program; if not, write to the * * Free Software Foundation, Inc., * - * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * ***************************************************************************/ /*************************************************************************** * STELLARIS flash is tested on LM3S811, LM3S6965, LM3s3748, more. ***************************************************************************/ + #ifdef HAVE_CONFIG_H #include "config.h" #endif +#include "jtag/interface.h" #include "imp.h" #include #include - #define DID0_VER(did0) ((did0 >> 28)&0x07) /* STELLARIS control registers */ @@ -68,6 +69,8 @@ #define FLASH_CRIS (FLASH_CONTROL_BASE | 0x00C) #define FLASH_CIM (FLASH_CONTROL_BASE | 0x010) #define FLASH_MISC (FLASH_CONTROL_BASE | 0x014) +#define FLASH_FSIZE (FLASH_CONTROL_BASE | 0xFC0) +#define FLASH_SSIZE (FLASH_CONTROL_BASE | 0xFC4) #define AMISC 1 #define PMISC 2 @@ -88,29 +91,25 @@ #define FLASH_FMA_PRE(x) (2 * (x)) /* for FMPPREx */ #define FLASH_FMA_PPE(x) (2 * (x) + 1) /* for FMPPPEx */ - static void stellaris_read_clock_info(struct flash_bank *bank); static int stellaris_mass_erase(struct flash_bank *bank); -struct stellaris_flash_bank -{ +struct stellaris_flash_bank { /* chip id register */ uint32_t did0; uint32_t did1; uint32_t dc0; uint32_t dc1; + uint32_t fsize; + uint32_t ssize; - const char * target_name; + const char *target_name; + uint8_t target_class; uint32_t sramsiz; - uint32_t flshsz; /* flash geometry */ uint32_t num_pages; uint32_t pagesize; - uint32_t pages_in_lockregion; - - /* nv memory bits */ - uint16_t num_lockbits; /* main clock status */ uint32_t rcc; @@ -123,262 +122,334 @@ struct stellaris_flash_bank const char *mck_desc; }; -// Autogenerated by contrib/gen-stellaris-part-header.pl -// From Stellaris Firmware Development Package revision 8049 -static struct { - uint32_t partno; +/* Autogenerated by contrib/gen-stellaris-part-header.pl */ +/* From Stellaris Firmware Development Package revision 9453 */ +static const struct { + uint8_t class; + uint8_t partno; const char *partname; -} StellarisParts[] = -{ - {0x0001,"LM3S101"}, - {0x0002,"LM3S102"}, - {0x0019,"LM3S300"}, - {0x0011,"LM3S301"}, - {0x001A,"LM3S308"}, - {0x0012,"LM3S310"}, - {0x0013,"LM3S315"}, - {0x0014,"LM3S316"}, - {0x0017,"LM3S317"}, - {0x0015,"LM3S328"}, - {0x002A,"LM3S600"}, - {0x0021,"LM3S601"}, - {0x002B,"LM3S608"}, - {0x0022,"LM3S610"}, - {0x0023,"LM3S611"}, - {0x0024,"LM3S612"}, - {0x0025,"LM3S613"}, - {0x0026,"LM3S615"}, - {0x0028,"LM3S617"}, - {0x0029,"LM3S618"}, - {0x0027,"LM3S628"}, - {0x0038,"LM3S800"}, - {0x0031,"LM3S801"}, - {0x0039,"LM3S808"}, - {0x0032,"LM3S811"}, - {0x0033,"LM3S812"}, - {0x0034,"LM3S815"}, - {0x0036,"LM3S817"}, - {0x0037,"LM3S818"}, - {0x0035,"LM3S828"}, - {0x10BF,"LM3S1110"}, - {0x10C3,"LM3S1133"}, - {0x10C5,"LM3S1138"}, - {0x10C1,"LM3S1150"}, - {0x10C4,"LM3S1162"}, - {0x10C2,"LM3S1165"}, - {0x10EC,"LM3S1166"}, - {0x10C6,"LM3S1332"}, - {0x10BC,"LM3S1435"}, - {0x10BA,"LM3S1439"}, - {0x10BB,"LM3S1512"}, - {0x10C7,"LM3S1538"}, - {0x10DB,"LM3S1601"}, - {0x1006,"LM3S1607"}, - {0x10DA,"LM3S1608"}, - {0x10C0,"LM3S1620"}, - {0x10CD,"LM3S1621"}, - {0x1003,"LM3S1625"}, - {0x1004,"LM3S1626"}, - {0x1005,"LM3S1627"}, - {0x10B3,"LM3S1635"}, - {0x10EB,"LM3S1636"}, - {0x10BD,"LM3S1637"}, - {0x10B1,"LM3S1651"}, - {0x10B9,"LM3S1751"}, - {0x1010,"LM3S1776"}, - {0x1016,"LM3S1811"}, - {0x103D,"LM3S1816"}, - {0x10B4,"LM3S1850"}, - {0x10DD,"LM3S1911"}, - {0x10DC,"LM3S1918"}, - {0x10B7,"LM3S1937"}, - {0x10BE,"LM3S1958"}, - {0x10B5,"LM3S1960"}, - {0x10B8,"LM3S1968"}, - {0x10EA,"LM3S1969"}, - {0x10CE,"LM3S1B21"}, - {0x10CA,"LM3S1C21"}, - {0x10CB,"LM3S1C26"}, - {0x1098,"LM3S1C58"}, - {0x10B0,"LM3S1D21"}, - {0x10CC,"LM3S1D26"}, - {0x101D,"LM3S1F11"}, - {0x101B,"LM3S1F16"}, - {0x10AF,"LM3S1G21"}, - {0x1095,"LM3S1G58"}, - {0x101E,"LM3S1H11"}, - {0x101C,"LM3S1H16"}, - {0x100F,"LM3S1J11"}, - {0x103C,"LM3S1J16"}, - {0x100E,"LM3S1N11"}, - {0x103B,"LM3S1N16"}, - {0x10B2,"LM3S1P51"}, - {0x109E,"LM3S1R21"}, - {0x10C9,"LM3S1R26"}, - {0x1030,"LM3S1W16"}, - {0x102F,"LM3S1Z16"}, - {0x10D4,"LM3S2016"}, - {0x1051,"LM3S2110"}, - {0x1084,"LM3S2139"}, - {0x1039,"LM3S2276"}, - {0x10A2,"LM3S2410"}, - {0x1059,"LM3S2412"}, - {0x1056,"LM3S2432"}, - {0x105A,"LM3S2533"}, - {0x10E1,"LM3S2601"}, - {0x10E0,"LM3S2608"}, - {0x1033,"LM3S2616"}, - {0x1057,"LM3S2620"}, - {0x1085,"LM3S2637"}, - {0x1053,"LM3S2651"}, - {0x1080,"LM3S2671"}, - {0x1050,"LM3S2678"}, - {0x10A4,"LM3S2730"}, - {0x1052,"LM3S2739"}, - {0x103A,"LM3S2776"}, - {0x106D,"LM3S2793"}, - {0x10E3,"LM3S2911"}, - {0x10E2,"LM3S2918"}, - {0x10ED,"LM3S2919"}, - {0x1054,"LM3S2939"}, - {0x108F,"LM3S2948"}, - {0x1058,"LM3S2950"}, - {0x1055,"LM3S2965"}, - {0x106C,"LM3S2B93"}, - {0x1094,"LM3S2D93"}, - {0x1093,"LM3S2U93"}, - {0x1008,"LM3S3634"}, - {0x1043,"LM3S3651"}, - {0x10C8,"LM3S3654"}, - {0x1044,"LM3S3739"}, - {0x1049,"LM3S3748"}, - {0x1045,"LM3S3749"}, - {0x1042,"LM3S3826"}, - {0x1041,"LM3S3J26"}, - {0x1040,"LM3S3N26"}, - {0x103F,"LM3S3W26"}, - {0x103E,"LM3S3Z26"}, - {0x1081,"LM3S5632"}, - {0x100C,"LM3S5651"}, - {0x108A,"LM3S5652"}, - {0x104D,"LM3S5656"}, - {0x1091,"LM3S5662"}, - {0x1096,"LM3S5732"}, - {0x1097,"LM3S5737"}, - {0x10A0,"LM3S5739"}, - {0x1099,"LM3S5747"}, - {0x10A7,"LM3S5749"}, - {0x109A,"LM3S5752"}, - {0x109C,"LM3S5762"}, - {0x1069,"LM3S5791"}, - {0x100B,"LM3S5951"}, - {0x104E,"LM3S5956"}, - {0x1068,"LM3S5B91"}, - {0x102E,"LM3S5C31"}, - {0x102C,"LM3S5C36"}, - {0x105E,"LM3S5C51"}, - {0x105B,"LM3S5C56"}, - {0x105F,"LM3S5D51"}, - {0x105C,"LM3S5D56"}, - {0x1087,"LM3S5D91"}, - {0x102D,"LM3S5G31"}, - {0x101F,"LM3S5G36"}, - {0x105D,"LM3S5G51"}, - {0x104F,"LM3S5G56"}, - {0x1009,"LM3S5K31"}, - {0x104A,"LM3S5K36"}, - {0x100A,"LM3S5P31"}, - {0x1048,"LM3S5P36"}, - {0x10B6,"LM3S5P3B"}, - {0x100D,"LM3S5P51"}, - {0x104C,"LM3S5P56"}, - {0x1007,"LM3S5R31"}, - {0x104B,"LM3S5R36"}, - {0x1047,"LM3S5T36"}, - {0x107F,"LM3S5U91"}, - {0x1046,"LM3S5Y36"}, - {0x10A1,"LM3S6100"}, - {0x1074,"LM3S6110"}, - {0x10A5,"LM3S6420"}, - {0x1082,"LM3S6422"}, - {0x1075,"LM3S6432"}, - {0x1076,"LM3S6537"}, - {0x1071,"LM3S6610"}, - {0x10E7,"LM3S6611"}, - {0x10E6,"LM3S6618"}, - {0x1083,"LM3S6633"}, - {0x108B,"LM3S6637"}, - {0x10A3,"LM3S6730"}, - {0x1077,"LM3S6753"}, - {0x10D1,"LM3S6816"}, - {0x10E9,"LM3S6911"}, - {0x10D3,"LM3S6916"}, - {0x10E8,"LM3S6918"}, - {0x1089,"LM3S6938"}, - {0x1072,"LM3S6950"}, - {0x1078,"LM3S6952"}, - {0x1073,"LM3S6965"}, - {0x10AA,"LM3S6C11"}, - {0x10AC,"LM3S6C65"}, - {0x109F,"LM3S6G11"}, - {0x10AB,"LM3S6G65"}, - {0x1064,"LM3S8530"}, - {0x108E,"LM3S8538"}, - {0x1061,"LM3S8630"}, - {0x1063,"LM3S8730"}, - {0x108D,"LM3S8733"}, - {0x1086,"LM3S8738"}, - {0x1065,"LM3S8930"}, - {0x108C,"LM3S8933"}, - {0x1088,"LM3S8938"}, - {0x10A6,"LM3S8962"}, - {0x1062,"LM3S8970"}, - {0x10D7,"LM3S8971"}, - {0x10AE,"LM3S8C62"}, - {0x10AD,"LM3S8G62"}, - {0x10CF,"LM3S9781"}, - {0x1067,"LM3S9790"}, - {0x106B,"LM3S9792"}, - {0x102D,"LM3S9971"}, - {0x1020,"LM3S9997"}, - {0x10D0,"LM3S9B81"}, - {0x1066,"LM3S9B90"}, - {0x106A,"LM3S9B92"}, - {0x106E,"LM3S9B95"}, - {0x106F,"LM3S9B96"}, - {0x101D,"LM3S9BN2"}, - {0x101E,"LM3S9BN5"}, - {0x101F,"LM3S9BN6"}, - {0x1070,"LM3S9C97"}, - {0x107A,"LM3S9CN5"}, - {0x10A9,"LM3S9D81"}, - {0x107E,"LM3S9D90"}, - {0x1092,"LM3S9D92"}, - {0x10C8,"LM3S9D95"}, - {0x109D,"LM3S9D96"}, - {0x107B,"LM3S9DN5"}, - {0x107C,"LM3S9DN6"}, - {0x1060,"LM3S9G97"}, - {0x1079,"LM3S9GN5"}, - {0x101B,"LM3S9L71"}, - {0x1018,"LM3S9L97"}, - {0x10A8,"LM3S9U81"}, - {0x107D,"LM3S9U90"}, - {0x1090,"LM3S9U92"}, - {0x10B7,"LM3S9U95"}, - {0x109B,"LM3S9U96"}, - {0,"Unknown part"} +} StellarisParts[] = { + {0x00, 0x01, "LM3S101"}, + {0x00, 0x02, "LM3S102"}, + {0x01, 0xBF, "LM3S1110"}, + {0x01, 0xC3, "LM3S1133"}, + {0x01, 0xC5, "LM3S1138"}, + {0x01, 0xC1, "LM3S1150"}, + {0x01, 0xC4, "LM3S1162"}, + {0x01, 0xC2, "LM3S1165"}, + {0x01, 0xEC, "LM3S1166"}, + {0x01, 0xC6, "LM3S1332"}, + {0x01, 0xBC, "LM3S1435"}, + {0x01, 0xBA, "LM3S1439"}, + {0x01, 0xBB, "LM3S1512"}, + {0x01, 0xC7, "LM3S1538"}, + {0x01, 0xDB, "LM3S1601"}, + {0x03, 0x06, "LM3S1607"}, + {0x01, 0xDA, "LM3S1608"}, + {0x01, 0xC0, "LM3S1620"}, + {0x04, 0xCD, "LM3S1621"}, + {0x03, 0x03, "LM3S1625"}, + {0x03, 0x04, "LM3S1626"}, + {0x03, 0x05, "LM3S1627"}, + {0x01, 0xB3, "LM3S1635"}, + {0x01, 0xEB, "LM3S1636"}, + {0x01, 0xBD, "LM3S1637"}, + {0x04, 0xB1, "LM3S1651"}, + {0x01, 0xB9, "LM3S1751"}, + {0x03, 0x10, "LM3S1776"}, + {0x04, 0x16, "LM3S1811"}, + {0x04, 0x3D, "LM3S1816"}, + {0x01, 0xB4, "LM3S1850"}, + {0x01, 0xDD, "LM3S1911"}, + {0x01, 0xDC, "LM3S1918"}, + {0x01, 0xB7, "LM3S1937"}, + {0x01, 0xBE, "LM3S1958"}, + {0x01, 0xB5, "LM3S1960"}, + {0x01, 0xB8, "LM3S1968"}, + {0x01, 0xEA, "LM3S1969"}, + {0x04, 0xCE, "LM3S1B21"}, + {0x06, 0xCA, "LM3S1C21"}, + {0x06, 0xCB, "LM3S1C26"}, + {0x06, 0x98, "LM3S1C58"}, + {0x06, 0xB0, "LM3S1D21"}, + {0x06, 0xCC, "LM3S1D26"}, + {0x06, 0x1D, "LM3S1F11"}, + {0x06, 0x1B, "LM3S1F16"}, + {0x06, 0xAF, "LM3S1G21"}, + {0x06, 0x95, "LM3S1G58"}, + {0x06, 0x1E, "LM3S1H11"}, + {0x06, 0x1C, "LM3S1H16"}, + {0x04, 0x0F, "LM3S1J11"}, + {0x04, 0x3C, "LM3S1J16"}, + {0x04, 0x0E, "LM3S1N11"}, + {0x04, 0x3B, "LM3S1N16"}, + {0x04, 0xB2, "LM3S1P51"}, + {0x04, 0x9E, "LM3S1R21"}, + {0x04, 0xC9, "LM3S1R26"}, + {0x04, 0x30, "LM3S1W16"}, + {0x04, 0x2F, "LM3S1Z16"}, + {0x01, 0x51, "LM3S2110"}, + {0x01, 0x84, "LM3S2139"}, + {0x03, 0x39, "LM3S2276"}, + {0x01, 0xA2, "LM3S2410"}, + {0x01, 0x59, "LM3S2412"}, + {0x01, 0x56, "LM3S2432"}, + {0x01, 0x5A, "LM3S2533"}, + {0x01, 0xE1, "LM3S2601"}, + {0x01, 0xE0, "LM3S2608"}, + {0x03, 0x33, "LM3S2616"}, + {0x01, 0x57, "LM3S2620"}, + {0x01, 0x85, "LM3S2637"}, + {0x01, 0x53, "LM3S2651"}, + {0x03, 0x80, "LM3S2671"}, + {0x03, 0x50, "LM3S2678"}, + {0x01, 0xA4, "LM3S2730"}, + {0x01, 0x52, "LM3S2739"}, + {0x03, 0x3A, "LM3S2776"}, + {0x04, 0x6D, "LM3S2793"}, + {0x01, 0xE3, "LM3S2911"}, + {0x01, 0xE2, "LM3S2918"}, + {0x01, 0xED, "LM3S2919"}, + {0x01, 0x54, "LM3S2939"}, + {0x01, 0x8F, "LM3S2948"}, + {0x01, 0x58, "LM3S2950"}, + {0x01, 0x55, "LM3S2965"}, + {0x04, 0x6C, "LM3S2B93"}, + {0x06, 0x94, "LM3S2D93"}, + {0x06, 0x93, "LM3S2U93"}, + {0x00, 0x19, "LM3S300"}, + {0x00, 0x11, "LM3S301"}, + {0x00, 0x1A, "LM3S308"}, + {0x00, 0x12, "LM3S310"}, + {0x00, 0x13, "LM3S315"}, + {0x00, 0x14, "LM3S316"}, + {0x00, 0x17, "LM3S317"}, + {0x00, 0x15, "LM3S328"}, + {0x03, 0x08, "LM3S3634"}, + {0x03, 0x43, "LM3S3651"}, + {0x04, 0xC8, "LM3S3654"}, + {0x03, 0x44, "LM3S3739"}, + {0x03, 0x49, "LM3S3748"}, + {0x03, 0x45, "LM3S3749"}, + {0x04, 0x42, "LM3S3826"}, + {0x04, 0x41, "LM3S3J26"}, + {0x04, 0x40, "LM3S3N26"}, + {0x04, 0x3F, "LM3S3W26"}, + {0x04, 0x3E, "LM3S3Z26"}, + {0x03, 0x81, "LM3S5632"}, + {0x04, 0x0C, "LM3S5651"}, + {0x03, 0x8A, "LM3S5652"}, + {0x04, 0x4D, "LM3S5656"}, + {0x03, 0x91, "LM3S5662"}, + {0x03, 0x96, "LM3S5732"}, + {0x03, 0x97, "LM3S5737"}, + {0x03, 0xA0, "LM3S5739"}, + {0x03, 0x99, "LM3S5747"}, + {0x03, 0xA7, "LM3S5749"}, + {0x03, 0x9A, "LM3S5752"}, + {0x03, 0x9C, "LM3S5762"}, + {0x04, 0x69, "LM3S5791"}, + {0x04, 0x0B, "LM3S5951"}, + {0x04, 0x4E, "LM3S5956"}, + {0x04, 0x68, "LM3S5B91"}, + {0x06, 0x2E, "LM3S5C31"}, + {0x06, 0x2C, "LM3S5C36"}, + {0x06, 0x5E, "LM3S5C51"}, + {0x06, 0x5B, "LM3S5C56"}, + {0x06, 0x5F, "LM3S5D51"}, + {0x06, 0x5C, "LM3S5D56"}, + {0x06, 0x87, "LM3S5D91"}, + {0x06, 0x2D, "LM3S5G31"}, + {0x06, 0x1F, "LM3S5G36"}, + {0x06, 0x5D, "LM3S5G51"}, + {0x06, 0x4F, "LM3S5G56"}, + {0x04, 0x09, "LM3S5K31"}, + {0x04, 0x4A, "LM3S5K36"}, + {0x04, 0x0A, "LM3S5P31"}, + {0x04, 0x48, "LM3S5P36"}, + {0x04, 0xB6, "LM3S5P3B"}, + {0x04, 0x0D, "LM3S5P51"}, + {0x04, 0x4C, "LM3S5P56"}, + {0x04, 0x07, "LM3S5R31"}, + {0x04, 0x4B, "LM3S5R36"}, + {0x04, 0x47, "LM3S5T36"}, + {0x06, 0x7F, "LM3S5U91"}, + {0x04, 0x46, "LM3S5Y36"}, + {0x00, 0x2A, "LM3S600"}, + {0x00, 0x21, "LM3S601"}, + {0x00, 0x2B, "LM3S608"}, + {0x00, 0x22, "LM3S610"}, + {0x01, 0xA1, "LM3S6100"}, + {0x00, 0x23, "LM3S611"}, + {0x01, 0x74, "LM3S6110"}, + {0x00, 0x24, "LM3S612"}, + {0x00, 0x25, "LM3S613"}, + {0x00, 0x26, "LM3S615"}, + {0x00, 0x28, "LM3S617"}, + {0x00, 0x29, "LM3S618"}, + {0x00, 0x27, "LM3S628"}, + {0x01, 0xA5, "LM3S6420"}, + {0x01, 0x82, "LM3S6422"}, + {0x01, 0x75, "LM3S6432"}, + {0x01, 0x76, "LM3S6537"}, + {0x01, 0x71, "LM3S6610"}, + {0x01, 0xE7, "LM3S6611"}, + {0x01, 0xE6, "LM3S6618"}, + {0x01, 0x83, "LM3S6633"}, + {0x01, 0x8B, "LM3S6637"}, + {0x01, 0xA3, "LM3S6730"}, + {0x01, 0x77, "LM3S6753"}, + {0x01, 0xE9, "LM3S6911"}, + {0x01, 0xE8, "LM3S6918"}, + {0x01, 0x89, "LM3S6938"}, + {0x01, 0x72, "LM3S6950"}, + {0x01, 0x78, "LM3S6952"}, + {0x01, 0x73, "LM3S6965"}, + {0x06, 0xAA, "LM3S6C11"}, + {0x06, 0xAC, "LM3S6C65"}, + {0x06, 0x9F, "LM3S6G11"}, + {0x06, 0xAB, "LM3S6G65"}, + {0x00, 0x38, "LM3S800"}, + {0x00, 0x31, "LM3S801"}, + {0x00, 0x39, "LM3S808"}, + {0x00, 0x32, "LM3S811"}, + {0x00, 0x33, "LM3S812"}, + {0x00, 0x34, "LM3S815"}, + {0x00, 0x36, "LM3S817"}, + {0x00, 0x37, "LM3S818"}, + {0x00, 0x35, "LM3S828"}, + {0x01, 0x64, "LM3S8530"}, + {0x01, 0x8E, "LM3S8538"}, + {0x01, 0x61, "LM3S8630"}, + {0x01, 0x63, "LM3S8730"}, + {0x01, 0x8D, "LM3S8733"}, + {0x01, 0x86, "LM3S8738"}, + {0x01, 0x65, "LM3S8930"}, + {0x01, 0x8C, "LM3S8933"}, + {0x01, 0x88, "LM3S8938"}, + {0x01, 0xA6, "LM3S8962"}, + {0x01, 0x62, "LM3S8970"}, + {0x01, 0xD7, "LM3S8971"}, + {0x06, 0xAE, "LM3S8C62"}, + {0x06, 0xAD, "LM3S8G62"}, + {0x04, 0xCF, "LM3S9781"}, + {0x04, 0x67, "LM3S9790"}, + {0x04, 0x6B, "LM3S9792"}, + {0x04, 0x2D, "LM3S9971"}, + {0x04, 0x20, "LM3S9997"}, + {0x04, 0xD0, "LM3S9B81"}, + {0x04, 0x66, "LM3S9B90"}, + {0x04, 0x6A, "LM3S9B92"}, + {0x04, 0x6E, "LM3S9B95"}, + {0x04, 0x6F, "LM3S9B96"}, + {0x04, 0x1D, "LM3S9BN2"}, + {0x04, 0x1E, "LM3S9BN5"}, + {0x04, 0x1F, "LM3S9BN6"}, + {0x06, 0x70, "LM3S9C97"}, + {0x06, 0xA9, "LM3S9D81"}, + {0x06, 0x7E, "LM3S9D90"}, + {0x06, 0x92, "LM3S9D92"}, + {0x06, 0x9D, "LM3S9D96"}, + {0x06, 0x7B, "LM3S9DN5"}, + {0x06, 0x7C, "LM3S9DN6"}, + {0x06, 0x60, "LM3S9G97"}, + {0x06, 0x79, "LM3S9GN5"}, + {0x04, 0x1B, "LM3S9L71"}, + {0x04, 0x18, "LM3S9L97"}, + {0x06, 0xA8, "LM3S9U81"}, + {0x06, 0x7D, "LM3S9U90"}, + {0x06, 0x90, "LM3S9U92"}, + {0x06, 0x9B, "LM3S9U96"}, + {0x05, 0x01, "LM4F120B2QR/TM4C1233C3PM"}, + {0x05, 0x02, "LM4F120C4QR/TM4C1233D5PM"}, + {0x05, 0x03, "LM4F120E5QR/TM4C1233E6PM"}, + {0x05, 0x04, "LM4F120H5QR/TM4C1233H6PM"}, + {0x05, 0x08, "LM4F121B2QR/TM4C1232C3PM"}, + {0x05, 0x09, "LM4F121C4QR/TM4C1232D5PM"}, + {0x05, 0x0A, "LM4F121E5QR/TM4C1232E6PM"}, + {0x05, 0x0B, "LM4F121H5QR/TM4C1232H6PM"}, + {0x05, 0x10, "LM4F110E5QR/TM4C1231E6PM"}, + {0x05, 0x11, "LM4F110H5QR/TM4C1231H6PM"}, + {0x05, 0x18, "LM4F110B2QR/TM4C1231C3PM"}, + {0x05, 0x19, "LM4F110C4QR/TM4C1231D5PM"}, + {0x05, 0x20, "LM4F111E5QR/TM4C1230E6PM"}, + {0x05, 0x21, "LM4F111H5QR/TM4C1230H6PM"}, + {0x05, 0x22, "LM4F111B2QR/TM4C1230C3PM"}, + {0x05, 0x23, "LM4F111C4QR/TM4C1230D5PM"}, + {0x05, 0x30, "LM4F112E5QC/TM4C1231E6PZ"}, + {0x05, 0x31, "LM4F112H5QC/TM4C1231H6PZ"}, + {0x05, 0x35, "LM4F112H5QD/TM4C1231H6PGE"}, + {0x05, 0x36, "LM4F112C4QC/TM4C1231D5PZ"}, + {0x05, 0x40, "LM4F130E5QR/TM4C1237E6PM"}, + {0x05, 0x41, "LM4F130H5QR/TM4C1237H6PM"}, + {0x05, 0x48, "LM4F130C4QR/TM4C1237D5PM"}, + {0x05, 0x50, "LM4F131E5QR/TM4C1236E6PM"}, + {0x05, 0x51, "LM4F131H5QR/TM4C1236H6PM"}, + {0x05, 0x52, "LM4F131C4QR/TM4C1236D5PM"}, + {0x05, 0x60, "LM4F132E5QC/TM4C1237E6PZ"}, + {0x05, 0x61, "LM4F132H5QC/TM4C1237H6PZ"}, + {0x05, 0x65, "LM4F132H5QD/TM4C1237H6PGE"}, + {0x05, 0x66, "LM4F132C4QC/TM4C1237D5PZ"}, + {0x05, 0x70, "LM4F210E5QR/TM4C123BE6PM"}, + {0x05, 0x73, "LM4F210H5QR/TM4C123BH6PM"}, + {0x05, 0x80, "LM4F211E5QR/TM4C123AE6PM"}, + {0x05, 0x83, "LM4F211H5QR/TM4C123AH6PM"}, + {0x05, 0xA0, "LM4F230E5QR/TM4C123GE6PM"}, + {0x05, 0xA1, "LM4F230H5QR/TM4C123GH6PM"}, + {0x05, 0xB0, "LM4F231E5QR/TM4C123FE6PM"}, + {0x05, 0xB1, "LM4F231H5QR/TM4C123FH6PM"}, + {0x05, 0xC0, "LM4F232E5QC/TM4C123GE6PZ"}, + {0x05, 0xC1, "LM4F232H5QC/TM4C123GH6PZ"}, + {0x05, 0xC3, "LM4F212E5QC/TM4C123BE6PZ"}, + {0x05, 0xC4, "LM4F212H5QC/TM4C123BH6PZ"}, + {0x05, 0xC5, "LM4F232H5QD/TM4C123GH6PGE"}, + {0x05, 0xC6, "LM4F212H5QD/TM4C123BH6PGE"}, + {0x05, 0xD0, "LM4F122C4QC/TM4C1233D5PZ"}, + {0x05, 0xD1, "LM4F122E5QC/TM4C1233E6PZ"}, + {0x05, 0xD2, "LM4F122H5QC/TM4C1233H6PZ"}, + {0x05, 0xD6, "LM4F122H5QD/TM4C1233H6PGE"}, + {0x05, 0xE1, "LM4FSXLH5BB"}, + {0x05, 0xE3, "LM4F232H5BB/TM4C123GH6ZRB"}, + {0x05, 0xE4, "LM4FS99H5BB"}, + {0x05, 0xE5, "LM4FS1AH5BB"}, + {0x05, 0xE9, "LM4F212H5BB/TM4C123BH6ZRB"}, + {0x05, 0xEA, "LM4FS1GH5BB"}, + {0x05, 0xF0, "TM4C123GH6ZXR"}, + {0x0A, 0x19, "TM4C1290NCPDT"}, + {0x0A, 0x1B, "TM4C1290NCZAD"}, + {0x0A, 0x1C, "TM4C1292NCPDT"}, + {0x0A, 0x1E, "TM4C1292NCZAD"}, + {0x0A, 0x1F, "TM4C1294NCPDT"}, + {0x0A, 0x21, "TM4C1294NCZAD"}, + {0x0A, 0x22, "TM4C1297NCZAD"}, + {0x0A, 0x23, "TM4C1299NCZAD"}, + {0x0A, 0x24, "TM4C129CNCPDT"}, + {0x0A, 0x26, "TM4C129CNCZAD"}, + {0x0A, 0x27, "TM4C129DNCPDT"}, + {0x0A, 0x29, "TM4C129DNCZAD"}, + {0x0A, 0x2D, "TM4C129ENCPDT"}, + {0x0A, 0x2F, "TM4C129ENCZAD"}, + {0x0A, 0x30, "TM4C129LNCZAD"}, + {0x0A, 0x32, "TM4C129XNCZAD"}, + {0x0A, 0x34, "TM4C1294KCPDT"}, + {0x0A, 0x35, "TM4C129EKCPDT"}, + {0x0A, 0x36, "TM4C1299KCZAD"}, + {0x0A, 0x37, "TM4C129XKCZAD"}, + {0xFF, 0x00, "Unknown Part"} }; -static char * StellarisClassname[7] = -{ +static const char * const StellarisClassname[] = { "Sandstorm", "Fury", "Unknown", "DustDevil", "Tempest", - "Blizzard", - "Firestorm" + "Blizzard/TM4C123x", + "Firestorm", + "", + "", + "", + "Snowflake", }; /*************************************************************************** @@ -392,10 +463,7 @@ FLASH_BANK_COMMAND_HANDLER(stellaris_flash_bank_command) struct stellaris_flash_bank *stellaris_info; if (CMD_ARGC < 6) - { - LOG_WARNING("incomplete flash_bank stellaris configuration"); - return ERROR_FLASH_BANK_INVALID; - } + return ERROR_COMMAND_SYNTAX_ERROR; stellaris_info = calloc(sizeof(struct stellaris_flash_bank), 1); bank->base = 0x0; @@ -415,7 +483,7 @@ FLASH_BANK_COMMAND_HANDLER(stellaris_flash_bank_command) static int get_stellaris_info(struct flash_bank *bank, char *buf, int buf_size) { - int printed, device_class; + int printed; struct stellaris_flash_bank *stellaris_info = bank->driver_priv; if (stellaris_info->did1 == 0) @@ -424,20 +492,12 @@ static int get_stellaris_info(struct flash_bank *bank, char *buf, int buf_size) /* Read main and master clock freqency register */ stellaris_read_clock_info(bank); - if (DID0_VER(stellaris_info->did0) > 0) - { - device_class = (stellaris_info->did0 >> 16) & 0xFF; - } - else - { - device_class = 0; - } printed = snprintf(buf, buf_size, "\nTI/LMI Stellaris information: Chip is " "class %i (%s) %s rev %c%i\n", - device_class, - StellarisClassname[device_class], + stellaris_info->target_class, + StellarisClassname[stellaris_info->target_class], stellaris_info->target_name, (int)('A' + ((stellaris_info->did0 >> 8) & 0xFF)), (int)((stellaris_info->did0) & 0xFF)); @@ -451,35 +511,23 @@ static int get_stellaris_info(struct flash_bank *bank, char *buf, int buf_size) stellaris_info->did1, stellaris_info->did1, "ARMv7M", - (int)((1 + ((stellaris_info->dc0 >> 16) & 0xFFFF))/4), - (int)((1 + (stellaris_info->dc0 & 0xFFFF))*2)); + stellaris_info->sramsiz, + stellaris_info->num_pages * stellaris_info->pagesize / 1024); buf += printed; buf_size -= printed; - printed = snprintf(buf, + snprintf(buf, buf_size, "master clock: %ikHz%s, " - "rcc is 0x%" PRIx32 ", rcc2 is 0x%" PRIx32 "\n", + "rcc is 0x%" PRIx32 ", rcc2 is 0x%" PRIx32 ", " + "pagesize: %" PRIu32 ", pages: %" PRIu32, (int)(stellaris_info->mck_freq / 1000), stellaris_info->mck_desc, stellaris_info->rcc, - stellaris_info->rcc2); - buf += printed; - buf_size -= printed; + stellaris_info->rcc2, + stellaris_info->pagesize, + stellaris_info->num_pages); - if (stellaris_info->num_lockbits > 0) - { - printed = snprintf(buf, - buf_size, - "pagesize: %" PRIi32 ", pages: %d, " - "lockbits: %i, pages per lockbit: %i\n", - stellaris_info->pagesize, - (unsigned) stellaris_info->num_pages, - stellaris_info->num_lockbits, - (unsigned) stellaris_info->pages_in_lockregion); - buf += printed; - buf_size -= printed; - } return ERROR_OK; } @@ -494,7 +542,11 @@ static void stellaris_set_flash_timing(struct flash_bank *bank) struct target *target = bank->target; uint32_t usecrl = (stellaris_info->mck_freq/1000000ul-1); - LOG_DEBUG("usecrl = %i",(int)(usecrl)); + /* only valid for Sandstorm and Fury class devices */ + if (stellaris_info->target_class > 1) + return; + + LOG_DEBUG("usecrl = %i", (int)(usecrl)); target_write_u32(target, SCB_BASE | USECRL, usecrl); } @@ -575,8 +627,7 @@ static void stellaris_read_clock_info(struct flash_bank *bank) stellaris_info->mck_desc = ""; - switch (oscsrc) - { + switch (oscsrc) { case 0: /* MOSC */ mainfreq = rcc_xtal[xtal]; break; @@ -631,23 +682,20 @@ static int stellaris_read_part_info(struct flash_bank *bank) LOG_DEBUG("did0 0x%" PRIx32 ", did1 0x%" PRIx32 ", dc0 0x%" PRIx32 ", dc1 0x%" PRIx32 "", did0, did1, stellaris_info->dc0, stellaris_info->dc1); - ver = did0 >> 28; - if ((ver != 0) && (ver != 1)) - { + ver = DID0_VER(did0); + if ((ver != 0) && (ver != 1)) { LOG_WARNING("Unknown did0 version, cannot identify target"); return ERROR_FLASH_OPERATION_FAILED; } - if (did1 == 0) - { + if (did1 == 0) { LOG_WARNING("Cannot identify target as a Stellaris"); return ERROR_FLASH_OPERATION_FAILED; } ver = did1 >> 28; fam = (did1 >> 24) & 0xF; - if (((ver != 0) && (ver != 1)) || (fam != 0)) - { + if (((ver != 0) && (ver != 1)) || (fam != 0)) { LOG_WARNING("Unknown did1 version/family."); return ERROR_FLASH_OPERATION_FAILED; } @@ -658,46 +706,56 @@ static int stellaris_read_part_info(struct flash_bank *bank) * always approximate. * * For Tempest: IOSC is calibrated, 16 MHz + * For Blizzard: IOSC is calibrated, 16 MHz + * For Firestorm: IOSC is calibrated, 16 MHz */ stellaris_info->iosc_freq = 12000000; stellaris_info->iosc_desc = " (±30%)"; stellaris_info->xtal_mask = 0x0f; - switch ((did0 >> 28) & 0x7) { - case 0: /* Sandstorm */ - /* - * Current (2009-August) parts seem to be rev C2 and use 12 MHz. - * Parts before rev C0 used 15 MHz; some C0 parts use 15 MHz - * (LM3S618), but some other C0 parts are 12 MHz (LM3S811). - */ - if (((did0 >> 8) & 0xff) < 2) { - stellaris_info->iosc_freq = 15000000; - stellaris_info->iosc_desc = " (±50%)"; - } - break; - case 1: - switch ((did0 >> 16) & 0xff) { + /* get device class */ + if (DID0_VER(did0) > 0) { + stellaris_info->target_class = (did0 >> 16) & 0xFF; + } else { + /* Sandstorm class */ + stellaris_info->target_class = 0; + } + + switch (stellaris_info->target_class) { + case 0: /* Sandstorm */ + /* + * Current (2009-August) parts seem to be rev C2 and use 12 MHz. + * Parts before rev C0 used 15 MHz; some C0 parts use 15 MHz + * (LM3S618), but some other C0 parts are 12 MHz (LM3S811). + */ + if (((did0 >> 8) & 0xff) < 2) { + stellaris_info->iosc_freq = 15000000; + stellaris_info->iosc_desc = " (±50%)"; + } + break; + case 1: /* Fury */ break; + case 4: /* Tempest */ + case 5: /* Blizzard */ + case 6: /* Firestorm */ + case 0xa: /* Snowflake */ stellaris_info->iosc_freq = 16000000; /* +/- 1% */ stellaris_info->iosc_desc = " (±1%)"; /* FALL THROUGH */ + case 3: /* DustDevil */ stellaris_info->xtal_mask = 0x1f; break; + default: LOG_WARNING("Unknown did0 class"); - } - break; - default: - LOG_WARNING("Unknown did0 version"); - break; } - for (i = 0; StellarisParts[i].partno; i++) - { - if (StellarisParts[i].partno == ((did1 >> 16) & 0xFFFF)) + for (i = 0; StellarisParts[i].partno; i++) { + if ((StellarisParts[i].partno == ((did1 >> 16) & 0xFF)) && + (StellarisParts[i].class == stellaris_info->target_class)) break; } @@ -706,10 +764,26 @@ static int stellaris_read_part_info(struct flash_bank *bank) stellaris_info->did0 = did0; stellaris_info->did1 = did1; - stellaris_info->num_lockbits = 1 + (stellaris_info->dc0 & 0xFFFF); - stellaris_info->num_pages = 2 *(1 + (stellaris_info->dc0 & 0xFFFF)); - stellaris_info->pagesize = 1024; - stellaris_info->pages_in_lockregion = 2; + if (stellaris_info->target_class == 5) { /* Blizzard */ + target_read_u32(target, FLASH_FSIZE, &stellaris_info->fsize); + target_read_u32(target, FLASH_SSIZE, &stellaris_info->ssize); + + stellaris_info->num_pages = 2 * (1 + (stellaris_info->fsize & 0xFFFF)); + stellaris_info->sramsiz = (1 + (stellaris_info->ssize & 0xFFFF)) / 4; + stellaris_info->pagesize = 1024; + } else if (stellaris_info->target_class == 0xa) { /* Snowflake */ + target_read_u32(target, FLASH_FSIZE, &stellaris_info->fsize); + target_read_u32(target, FLASH_SSIZE, &stellaris_info->ssize); + + stellaris_info->pagesize = (1 << ((stellaris_info->fsize >> 16) & 7)) * 1024; + stellaris_info->num_pages = 2048 * (1 + (stellaris_info->fsize & 0xFFFF)) / + stellaris_info->pagesize; + stellaris_info->sramsiz = (1 + (stellaris_info->ssize & 0xFFFF)) / 4; + } else { + stellaris_info->num_pages = 2 * (1 + (stellaris_info->dc0 & 0xFFFF)); + stellaris_info->sramsiz = (1 + ((stellaris_info->dc0 >> 16) & 0xFFFF)) / 4; + stellaris_info->pagesize = 1024; + } /* REVISIT for at least Tempest parts, read NVMSTAT.FWB too. * That exposes a 32-word Flash Write Buffer ... enabling @@ -726,9 +800,12 @@ static int stellaris_read_part_info(struct flash_bank *bank) static int stellaris_protect_check(struct flash_bank *bank) { struct stellaris_flash_bank *stellaris = bank->driver_priv; + struct target *target = bank->target; + uint32_t flash_sizek = stellaris->pagesize / 1024 * + stellaris->num_pages; + uint32_t fmppe_addr; int status = ERROR_OK; unsigned i; - unsigned page; if (stellaris->did1 == 0) return ERROR_FLASH_BANK_NOT_PROBED; @@ -740,32 +817,32 @@ static int stellaris_protect_check(struct flash_bank *bank) * to report any pages that we can't write. Ignore the Read Enable * register (FMPRE). */ - for (i = 0, page = 0; - i < DIV_ROUND_UP(stellaris->num_lockbits, 32u); - i++) { - uint32_t lockbits; - - status = target_read_u32(bank->target, - SCB_BASE + (i ? (FMPPE0 + 4 * i) : FMPPE), - &lockbits); - LOG_DEBUG("FMPPE%d = %#8.8x (status %d)", i, - (unsigned) lockbits, status); - if (status != ERROR_OK) - goto done; - for (unsigned j = 0; j < 32; j++) { - unsigned k; - - for (k = 0; k < stellaris->pages_in_lockregion; k++) { - if (page >= (unsigned) bank->num_sectors) - goto done; - bank->sectors[page++].is_protected = - !(lockbits & (1 << j)); + if (stellaris->target_class >= 0x0a || flash_sizek > 64) + fmppe_addr = SCB_BASE | FMPPE0; + else + fmppe_addr = SCB_BASE | FMPPE; + + unsigned int page = 0, lockbitnum, lockbitcnt = flash_sizek / 2; + unsigned int bits_per_page = stellaris->pagesize / 2048; + /* Every lock bit always corresponds to a 2k region */ + for (lockbitnum = 0; lockbitnum < lockbitcnt; lockbitnum += 32) { + uint32_t fmppe; + + target_read_u32(target, fmppe_addr, &fmppe); + for (i = 0; i < 32 && lockbitnum + i < lockbitcnt; i++) { + bool protect = !(fmppe & (1 << i)); + if (bits_per_page) { + bank->sectors[page++].is_protected = protect; + i += bits_per_page - 1; + } else { /* 1024k pages, every lockbit covers 2 pages */ + bank->sectors[page++].is_protected = protect; + bank->sectors[page++].is_protected = protect; } } + fmppe_addr += 4; } -done: return status; } @@ -776,8 +853,7 @@ static int stellaris_erase(struct flash_bank *bank, int first, int last) struct stellaris_flash_bank *stellaris_info = bank->driver_priv; struct target *target = bank->target; - if (bank->target->state != TARGET_HALTED) - { + if (bank->target->state != TARGET_HALTED) { LOG_ERROR("Target not halted"); return ERROR_TARGET_NOT_HALTED; } @@ -786,14 +862,10 @@ static int stellaris_erase(struct flash_bank *bank, int first, int last) return ERROR_FLASH_BANK_NOT_PROBED; if ((first < 0) || (last < first) || (last >= (int)stellaris_info->num_pages)) - { return ERROR_FLASH_SECTOR_INVALID; - } if ((first == 0) && (last == ((int)stellaris_info->num_pages-1))) - { return stellaris_mass_erase(bank); - } /* Refresh flash controller timing */ stellaris_read_clock_info(bank); @@ -807,24 +879,21 @@ static int stellaris_erase(struct flash_bank *bank, int first, int last) * it might want to process those IRQs. */ - for (banknr = first; banknr <= last; banknr++) - { + for (banknr = first; banknr <= last; banknr++) { /* Address is first word in page */ target_write_u32(target, FLASH_FMA, banknr * stellaris_info->pagesize); /* Write erase command */ target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_ERASE); /* Wait until erase complete */ - do - { + do { target_read_u32(target, FLASH_FMC, &flash_fmc); - } - while (flash_fmc & FMC_ERASE); + } while (flash_fmc & FMC_ERASE); /* Check acess violations */ target_read_u32(target, FLASH_CRIS, &flash_cris); - if (flash_cris & (AMASK)) - { - LOG_WARNING("Error erasing flash page %i, flash_cris 0x%" PRIx32 "", banknr, flash_cris); + if (flash_cris & (AMASK)) { + LOG_WARNING("Error erasing flash page %i, flash_cris 0x%" PRIx32 "", + banknr, flash_cris); target_write_u32(target, FLASH_CRIS, 0); return ERROR_FLASH_OPERATION_FAILED; } @@ -837,34 +906,34 @@ static int stellaris_erase(struct flash_bank *bank, int first, int last) static int stellaris_protect(struct flash_bank *bank, int set, int first, int last) { - uint32_t fmppe, flash_fmc, flash_cris; - int lockregion; - - struct stellaris_flash_bank *stellaris_info = bank->driver_priv; + struct stellaris_flash_bank *stellaris = bank->driver_priv; struct target *target = bank->target; + uint32_t flash_fmc, flash_cris; + unsigned int bits_per_page = stellaris->pagesize / 2048; - if (bank->target->state != TARGET_HALTED) - { + if (target->state != TARGET_HALTED) { LOG_ERROR("Target not halted"); return ERROR_TARGET_NOT_HALTED; } - if (!set) - { + if (!set) { LOG_ERROR("Hardware doesn't support page-level unprotect. " "Try the 'recover' command."); - return ERROR_INVALID_ARGUMENTS; + return ERROR_COMMAND_SYNTAX_ERROR; } - if (stellaris_info->did1 == 0) + if (stellaris->did1 == 0) return ERROR_FLASH_BANK_NOT_PROBED; - /* lockregions are 2 pages ... must protect [even..odd] */ - if ((first < 0) || (first & 1) - || (last < first) || !(last & 1) - || (last >= 2 * stellaris_info->num_lockbits)) - { - LOG_ERROR("Can't protect unaligned or out-of-range pages."); + if (stellaris->target_class == 0x03 && + !((stellaris->did0 >> 8) & 0xFF) && + !((stellaris->did0) & 0xFF)) { + LOG_ERROR("DustDevil A0 parts can't be unprotected, see errata; refusing to proceed"); + return ERROR_FLASH_OPERATION_FAILED; + } + + if (!bits_per_page && (first % 2 || !(last % 2))) { + LOG_ERROR("Can't protect unaligned pages"); return ERROR_FLASH_SECTOR_INVALID; } @@ -872,60 +941,60 @@ static int stellaris_protect(struct flash_bank *bank, int set, int first, int la stellaris_read_clock_info(bank); stellaris_set_flash_timing(bank); - /* convert from pages to lockregions */ - first /= 2; - last /= 2; - - /* FIXME this assumes single FMPPE, for a max of 64K of flash!! - * Current parts can be much bigger. - */ - if (last >= 32) { - LOG_ERROR("No support yet for protection > 64K"); - return ERROR_FLASH_OPERATION_FAILED; - } - - target_read_u32(target, SCB_BASE | FMPPE, &fmppe); - - for (lockregion = first; lockregion <= last; lockregion++) - fmppe &= ~(1 << lockregion); - /* Clear and disable flash programming interrupts */ target_write_u32(target, FLASH_CIM, 0); target_write_u32(target, FLASH_MISC, PMISC | AMISC); - /* REVISIT this clobbers state set by any halted firmware ... - * it might want to process those IRQs. - */ + uint32_t flash_sizek = stellaris->pagesize / 1024 * + stellaris->num_pages; + uint32_t fmppe_addr; - LOG_DEBUG("fmppe 0x%" PRIx32 "",fmppe); - target_write_u32(target, SCB_BASE | FMPPE, fmppe); + if (stellaris->target_class >= 0x0a || flash_sizek > 64) + fmppe_addr = SCB_BASE | FMPPE0; + else + fmppe_addr = SCB_BASE | FMPPE; + + int page = 0; + unsigned int lockbitnum, lockbitcnt = flash_sizek / 2; + /* Every lock bit always corresponds to a 2k region */ + for (lockbitnum = 0; lockbitnum < lockbitcnt; lockbitnum += 32) { + uint32_t fmppe; + + target_read_u32(target, fmppe_addr, &fmppe); + for (unsigned int i = 0; + i < 32 && lockbitnum + i < lockbitcnt; + i++) { + if (page >= first && page <= last) + fmppe &= ~(1 << i); + + if (bits_per_page) { + if (!((i + 1) % bits_per_page)) + page++; + } else { /* 1024k pages, every lockbit covers 2 pages */ + page += 2; + } + } + target_write_u32(target, fmppe_addr, fmppe); - /* Commit FMPPE */ - target_write_u32(target, FLASH_FMA, 1); + /* Commit FMPPE* */ + target_write_u32(target, FLASH_FMA, 1 + lockbitnum / 16); + /* Write commit command */ + target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_COMT); - /* Write commit command */ - /* REVISIT safety check, since this cannot be undone - * except by the "Recover a locked device" procedure. - * REVISIT DustDevil-A0 parts have an erratum making FMPPE commits - * inadvisable ... it makes future mass erase operations fail. - */ - LOG_WARNING("Flash protection cannot be removed once committed, commit is NOT executed !"); - /* target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_COMT); */ + /* Wait until commit complete */ + do { + target_read_u32(target, FLASH_FMC, &flash_fmc); + } while (flash_fmc & FMC_COMT); - /* Wait until erase complete */ - do - { - target_read_u32(target, FLASH_FMC, &flash_fmc); - } - while (flash_fmc & FMC_COMT); + /* Check access violations */ + target_read_u32(target, FLASH_CRIS, &flash_cris); + if (flash_cris & (AMASK)) { + LOG_WARNING("Error setting flash page protection, flash_cris 0x%" PRIx32 "", flash_cris); + target_write_u32(target, FLASH_CRIS, 0); + return ERROR_FLASH_OPERATION_FAILED; + } - /* Check acess violations */ - target_read_u32(target, FLASH_CRIS, &flash_cris); - if (flash_cris & (AMASK)) - { - LOG_WARNING("Error setting flash page protection, flash_cris 0x%" PRIx32 "", flash_cris); - target_write_u32(target, FLASH_CRIS, 0); - return ERROR_FLASH_OPERATION_FAILED; + fmppe_addr += 4; } return ERROR_OK; @@ -933,54 +1002,51 @@ static int stellaris_protect(struct flash_bank *bank, int set, int first, int la /* see contib/loaders/flash/stellaris.s for src */ -static const uint8_t stellaris_write_code[] = -{ -/* - Call with : - r0 = buffer address - r1 = destination address - r2 = bytecount (in) - endaddr (work) - - Used registers: - r3 = pFLASH_CTRL_BASE - r4 = FLASHWRITECMD - r5 = #1 - r6 = bytes written - r7 = temp reg -*/ - 0x07,0x4B, /* ldr r3,pFLASH_CTRL_BASE */ - 0x08,0x4C, /* ldr r4,FLASHWRITECMD */ - 0x01,0x25, /* movs r5, 1 */ - 0x00,0x26, /* movs r6, #0 */ -/* mainloop: */ - 0x19,0x60, /* str r1, [r3, #0] */ - 0x87,0x59, /* ldr r7, [r0, r6] */ - 0x5F,0x60, /* str r7, [r3, #4] */ - 0x9C,0x60, /* str r4, [r3, #8] */ -/* waitloop: */ - 0x9F,0x68, /* ldr r7, [r3, #8] */ - 0x2F,0x42, /* tst r7, r5 */ - 0xFC,0xD1, /* bne waitloop */ - 0x04,0x31, /* adds r1, r1, #4 */ - 0x04,0x36, /* adds r6, r6, #4 */ - 0x96,0x42, /* cmp r6, r2 */ - 0xF4,0xD1, /* bne mainloop */ - 0x00,0xBE, /* bkpt #0 */ -/* pFLASH_CTRL_BASE: */ - 0x00,0xD0,0x0F,0x40, /* .word 0x400FD000 */ -/* FLASHWRITECMD: */ - 0x01,0x00,0x42,0xA4 /* .word 0xA4420001 */ +static const uint8_t stellaris_write_code[] = { + /* write: */ + 0xDF, 0xF8, 0x40, 0x40, /* ldr r4, pFLASH_CTRL_BASE */ + 0xDF, 0xF8, 0x40, 0x50, /* ldr r5, FLASHWRITECMD */ + /* wait_fifo: */ + 0xD0, 0xF8, 0x00, 0x80, /* ldr r8, [r0, #0] */ + 0xB8, 0xF1, 0x00, 0x0F, /* cmp r8, #0 */ + 0x17, 0xD0, /* beq exit */ + 0x47, 0x68, /* ldr r7, [r0, #4] */ + 0x47, 0x45, /* cmp r7, r8 */ + 0xF7, 0xD0, /* beq wait_fifo */ + /* mainloop: */ + 0x22, 0x60, /* str r2, [r4, #0] */ + 0x02, 0xF1, 0x04, 0x02, /* add r2, r2, #4 */ + 0x57, 0xF8, 0x04, 0x8B, /* ldr r8, [r7], #4 */ + 0xC4, 0xF8, 0x04, 0x80, /* str r8, [r4, #4] */ + 0xA5, 0x60, /* str r5, [r4, #8] */ + /* busy: */ + 0xD4, 0xF8, 0x08, 0x80, /* ldr r8, [r4, #8] */ + 0x18, 0xF0, 0x01, 0x0F, /* tst r8, #1 */ + 0xFA, 0xD1, /* bne busy */ + 0x8F, 0x42, /* cmp r7, r1 */ + 0x28, 0xBF, /* it cs */ + 0x00, 0xF1, 0x08, 0x07, /* addcs r7, r0, #8 */ + 0x47, 0x60, /* str r7, [r0, #4] */ + 0x01, 0x3B, /* subs r3, r3, #1 */ + 0x03, 0xB1, /* cbz r3, exit */ + 0xE2, 0xE7, /* b wait_fifo */ + /* exit: */ + 0x00, 0xBE, /* bkpt #0 */ + + /* pFLASH_CTRL_BASE: */ + 0x00, 0xD0, 0x0F, 0x40, /* .word 0x400FD000 */ + /* FLASHWRITECMD: */ + 0x01, 0x00, 0x42, 0xA4 /* .word 0xA4420001 */ }; - static int stellaris_write_block(struct flash_bank *bank, - uint8_t *buffer, uint32_t offset, uint32_t wcount) + const uint8_t *buffer, uint32_t offset, uint32_t wcount) { struct target *target = bank->target; uint32_t buffer_size = 16384; struct working_area *source; struct working_area *write_algorithm; uint32_t address = bank->base + offset; - struct reg_param reg_params[3]; + struct reg_param reg_params[4]; struct armv7m_algorithm armv7m_info; int retval = ERROR_OK; @@ -995,8 +1061,8 @@ static int stellaris_write_block(struct flash_bank *bank, bank, buffer, offset, wcount); /* flash write code */ - if (target_alloc_working_area(target, sizeof(stellaris_write_code), &write_algorithm) != ERROR_OK) - { + if (target_alloc_working_area(target, sizeof(stellaris_write_code), + &write_algorithm) != ERROR_OK) { LOG_DEBUG("no working area for block memory writes"); return ERROR_TARGET_RESOURCE_NOT_AVAILABLE; }; @@ -1006,11 +1072,9 @@ static int stellaris_write_block(struct flash_bank *bank, buffer_size = wcount * 4; /* memory buffer */ - while (target_alloc_working_area_try(target, buffer_size, &source) != ERROR_OK) - { + while (target_alloc_working_area_try(target, buffer_size, &source) != ERROR_OK) { buffer_size /= 2; - if (buffer_size <= buf_min) - { + if (buffer_size <= buf_min) { target_free_working_area(target, write_algorithm); return ERROR_TARGET_RESOURCE_NOT_AVAILABLE; } @@ -1018,51 +1082,32 @@ static int stellaris_write_block(struct flash_bank *bank, target_name(target), (unsigned) buffer_size); }; - retval = target_write_buffer(target, write_algorithm->address, + target_write_buffer(target, write_algorithm->address, sizeof(stellaris_write_code), - (uint8_t *) stellaris_write_code); + stellaris_write_code); armv7m_info.common_magic = ARMV7M_COMMON_MAGIC; - armv7m_info.core_mode = ARMV7M_MODE_ANY; + armv7m_info.core_mode = ARM_MODE_THREAD; init_reg_param(®_params[0], "r0", 32, PARAM_OUT); init_reg_param(®_params[1], "r1", 32, PARAM_OUT); init_reg_param(®_params[2], "r2", 32, PARAM_OUT); + init_reg_param(®_params[3], "r3", 32, PARAM_OUT); - while (wcount > 0) - { - uint32_t thisrun_count = (wcount > (buffer_size / 4)) ? (buffer_size / 4) : wcount; - - target_write_buffer(target, source->address, thisrun_count * 4, buffer); - - buf_set_u32(reg_params[0].value, 0, 32, source->address); - buf_set_u32(reg_params[1].value, 0, 32, address); - buf_set_u32(reg_params[2].value, 0, 32, 4*thisrun_count); - LOG_DEBUG("Algorithm flash write %u words to 0x%" PRIx32 - ", %u remaining", - (unsigned) thisrun_count, address, - (unsigned) (wcount - thisrun_count)); - retval = target_run_algorithm(target, 0, NULL, 3, reg_params, - write_algorithm->address, - 0, - 10000, &armv7m_info); - if (retval != ERROR_OK) - { - LOG_ERROR("error %d executing stellaris " - "flash write algorithm", - retval); - retval = ERROR_FLASH_OPERATION_FAILED; - break; - } + buf_set_u32(reg_params[0].value, 0, 32, source->address); + buf_set_u32(reg_params[1].value, 0, 32, source->address + source->size); + buf_set_u32(reg_params[2].value, 0, 32, address); + buf_set_u32(reg_params[3].value, 0, 32, wcount); - buffer += thisrun_count * 4; - address += thisrun_count * 4; - wcount -= thisrun_count; - } + retval = target_run_flash_async_algorithm(target, buffer, wcount, 4, + 0, NULL, + 4, reg_params, + source->address, source->size, + write_algorithm->address, 0, + &armv7m_info); - /* REVISIT we could speed up writing multi-section images by - * not freeing the initialized write_algorithm this way. - */ + if (retval == ERROR_FLASH_OPERATION_FAILED) + LOG_ERROR("error %d executing stellaris flash write algorithm", retval); target_free_working_area(target, write_algorithm); target_free_working_area(target, source); @@ -1070,11 +1115,13 @@ static int stellaris_write_block(struct flash_bank *bank, destroy_reg_param(®_params[0]); destroy_reg_param(®_params[1]); destroy_reg_param(®_params[2]); + destroy_reg_param(®_params[3]); return retval; } -static int stellaris_write(struct flash_bank *bank, uint8_t *buffer, uint32_t offset, uint32_t count) +static int stellaris_write(struct flash_bank *bank, const uint8_t *buffer, + uint32_t offset, uint32_t count) { struct stellaris_flash_bank *stellaris_info = bank->driver_priv; struct target *target = bank->target; @@ -1085,8 +1132,7 @@ static int stellaris_write(struct flash_bank *bank, uint8_t *buffer, uint32_t of uint32_t bytes_written = 0; int retval; - if (bank->target->state != TARGET_HALTED) - { + if (bank->target->state != TARGET_HALTED) { LOG_ERROR("Target not halted"); return ERROR_TARGET_NOT_HALTED; } @@ -1097,8 +1143,7 @@ static int stellaris_write(struct flash_bank *bank, uint8_t *buffer, uint32_t of if (stellaris_info->did1 == 0) return ERROR_FLASH_BANK_NOT_PROBED; - if (offset & 0x3) - { + if (offset & 0x3) { LOG_WARNING("offset size must be word aligned"); return ERROR_FLASH_DST_BREAKS_ALIGNMENT; } @@ -1119,36 +1164,28 @@ static int stellaris_write(struct flash_bank *bank, uint8_t *buffer, uint32_t of */ /* multiple words to be programmed? */ - if (words_remaining > 0) - { + if (words_remaining > 0) { /* try using a block write */ retval = stellaris_write_block(bank, buffer, offset, words_remaining); - if (retval != ERROR_OK) - { - if (retval == ERROR_TARGET_RESOURCE_NOT_AVAILABLE) - { + if (retval != ERROR_OK) { + if (retval == ERROR_TARGET_RESOURCE_NOT_AVAILABLE) { LOG_DEBUG("writing flash word-at-a-time"); - } - else if (retval == ERROR_FLASH_OPERATION_FAILED) - { + } else if (retval == ERROR_FLASH_OPERATION_FAILED) { /* if an error occured, we examine the reason, and quit */ target_read_u32(target, FLASH_CRIS, &flash_cris); LOG_ERROR("flash writing failed with CRIS: 0x%" PRIx32 "", flash_cris); return ERROR_FLASH_OPERATION_FAILED; } - } - else - { + } else { buffer += words_remaining * 4; address += words_remaining * 4; words_remaining = 0; } } - while (words_remaining > 0) - { + while (words_remaining > 0) { if (!(address & 0xff)) LOG_DEBUG("0x%" PRIx32 "", address); @@ -1158,8 +1195,7 @@ static int stellaris_write(struct flash_bank *bank, uint8_t *buffer, uint32_t of target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_WRITE); /* LOG_DEBUG("0x%x 0x%x 0x%x",address,buf_get_u32(buffer, 0, 32),FMC_WRKEY | FMC_WRITE); */ /* Wait until write complete */ - do - { + do { target_read_u32(target, FLASH_FMC, &flash_fmc); } while (flash_fmc & FMC_WRITE); @@ -1168,17 +1204,11 @@ static int stellaris_write(struct flash_bank *bank, uint8_t *buffer, uint32_t of words_remaining--; } - if (bytes_remaining) - { + if (bytes_remaining) { uint8_t last_word[4] = {0xff, 0xff, 0xff, 0xff}; - int i = 0; - while (bytes_remaining > 0) - { - last_word[i++] = *(buffer + bytes_written); - bytes_remaining--; - bytes_written++; - } + /* copy the last remaining bytes into the write buffer */ + memcpy(last_word, buffer+bytes_written, bytes_remaining); if (!(address & 0xff)) LOG_DEBUG("0x%" PRIx32 "", address); @@ -1189,16 +1219,14 @@ static int stellaris_write(struct flash_bank *bank, uint8_t *buffer, uint32_t of target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_WRITE); /* LOG_DEBUG("0x%x 0x%x 0x%x",address,buf_get_u32(buffer, 0, 32),FMC_WRKEY | FMC_WRITE); */ /* Wait until write complete */ - do - { + do { target_read_u32(target, FLASH_FMC, &flash_fmc); } while (flash_fmc & FMC_WRITE); } /* Check access violations */ target_read_u32(target, FLASH_CRIS, &flash_cris); - if (flash_cris & (AMASK)) - { + if (flash_cris & (AMASK)) { LOG_DEBUG("flash_cris 0x%" PRIx32 "", flash_cris); return ERROR_FLASH_OPERATION_FAILED; } @@ -1224,18 +1252,16 @@ static int stellaris_probe(struct flash_bank *bank) if (retval != ERROR_OK) return retval; - if (bank->sectors) - { + if (bank->sectors) { free(bank->sectors); bank->sectors = NULL; } /* provide this for the benefit of the NOR flash framework */ - bank->size = 1024 * stellaris_info->num_pages; + bank->size = stellaris_info->num_pages * stellaris_info->pagesize; bank->num_sectors = stellaris_info->num_pages; bank->sectors = calloc(bank->num_sectors, sizeof(struct flash_sector)); - for (int i = 0; i < bank->num_sectors; i++) - { + for (int i = 0; i < bank->num_sectors; i++) { bank->sectors[i].offset = i * stellaris_info->pagesize; bank->sectors[i].size = stellaris_info->pagesize; bank->sectors[i].is_erased = -1; @@ -1254,8 +1280,7 @@ static int stellaris_mass_erase(struct flash_bank *bank) stellaris_info = bank->driver_priv; target = bank->target; - if (target->state != TARGET_HALTED) - { + if (target->state != TARGET_HALTED) { LOG_ERROR("Target not halted"); return ERROR_TARGET_NOT_HALTED; } @@ -1278,24 +1303,19 @@ static int stellaris_mass_erase(struct flash_bank *bank) target_write_u32(target, FLASH_FMA, 0); target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_MERASE); /* Wait until erase complete */ - do - { + do { target_read_u32(target, FLASH_FMC, &flash_fmc); - } - while (flash_fmc & FMC_MERASE); + } while (flash_fmc & FMC_MERASE); /* if device has > 128k, then second erase cycle is needed * this is only valid for older devices, but will not hurt */ - if (stellaris_info->num_pages * stellaris_info->pagesize > 0x20000) - { + if (stellaris_info->num_pages * stellaris_info->pagesize > 0x20000) { target_write_u32(target, FLASH_FMA, 0x20000); target_write_u32(target, FLASH_FMC, FMC_WRKEY | FMC_MERASE); /* Wait until erase complete */ - do - { + do { target_read_u32(target, FLASH_FMC, &flash_fmc); - } - while (flash_fmc & FMC_MERASE); + } while (flash_fmc & FMC_MERASE); } return ERROR_OK; @@ -1306,30 +1326,21 @@ COMMAND_HANDLER(stellaris_handle_mass_erase_command) int i; if (CMD_ARGC < 1) - { - command_print(CMD_CTX, "stellaris mass_erase "); - return ERROR_OK; - } + return ERROR_COMMAND_SYNTAX_ERROR; struct flash_bank *bank; int retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank); if (ERROR_OK != retval) return retval; - if (stellaris_mass_erase(bank) == ERROR_OK) - { + if (stellaris_mass_erase(bank) == ERROR_OK) { /* set all sectors as erased */ for (i = 0; i < bank->num_sectors; i++) - { bank->sectors[i].is_erased = 1; - } command_print(CMD_CTX, "stellaris mass erase complete"); - } - else - { + } else command_print(CMD_CTX, "stellaris mass erase failed"); - } return ERROR_OK; } @@ -1348,9 +1359,12 @@ COMMAND_HANDLER(stellaris_handle_recover_command) struct flash_bank *bank; int retval; - retval = CALL_COMMAND_HANDLER(flash_command_get_bank, 0, &bank); - if (retval != ERROR_OK) - return retval; + if (CMD_ARGC != 0) + return ERROR_COMMAND_SYNTAX_ERROR; + + bank = get_flash_bank_by_num_noprobe(0); + if (!bank) + return ERROR_FAIL; /* REVISIT ... it may be worth sanity checking that the AP is * inactive before we start. ARM documents that switching a DP's @@ -1358,12 +1372,18 @@ COMMAND_HANDLER(stellaris_handle_recover_command) * cycle to recover. */ + Jim_Eval_Named(CMD_CTX->interp, "catch { hla_command \"debug unlock\" }", 0, 0); + if (!strcmp(Jim_GetString(Jim_GetResult(CMD_CTX->interp), NULL), "0")) { + retval = ERROR_OK; + goto user_action; + } + /* assert SRST */ if (!(jtag_get_reset_config() & RESET_HAS_SRST)) { LOG_ERROR("Can't recover Stellaris flash without SRST"); return ERROR_FAIL; } - jtag_add_reset(0, 1); + adapter_assert_reset(); for (int i = 0; i < 5; i++) { retval = dap_to_swd(bank->target); @@ -1376,12 +1396,13 @@ COMMAND_HANDLER(stellaris_handle_recover_command) } /* de-assert SRST */ - jtag_add_reset(0, 0); + adapter_deassert_reset(); retval = jtag_execute_queue(); /* wait 400+ msec ... OK, "1+ second" is simpler */ usleep(1000); +user_action: /* USER INTERVENTION required for the power cycle * Restarting OpenOCD is likely needed because of mode switching. */ @@ -1395,16 +1416,16 @@ done: static const struct command_registration stellaris_exec_command_handlers[] = { { .name = "mass_erase", + .usage = "", .handler = stellaris_handle_mass_erase_command, .mode = COMMAND_EXEC, - .usage = "bank_id", .help = "erase entire device", }, { .name = "recover", .handler = stellaris_handle_recover_command, .mode = COMMAND_EXEC, - .usage = "bank_id", + .usage = "", .help = "recover (and erase) locked device", }, COMMAND_REGISTRATION_DONE @@ -1414,6 +1435,7 @@ static const struct command_registration stellaris_command_handlers[] = { .name = "stellaris", .mode = COMMAND_EXEC, .help = "Stellaris flash command group", + .usage = "", .chain = stellaris_exec_command_handlers, }, COMMAND_REGISTRATION_DONE @@ -1429,7 +1451,7 @@ struct flash_driver stellaris_flash = { .read = default_flash_read, .probe = stellaris_probe, .auto_probe = stellaris_probe, - .erase_check = default_flash_mem_blank_check, + .erase_check = default_flash_blank_check, .protect_check = stellaris_protect_check, .info = get_stellaris_info, };