Changeset 1151

Timestamp:

09/03/10 20:21:21 (17 months ago)

Author:

uwe

Message:

Add Intel Gigabit NIC SPI flashing support.
Tested on a 82541PI (0x8086, 0x107c) using 32-bit hardware.

The last line in nicintel_request_spibus() could be changed so that FL_BUSY
is used instead.

Shortened sample log:
[...]
Found "Intel 82541PI Gigabit Ethernet Controller" (8086:107c, BDF 01:03.0).
Found chip "ST M25P10.RES" (128 KB, SPI) at physical address 0xfffe0000.
Multiple flash chips were detected: M25P05.RES M25P10.RES
Please specify which chip to use with the -c <chipname> option.
[...]

Signed-off-by: Idwer Vollering <vidwer@…>
Acked-by: Uwe Hermann <uwe@…>

Location:

trunk

Files:

• Makefile (modified) (3 diffs)
• flashrom.8 (modified) (1 diff)
• flashrom.c (modified) (3 diffs)
• nicintel_spi.c (added)
• print.c (modified) (1 diff)
• print_wiki.c (modified) (1 diff)
• programmer.h (modified) (6 diffs)
• spi.c (modified) (1 diff)

trunk/Makefile

@@ -122 +122 @@
 override CONFIG_BITBANG_SPI = yes
 else
+ifeq ($(CONFIG_NICINTEL_SPI), yes)
+override CONFIG_BITBANG_SPI = yes
+else
 CONFIG_BITBANG_SPI ?= no
+endif
 endif
 endif
@@ -153 +157 @@
 # Disable National Semiconductor NICs until support is complete and tested.
 CONFIG_NICNATSEMI ?= no
+
+# Always enable SPI on Intel NICs for now.
+CONFIG_NICINTEL_SPI ?= yes
 
 # Always enable Bus Pirate SPI for now.
@@ -242 +249 @@
 FEATURE_CFLAGS += -D'CONFIG_NICNATSEMI=1'
 PROGRAMMER_OBJS += nicnatsemi.o
+NEED_PCI := yes
+endif
+
+ifeq ($(CONFIG_NICINTEL_SPI), yes)
+FEATURE_CFLAGS += -D'CONFIG_NICINTEL_SPI=1'
+PROGRAMMER_OBJS += nicintel_spi.o
 NEED_PCI := yes
 endif

trunk/flashrom.8

@@ -191 +191 @@
 based programmer)"
 .sp
+.BR "* nicintel_spi" " (for SPI flash ROMs attached to an Intel Gigabit \
+network cards)"
+.sp
 Some programmers have optional or mandatory parameters which are described
 in detail in the

trunk/flashrom.c

@@ -50 +50 @@
  * that the user wants that one to become the default.
  */
-#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_FT2232_SPI+CONFIG_SERPROG+CONFIG_BUSPIRATE_SPI+CONFIG_DEDIPROG+CONFIG_RAYER_SPI > 1
+#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_FT2232_SPI+CONFIG_SERPROG+CONFIG_BUSPIRATE_SPI+CONFIG_DEDIPROG+CONFIG_RAYER_SPI+CONFIG_NICINTEL_SPI > 1
 #error Please enable either CONFIG_DUMMY or CONFIG_INTERNAL or disable support for all programmers except one.
 #endif
@@ -90 +90 @@
 #if CONFIG_RAYER_SPI == 1
         PROGRAMMER_RAYER_SPI
+#endif
+#if CONFIG_NICINTEL_SPI == 1
+        PROGRAMMER_NICINTEL_SPI
 #endif
 ;
@@ -412 +415 @@
                 .chip_writen            = fallback_chip_writen,
                 .delay                  = internal_delay,
+        },
+#endif
+
+#if CONFIG_NICINTEL_SPI == 1
+        {
+                .name = "nicintel_spi",
+                .init = nicintel_spi_init,
+                .shutdown = nicintel_spi_shutdown,
+                .map_flash_region = fallback_map,
+                .unmap_flash_region = fallback_unmap,
+                .chip_readb = noop_chip_readb,
+                .chip_readw = fallback_chip_readw,
+                .chip_readl = fallback_chip_readl,
+                .chip_readn = fallback_chip_readn,
+                .chip_writeb = noop_chip_writeb,
+                .chip_writew = fallback_chip_writew,
+                .chip_writel = fallback_chip_writel,
+                .chip_writen = fallback_chip_writen,
+                .delay = internal_delay,
         },
 #endif

trunk/print.c

@@ -255 +255 @@
 #if CONFIG_ATAHPT == 1
                 print_supported_pcidevs(ata_hpt);
+#endif
+#if CONFIG_NICINTEL_SPI == 1
+                print_supported_pcidevs(nics_intel_spi);
 #endif
 

trunk/print_wiki.c

@@ -297 +297 @@
         print_supported_pcidevs_wiki(ata_hpt);
 #endif
+#if CONFIG_NICINTEL_SPI == 1
+        print_supported_pcidevs_wiki(nics_intel_spi);
+#endif
         printf("\n|}\n");
 }

trunk/programmer.h

@@ -38 +38 @@
         PROGRAMMER_NICREALTEK,
         PROGRAMMER_NICREALTEK2,
-#endif  
+#endif
 #if CONFIG_NICNATSEMI == 1
         PROGRAMMER_NICNATSEMI,
-#endif  
+#endif
 #if CONFIG_GFXNVIDIA == 1
         PROGRAMMER_GFXNVIDIA,
@@ -73 +73 @@
 #if CONFIG_RAYER_SPI == 1
         PROGRAMMER_RAYER_SPI,
+#endif
+#if CONFIG_NICINTEL_SPI == 1
+        PROGRAMMER_NICINTEL_SPI,
 #endif
         PROGRAMMER_INVALID /* This must always be the last entry. */
@@ -110 +113 @@
 #if CONFIG_RAYER_SPI == 1
         BITBANG_SPI_MASTER_RAYER,
+#endif
+#if CONFIG_NICINTEL_SPI == 1
+        BITBANG_SPI_MASTER_NICINTEL,
 #endif
 #if CONFIG_INTERNAL == 1
@@ -208 +214 @@
 
 /* print.c */
-#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT >= 1
+#if CONFIG_NIC3COM+CONFIG_NICREALTEK+CONFIG_NICNATSEMI+CONFIG_GFXNVIDIA+CONFIG_DRKAISER+CONFIG_SATASII+CONFIG_ATAHPT+CONFIG_NICINTEL_SPI >= 1
 void print_supported_pcidevs(const struct pcidev_status *devs);
 #endif
@@ -379 +385 @@
 #endif
 
+/* nicintel_spi.c */
+#if CONFIG_NICINTEL_SPI == 1
+int nicintel_spi_init(void);
+int nicintel_spi_shutdown(void);
+int nicintel_spi_send_command(unsigned int writecnt, unsigned int readcnt,
+        const unsigned char *writearr, unsigned char *readarr);
+void nicintel_spi_chip_writeb(uint8_t val, chipaddr addr);
+extern const struct pcidev_status nics_intel_spi[];
+#endif
+
 /* satasii.c */
 #if CONFIG_SATASII == 1
@@ -494 +510 @@
 #if CONFIG_RAYER_SPI == 1
         SPI_CONTROLLER_RAYER,
+#endif
+#if CONFIG_NICINTEL_SPI == 1
+        SPI_CONTROLLER_NICINTEL,
 #endif
         SPI_CONTROLLER_INVALID /* This must always be the last entry. */

trunk/spi.c

@@ -130 +130 @@
 #if CONFIG_RAYER_SPI == 1
         { /* SPI_CONTROLLER_RAYER */
+                .command = bitbang_spi_send_command,
+                .multicommand = default_spi_send_multicommand,
+                .read = bitbang_spi_read,
+                .write_256 = bitbang_spi_write_256,
+        },
+#endif
+
+#if CONFIG_NICINTEL_SPI == 1
+        { /* SPI_CONTROLLER_NICINTEL */
                 .command = bitbang_spi_send_command,
                 .multicommand = default_spi_send_multicommand,