[flashrom] [commit] r1046 - trunk

[repository service]

Author: hailfinger
Date: Mon Jun 14 16:18:37 2010
New Revision: 1046
URL: http://flashrom.org/trac/coreboot/changeset/1046

Log:
The nicrealtek code uses magic constants, but they are not explained.
That's OK if you know the datasheet well, but for casual readers some
comments are really helpful.

I'm not sure whether we want to disable hardware flash access forever
without enabling it again on shutdown. A few other places made me wonder
as well. I've added FIXME comments in those places.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006 at gmx.net>
Acked-by: Andrew Morgan <ziltro at ziltro.com>

Modified:
   trunk/nicrealtek.c

Modified: trunk/nicrealtek.c
==============================================================================
--- trunk/nicrealtek.c	Mon Jun 14 14:58:06 2010	(r1045)
+++ trunk/nicrealtek.c	Mon Jun 14 16:18:37 2010	(r1046)
@@ -65,6 +65,7 @@
 
 int nicrealtek_shutdown(void)
 {
+	/* FIXME: We forgot to disable software access again. */
 	free(programmer_param);
 	pci_cleanup(pacc);
 	release_io_perms();
@@ -73,8 +74,14 @@
 
 void nicrealtek_chip_writeb(uint8_t val, chipaddr addr)
 {
+	/* Output addr and data, set WE to 0, set OE to 1, set CS to 0,
+	 * enable software access.
+	 */
 	OUTL(((uint32_t)addr & 0x01FFFF) | 0x0A0000 | (val << 24),
 	     io_base_addr + BIOS_ROM_ADDR);
+	/* Output addr and data, set WE to 1, set OE to 1, set CS to 1,
+	 * enable software access.
+	 */
 	OUTL(((uint32_t)addr & 0x01FFFF) | 0x1E0000 | (val << 24),
 	     io_base_addr + BIOS_ROM_ADDR);
 }
@@ -83,11 +90,20 @@
 {
 	uint8_t val;
 
+	/* FIXME: Can we skip reading the old data and simply use 0? */
+	/* Read old data. */
 	val = INB(io_base_addr + BIOS_ROM_DATA);
+	/* Output new addr and old data, set WE to 1, set OE to 0, set CS to 0,
+	 * enable software access.
+	 */
 	OUTL(((uint32_t)addr & 0x01FFFF) | 0x060000 | (val << 24),
 	     io_base_addr + BIOS_ROM_ADDR);
 
+	/* Read new data. */
 	val = INB(io_base_addr + BIOS_ROM_DATA);
+	/* Output addr and new data, set WE to 1, set OE to 1, set CS to 1,
+	 * enable software access.
+	 */
 	OUTL(((uint32_t)addr & 0x01FFFF) | 0x1E0000 | (val << 24),
 	     io_base_addr + BIOS_ROM_ADDR);