ichspi.c 16.7 KB
Newer Older
1 2 3 4 5 6
/*
 * This file is part of the flashrom project.
 *
 * Copyright (C) 2008 Stefan Wildemann <stefan.wildemann@kontron.com>
 * Copyright (C) 2008 Claus Gindhart <claus.gindhart@kontron.com>
 * Copyright (C) 2008 Dominik Geyer <dominik.geyer@kontron.com>
Stefan Reinauer's avatar
Stefan Reinauer committed
7
 * Copyright (C) 2008 coresystems GmbH <info@coresystems.de>
8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43
 *
 * 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 2 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, write to the Free Software
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 *
 */

/*
 * This module is designed for supporting the devices
 * ST M25P40
 * ST M25P80
 * ST M25P16
 * ST M25P32 already tested
 * ST M25P64
 * AT 25DF321 already tested
 *
 */

#include <stdio.h>
#include <string.h>
#include <stdint.h>
#include <sys/mman.h>
#include <pci/pci.h>
#include "flash.h"
#include "spi.h"

Stefan Reinauer's avatar
Stefan Reinauer committed
44 45 46 47 48
/* ICH9 controller register definition */
#define ICH9_REG_FADDR         0x08	/* 32 Bits */
#define ICH9_REG_FDATA0                0x10	/* 64 Bytes */

#define ICH9_REG_SSFS          0x90	/* 08 Bits */
49 50 51 52
#define SSFS_SCIP		0x00000001
#define SSFS_CDS		0x00000004
#define SSFS_FCERR		0x00000008
#define SSFS_AEL		0x00000010
Stefan Reinauer's avatar
Stefan Reinauer committed
53 54

#define ICH9_REG_SSFC          0x91	/* 24 Bits */
55 56 57 58 59 60 61 62 63 64
#define SSFC_SCGO		0x00000200
#define SSFC_ACS		0x00000400
#define SSFC_SPOP		0x00000800
#define SSFC_COP		0x00001000
#define SSFC_DBC		0x00010000
#define SSFC_DS			0x00400000
#define SSFC_SME		0x00800000
#define SSFC_SCF		0x01000000
#define SSFC_SCF_20MHZ 0x00000000
#define SSFC_SCF_33MHZ 0x01000000
Stefan Reinauer's avatar
Stefan Reinauer committed
65 66 67 68

#define ICH9_REG_PREOP         0x94	/* 16 Bits */
#define ICH9_REG_OPTYPE                0x96	/* 16 Bits */
#define ICH9_REG_OPMENU                0x98	/* 64 Bits */
69 70 71 72 73 74 75

// ICH9R SPI commands
#define SPI_OPCODE_TYPE_READ_NO_ADDRESS     0
#define SPI_OPCODE_TYPE_WRITE_NO_ADDRESS    1
#define SPI_OPCODE_TYPE_READ_WITH_ADDRESS   2
#define SPI_OPCODE_TYPE_WRITE_WITH_ADDRESS  3

Stefan Reinauer's avatar
Stefan Reinauer committed
76 77 78 79 80 81
// ICH7 registers
#define ICH7_REG_SPIS          0x00	/* 16 Bits */
#define SPIS_SCIP              0x00000001
#define SPIS_CDS               0x00000004
#define SPIS_FCERR             0x00000008

82 83 84 85 86 87 88 89 90 91
/* VIA SPI is compatible with ICH7, but maxdata
   to transfer is 16 bytes.

   DATA byte count on ICH7 is 8:13, on VIA 8:11

   bit 12 is port select CS0 CS1
   bit 13 is FAST READ enable
   bit 7  is used with fast read and one shot controls CS de-assert?
*/

Stefan Reinauer's avatar
Stefan Reinauer committed
92 93 94 95
#define ICH7_REG_SPIC          0x02	/* 16 Bits */
#define SPIC_SCGO              0x0002
#define SPIC_ACS               0x0004
#define SPIC_SPOP              0x0008
96
#define SPIC_DS                0x4000
Stefan Reinauer's avatar
Stefan Reinauer committed
97 98 99 100 101 102 103

#define ICH7_REG_SPIA          0x04	/* 32 Bits */
#define ICH7_REG_SPID0         0x08	/* 64 Bytes */
#define ICH7_REG_PREOP         0x54	/* 16 Bits */
#define ICH7_REG_OPTYPE                0x56	/* 16 Bits */
#define ICH7_REG_OPMENU                0x58	/* 64 Bits */

104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127
typedef struct _OPCODE {
	uint8_t opcode;		//This commands spi opcode
	uint8_t spi_type;	//This commands spi type
	uint8_t atomic;		//Use preop: (0: none, 1: preop0, 2: preop1
} OPCODE;

/* Opcode definition:
 * Preop 1: Write Enable
 * Preop 2: Write Status register enable
 *
 * OP 0: Write address
 * OP 1: Read Address
 * OP 2: ERASE block
 * OP 3: Read Status register
 * OP 4: Read ID
 * OP 5: Write Status register
 * OP 6: chip private (read JDEC id)
 * OP 7: Chip erase
 */
typedef struct _OPCODES {
	uint8_t preop[2];
	OPCODE opcode[8];
} OPCODES;

128
static OPCODES *curopcodes = NULL;
129 130 131 132 133

/* HW access functions */
static inline uint32_t REGREAD32(int X)
{
	volatile uint32_t regval;
134
	regval = *(volatile uint32_t *)((uint8_t *) spibar + X);
Stefan Reinauer's avatar
Stefan Reinauer committed
135 136 137 138 139 140
	return regval;
}

static inline uint16_t REGREAD16(int X)
{
	volatile uint16_t regval;
141
	regval = *(volatile uint16_t *)((uint8_t *) spibar + X);
142 143 144
	return regval;
}

145 146 147
#define REGWRITE32(X,Y) (*(uint32_t *)((uint8_t *)spibar+X)=Y)
#define REGWRITE16(X,Y) (*(uint16_t *)((uint8_t *)spibar+X)=Y)
#define REGWRITE8(X,Y)  (*(uint8_t *)((uint8_t *)spibar+X)=Y)
148 149 150

/* Common SPI functions */
static int program_opcodes(OPCODES * op);
151
static int run_opcode(OPCODE op, uint32_t offset,
152 153
		      uint8_t datalength, uint8_t * data);
static int ich_spi_read_page(struct flashchip *flash, uint8_t * buf,
154
			     int offset, int maxdata);
155
static int ich_spi_write_page(struct flashchip *flash, uint8_t * bytes,
156
			      int offset, int maxdata);
157 158 159 160 161
static int ich_spi_erase_block(struct flashchip *flash, int offset);

OPCODES O_ST_M25P = {
	{
	 JEDEC_WREN,
162
	 0},
163
	{
164 165 166 167 168 169 170 171 172
	 {JEDEC_BYTE_PROGRAM, SPI_OPCODE_TYPE_WRITE_WITH_ADDRESS, 1},	// Write Byte
	 {JEDEC_READ, SPI_OPCODE_TYPE_READ_WITH_ADDRESS, 0},	// Read Data
	 {JEDEC_BE_D8, SPI_OPCODE_TYPE_WRITE_WITH_ADDRESS, 1},	// Erase Sector
	 {JEDEC_RDSR, SPI_OPCODE_TYPE_READ_NO_ADDRESS, 0},	// Read Device Status Reg
	 {JEDEC_RES, SPI_OPCODE_TYPE_READ_WITH_ADDRESS, 0},	// Resume Deep Power-Down
	 {JEDEC_WRSR, SPI_OPCODE_TYPE_WRITE_NO_ADDRESS, 1},	// Write Status Register
	 {JEDEC_RDID, SPI_OPCODE_TYPE_READ_NO_ADDRESS, 0},	// Read JDEC ID
	 {JEDEC_CE_C7, SPI_OPCODE_TYPE_WRITE_NO_ADDRESS, 1},	// Bulk erase
	 }
173 174 175 176 177
};

int program_opcodes(OPCODES * op)
{
	uint8_t a;
178 179
	uint16_t preop, optype;
	uint32_t opmenu[2];
180 181

	/* Program Prefix Opcodes */
182
	preop = 0;
183
	/* 0:7 Prefix Opcode 1 */
184
	preop = (op->preop[0]);
185
	/* 8:16 Prefix Opcode 2 */
186
	preop |= ((uint16_t) op->preop[1]) << 8;
187

Stefan Reinauer's avatar
Stefan Reinauer committed
188
	/* Program Opcode Types 0 - 7 */
189
	optype = 0;
190
	for (a = 0; a < 8; a++) {
191
		optype |= ((uint16_t) op->opcode[a].spi_type) << (a * 2);
192
	}
193

Stefan Reinauer's avatar
Stefan Reinauer committed
194
	/* Program Allowable Opcodes 0 - 3 */
195
	opmenu[0] = 0;
196
	for (a = 0; a < 4; a++) {
197
		opmenu[0] |= ((uint32_t) op->opcode[a].opcode) << (a * 8);
Stefan Reinauer's avatar
Stefan Reinauer committed
198 199
	}

200
	/*Program Allowable Opcodes 4 - 7 */
201
	opmenu[1] = 0;
202
	for (a = 4; a < 8; a++) {
203
		opmenu[1] |= ((uint32_t) op->opcode[a].opcode) << ((a - 4) * 8);
Stefan Reinauer's avatar
Stefan Reinauer committed
204 205
	}

206
	switch (flashbus) {
207 208
	case BUS_TYPE_ICH7_SPI:
	case BUS_TYPE_VIA_SPI:
209 210 211 212 213 214 215 216 217 218 219 220 221 222
		REGWRITE16(ICH7_REG_PREOP, preop);
		REGWRITE16(ICH7_REG_OPTYPE, optype);
		REGWRITE32(ICH7_REG_OPMENU, opmenu[0]);
		REGWRITE32(ICH7_REG_OPMENU + 4, opmenu[1]);
		break;
	case BUS_TYPE_ICH9_SPI:
		REGWRITE16(ICH9_REG_PREOP, preop);
		REGWRITE16(ICH9_REG_OPTYPE, optype);
		REGWRITE32(ICH9_REG_OPMENU, opmenu[0]);
		REGWRITE32(ICH9_REG_OPMENU + 4, opmenu[1]);
		break;
	default:
		printf_debug("%s: unsupported chipset\n", __FUNCTION__);
		return -1;
Stefan Reinauer's avatar
Stefan Reinauer committed
223 224 225 226 227
	}

	return 0;
}

228
static int ich7_run_opcode(OPCODE op, uint32_t offset,
229
			   uint8_t datalength, uint8_t * data, int maxdata)
Stefan Reinauer's avatar
Stefan Reinauer committed
230 231 232
{
	int write_cmd = 0;
	int timeout;
233
	uint32_t temp32 = 0;
Stefan Reinauer's avatar
Stefan Reinauer committed
234 235
	uint16_t temp16;
	uint32_t a;
236 237
	uint64_t opmenu;
	int opcode_index;
Stefan Reinauer's avatar
Stefan Reinauer committed
238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280

	/* Is it a write command? */
	if ((op.spi_type == SPI_OPCODE_TYPE_WRITE_NO_ADDRESS)
	    || (op.spi_type == SPI_OPCODE_TYPE_WRITE_WITH_ADDRESS)) {
		write_cmd = 1;
	}

	/* Programm Offset in Flash into FADDR */
	REGWRITE32(ICH7_REG_SPIA, (offset & 0x00FFFFFF));	/* SPI addresses are 24 BIT only */

	/* Program data into FDATA0 to N */
	if (write_cmd && (datalength != 0)) {
		temp32 = 0;
		for (a = 0; a < datalength; a++) {
			if ((a % 4) == 0) {
				temp32 = 0;
			}

			temp32 |= ((uint32_t) data[a]) << ((a % 4) * 8);

			if ((a % 4) == 3) {
				REGWRITE32(ICH7_REG_SPID0 + (a - (a % 4)),
					   temp32);
			}
		}
		if (((a - 1) % 4) != 3) {
			REGWRITE32(ICH7_REG_SPID0 +
				   ((a - 1) - ((a - 1) % 4)), temp32);
		}

	}

	/* Assemble SPIS */
	temp16 = 0;
	/* clear error status registers */
	temp16 |= (SPIS_CDS + SPIS_FCERR);
	REGWRITE16(ICH7_REG_SPIS, temp16);

	/* Assemble SPIC */
	temp16 = 0;

	if (datalength != 0) {
		temp16 |= SPIC_DS;
281
		temp16 |= ((uint32_t) ((datalength - 1) & (maxdata - 1))) << 8;
Stefan Reinauer's avatar
Stefan Reinauer committed
282 283 284
	}

	/* Select opcode */
285 286 287 288 289 290 291 292 293 294 295 296 297 298
	opmenu = REGREAD32(ICH7_REG_OPMENU);
	opmenu |= ((uint64_t)REGREAD32(ICH7_REG_OPMENU + 4)) << 32;

	for (opcode_index=0; opcode_index<8; opcode_index++) {
		if((opmenu & 0xff) == op.opcode) {
			break;
		}
		opmenu >>= 8;
	}
	if (opcode_index == 8) {
		printf_debug("Opcode %x not found.\n", op.opcode);
		return 1;
	}
	temp16 |= ((uint16_t) (opcode_index & 0x07)) << 4;
Stefan Reinauer's avatar
Stefan Reinauer committed
299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340

	/* Handle Atomic */
	if (op.atomic != 0) {
		/* Select atomic command */
		temp16 |= SPIC_ACS;
		/* Selct prefix opcode */
		if ((op.atomic - 1) == 1) {
			/*Select prefix opcode 2 */
			temp16 |= SPIC_SPOP;
		}
	}

	/* Start */
	temp16 |= SPIC_SCGO;

	/* write it */
	REGWRITE16(ICH7_REG_SPIC, temp16);

	/* wait for cycle complete */
	timeout = 1000 * 60;	// 60s is a looong timeout.
	while (((REGREAD16(ICH7_REG_SPIS) & SPIS_CDS) == 0) && --timeout) {
		myusec_delay(1000);
	}
	if (!timeout) {
		printf_debug("timeout\n");
	}

	if ((REGREAD16(ICH7_REG_SPIS) & SPIS_FCERR) != 0) {
		printf_debug("Transaction error!\n");
		return 1;
	}

	if ((!write_cmd) && (datalength != 0)) {
		for (a = 0; a < datalength; a++) {
			if ((a % 4) == 0) {
				temp32 = REGREAD32(ICH7_REG_SPID0 + (a));
			}

			data[a] =
			    (temp32 & (((uint32_t) 0xff) << ((a % 4) * 8)))
			    >> ((a % 4) * 8);
		}
341 342 343 344 345
	}

	return 0;
}

346
static int ich9_run_opcode(OPCODE op, uint32_t offset,
Stefan Reinauer's avatar
Stefan Reinauer committed
347
			   uint8_t datalength, uint8_t * data)
348 349
{
	int write_cmd = 0;
350
	int timeout;
351 352
	uint32_t temp32;
	uint32_t a;
353 354
	uint64_t opmenu;
	int opcode_index;
355 356 357 358 359 360 361 362

	/* Is it a write command? */
	if ((op.spi_type == SPI_OPCODE_TYPE_WRITE_NO_ADDRESS)
	    || (op.spi_type == SPI_OPCODE_TYPE_WRITE_WITH_ADDRESS)) {
		write_cmd = 1;
	}

	/* Programm Offset in Flash into FADDR */
Stefan Reinauer's avatar
Stefan Reinauer committed
363
	REGWRITE32(ICH9_REG_FADDR, (offset & 0x00FFFFFF));	/* SPI addresses are 24 BIT only */
364 365 366 367 368 369 370 371 372 373 374 375

	/* Program data into FDATA0 to N */
	if (write_cmd && (datalength != 0)) {
		temp32 = 0;
		for (a = 0; a < datalength; a++) {
			if ((a % 4) == 0) {
				temp32 = 0;
			}

			temp32 |= ((uint32_t) data[a]) << ((a % 4) * 8);

			if ((a % 4) == 3) {
Stefan Reinauer's avatar
Stefan Reinauer committed
376 377
				REGWRITE32(ICH9_REG_FDATA0 + (a - (a % 4)),
					   temp32);
378 379 380
			}
		}
		if (((a - 1) % 4) != 3) {
Stefan Reinauer's avatar
Stefan Reinauer committed
381 382
			REGWRITE32(ICH9_REG_FDATA0 +
				   ((a - 1) - ((a - 1) % 4)), temp32);
383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402
		}

	}

	/* Assemble SSFS + SSFC */
	temp32 = 0;

	/* clear error status registers */
	temp32 |= (SSFS_CDS + SSFS_FCERR);
	/* USE 20 MhZ */
	temp32 |= SSFC_SCF_20MHZ;

	if (datalength != 0) {
		uint32_t datatemp;
		temp32 |= SSFC_DS;
		datatemp = ((uint32_t) ((datalength - 1) & 0x3f)) << (8 + 8);
		temp32 |= datatemp;
	}

	/* Select opcode */
403 404 405 406 407 408 409 410 411 412 413 414 415 416
	opmenu = REGREAD32(ICH9_REG_OPMENU);
	opmenu |= ((uint64_t)REGREAD32(ICH9_REG_OPMENU + 4)) << 32;

	for (opcode_index=0; opcode_index<8; opcode_index++) {
		if((opmenu & 0xff) == op.opcode) {
			break;
		}
		opmenu >>= 8;
	}
	if (opcode_index == 8) {
		printf_debug("Opcode %x not found.\n", op.opcode);
		return 1;
	}
	temp32 |= ((uint32_t) (opcode_index & 0x07)) << (8 + 4);
417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432

	/* Handle Atomic */
	if (op.atomic != 0) {
		/* Select atomic command */
		temp32 |= SSFC_ACS;
		/* Selct prefix opcode */
		if ((op.atomic - 1) == 1) {
			/*Select prefix opcode 2 */
			temp32 |= SSFC_SPOP;
		}
	}

	/* Start */
	temp32 |= SSFC_SCGO;

	/* write it */
Stefan Reinauer's avatar
Stefan Reinauer committed
433
	REGWRITE32(ICH9_REG_SSFS, temp32);
434 435

	/*wait for cycle complete */
436 437 438 439 440 441
	timeout = 1000 * 60;	// 60s is a looong timeout.
	while (((REGREAD32(ICH9_REG_SSFS) & SSFS_CDS) == 0) && --timeout) {
		myusec_delay(1000);
	}
	if (!timeout) {
		printf_debug("timeout\n");
442 443
	}

Stefan Reinauer's avatar
Stefan Reinauer committed
444
	if ((REGREAD32(ICH9_REG_SSFS) & SSFS_FCERR) != 0) {
445 446 447 448 449 450 451
		printf_debug("Transaction error!\n");
		return 1;
	}

	if ((!write_cmd) && (datalength != 0)) {
		for (a = 0; a < datalength; a++) {
			if ((a % 4) == 0) {
Stefan Reinauer's avatar
Stefan Reinauer committed
452
				temp32 = REGREAD32(ICH9_REG_FDATA0 + (a));
453 454 455
			}

			data[a] =
Stefan Reinauer's avatar
Stefan Reinauer committed
456 457
			    (temp32 & (((uint32_t) 0xff) << ((a % 4) * 8)))
			    >> ((a % 4) * 8);
458 459 460 461 462 463
		}
	}

	return 0;
}

464
static int run_opcode(OPCODE op, uint32_t offset,
Stefan Reinauer's avatar
Stefan Reinauer committed
465 466
		      uint8_t datalength, uint8_t * data)
{
467 468
	switch (flashbus) {
	case BUS_TYPE_VIA_SPI:
469
		return ich7_run_opcode(op, offset, datalength, data, 16);
470
	case BUS_TYPE_ICH7_SPI:
471
		return ich7_run_opcode(op, offset, datalength, data, 64);
472
	case BUS_TYPE_ICH9_SPI:
473
		return ich9_run_opcode(op, offset, datalength, data);
474 475 476
	default:
		printf_debug("%s: unsupported chipset\n", __FUNCTION__);
	}
Stefan Reinauer's avatar
Stefan Reinauer committed
477 478 479 480 481

	/* If we ever get here, something really weird happened */
	return -1;
}

482 483
static int ich_spi_erase_block(struct flashchip *flash, int offset)
{
484
	printf_debug("ich_spi_erase_block: offset=%d, sectors=%d\n", offset, 1);
485

486
	if (run_opcode(curopcodes->opcode[2], offset, 0, NULL) != 0) {
487 488 489 490 491 492 493 494 495
		printf_debug("Error erasing sector at 0x%x", offset);
		return -1;
	}

	printf("DONE BLOCK 0x%x\n", offset);

	return 0;
}

496 497
static int ich_spi_read_page(struct flashchip *flash, uint8_t * buf, int offset,
			     int maxdata)
498 499 500 501 502
{
	int page_size = flash->page_size;
	uint32_t remaining = flash->page_size;
	int a;

Stefan Reinauer's avatar
Stefan Reinauer committed
503 504
	printf_debug("ich_spi_read_page: offset=%d, number=%d, buf=%p\n",
		     offset, page_size, buf);
505

506 507
	for (a = 0; a < page_size; a += maxdata) {
		if (remaining < maxdata) {
508 509

			if (run_opcode
510
			    (curopcodes->opcode[1],
Stefan Reinauer's avatar
Stefan Reinauer committed
511
			     offset + (page_size - remaining), remaining,
512 513 514 515 516 517 518
			     &buf[page_size - remaining]) != 0) {
				printf_debug("Error reading");
				return 1;
			}
			remaining = 0;
		} else {
			if (run_opcode
519
			    (curopcodes->opcode[1],
520
			     offset + (page_size - remaining), maxdata,
521 522 523 524
			     &buf[page_size - remaining]) != 0) {
				printf_debug("Error reading");
				return 1;
			}
525
			remaining -= maxdata;
526 527 528 529 530 531 532
		}
	}

	return 0;
}

static int ich_spi_write_page(struct flashchip *flash, uint8_t * bytes,
533
			      int offset, int maxdata)
534 535 536 537 538
{
	int page_size = flash->page_size;
	uint32_t remaining = page_size;
	int a;

Stefan Reinauer's avatar
Stefan Reinauer committed
539 540
	printf_debug("ich_spi_write_page: offset=%d, number=%d, buf=%p\n",
		     offset, page_size, bytes);
541

542 543
	for (a = 0; a < page_size; a += maxdata) {
		if (remaining < maxdata) {
544
			if (run_opcode
545
			    (curopcodes->opcode[0],
Stefan Reinauer's avatar
Stefan Reinauer committed
546
			     offset + (page_size - remaining), remaining,
547 548 549 550 551 552 553
			     &bytes[page_size - remaining]) != 0) {
				printf_debug("Error writing");
				return 1;
			}
			remaining = 0;
		} else {
			if (run_opcode
554
			    (curopcodes->opcode[0],
555
			     offset + (page_size - remaining), maxdata,
556 557 558 559
			     &bytes[page_size - remaining]) != 0) {
				printf_debug("Error writing");
				return 1;
			}
560
			remaining -= maxdata;
561 562 563 564 565 566 567 568 569 570 571
		}
	}

	return 0;
}

int ich_spi_read(struct flashchip *flash, uint8_t * buf)
{
	int i, rc = 0;
	int total_size = flash->total_size * 1024;
	int page_size = flash->page_size;
572 573
	int maxdata = 64;

574
	if (flashbus == BUS_TYPE_VIA_SPI) {
575 576
		maxdata = 16;
	}
577 578 579

	for (i = 0; (i < total_size / page_size) && (rc == 0); i++) {
		rc = ich_spi_read_page(flash, (void *)(buf + i * page_size),
580
				       i * page_size, maxdata);
581 582 583 584 585 586 587 588 589 590 591
	}

	return rc;
}

int ich_spi_write(struct flashchip *flash, uint8_t * buf)
{
	int i, j, rc = 0;
	int total_size = flash->total_size * 1024;
	int page_size = flash->page_size;
	int erase_size = 64 * 1024;
592
	int maxdata = 64;
593 594 595 596 597 598 599 600 601 602 603

	spi_disable_blockprotect();

	printf("Programming page: \n");

	for (i = 0; i < total_size / erase_size; i++) {
		rc = ich_spi_erase_block(flash, i * erase_size);
		if (rc) {
			printf("Error erasing block at 0x%x\n", i);
			break;
		}
604

Peter Stuge's avatar
Peter Stuge committed
605 606 607
		if (flashbus == BUS_TYPE_VIA_SPI)
			maxdata = 16;

608
		for (j = 0; j < erase_size / page_size; j++) {
609 610 611
			ich_spi_write_page(flash,
			   (void *)(buf + (i * erase_size) + (j * page_size)),
			   (i * erase_size) + (j * page_size), maxdata);
612 613 614 615 616 617 618 619
		}
	}

	printf("\n");

	return rc;
}

620 621
int ich_spi_command(unsigned int writecnt, unsigned int readcnt,
		    const unsigned char *writearr, unsigned char *readarr)
622 623 624 625 626 627 628 629 630 631 632
{
	int a;
	int opcode_index = -1;
	const unsigned char cmd = *writearr;
	OPCODE *opcode;
	uint32_t addr = 0;
	uint8_t *data;
	int count;

	/* program opcodes if not already done */
	if (curopcodes == NULL) {
633
		printf_debug("Programming OPCODES... ");
634
		curopcodes = &O_ST_M25P;
635
		program_opcodes(curopcodes);
636
		printf_debug("done\n");
637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657
	}

	/* find cmd in opcodes-table */
	for (a = 0; a < 8; a++) {
		if ((curopcodes->opcode[a]).opcode == cmd) {
			opcode_index = a;
			break;
		}
	}

	/* unknown / not programmed command */
	if (opcode_index == -1) {
		printf_debug("Invalid OPCODE 0x%02x\n", cmd);
		return 1;
	}

	opcode = &(curopcodes->opcode[opcode_index]);

	/* if opcode-type requires an address */
	if (opcode->spi_type == SPI_OPCODE_TYPE_READ_WITH_ADDRESS ||
	    opcode->spi_type == SPI_OPCODE_TYPE_WRITE_WITH_ADDRESS) {
658 659
		addr = (writearr[1] << 16) |
		    (writearr[2] << 8) | (writearr[3] << 0);
660
	}
661

662 663
	/* translate read/write array/count */
	if (opcode->spi_type == SPI_OPCODE_TYPE_WRITE_NO_ADDRESS) {
664 665 666 667 668 669 670
		data = (uint8_t *) (writearr + 1);
		count = writecnt - 1;
	} else if (opcode->spi_type == SPI_OPCODE_TYPE_WRITE_WITH_ADDRESS) {
		data = (uint8_t *) (writearr + 4);
		count = writecnt - 4;
	} else {
		data = (uint8_t *) readarr;
671 672
		count = readcnt;
	}
673

674
	if (run_opcode(*opcode, addr, count, data) != 0) {
675 676 677 678 679 680
		printf_debug("run OPCODE 0x%02x failed\n", opcode->opcode);
		return 1;
	}

	return 0;
}