Changeset 1459

Timestamp:

11/04/11 22:35:26 (7 months ago)

Author:

hailfinger

Message:

Add opaque programmer registration infrastructure

An opaque programmer does not allow direct flash access and only offers
abstract probe/read/erase/write methods.
Due to that, opaque programmers need their own infrastructure and
registration framework.

Signed-off-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@…>
Acked-by: Michael Karcher <flashrom@…>

Location:

trunk

Files:

• Makefile (modified) (1 diff)
• chipdrivers.h (modified) (1 diff)
• flash.h (modified) (1 diff)
• flashchips.c (modified) (1 diff)
• flashchips.h (modified) (1 diff)
• opaque.c (added)
• print.c (modified) (2 diffs)
• programmer.h (modified) (2 diffs)

trunk/Makefile

@@ -243 +243 @@
         sst28sf040.o m29f400bt.o 82802ab.o pm49fl00x.o \
         sst49lfxxxc.o sst_fwhub.o flashchips.o spi.o spi25.o sharplhf00l04.o \
-        a25.o at25.o
+        a25.o at25.o opaque.o
 
 LIB_OBJS = layout.o

trunk/chipdrivers.h

@@ -58 +58 @@
 int spi_write_chunked(struct flashchip *flash, uint8_t *buf, int start, int len, int chunksize);
 int spi_aai_write(struct flashchip *flash, uint8_t *buf, int start, int len);
+
+/* opaque.c */
+int probe_opaque(struct flashchip *flash);
+int read_opaque(struct flashchip *flash, uint8_t *buf, int start, int len);
+int write_opaque(struct flashchip *flash, uint8_t *buf, int start, int len);
+int erase_opaque(struct flashchip *flash, unsigned int blockaddr, unsigned int blocklen);
 
 /* a25.c */

trunk/flash.h

@@ -63 +63 @@
         BUS_FWH         = 1 << 2,
         BUS_SPI         = 1 << 3,
+        BUS_PROG        = 1 << 4,
         BUS_NONSPI      = BUS_PARALLEL | BUS_LPC | BUS_FWH,
-        BUS_UNKNOWN     = BUS_PARALLEL | BUS_LPC | BUS_FWH | BUS_SPI,
 };
 

trunk/flashchips.c

@@ -8875 +8875 @@
 
         {
+                .vendor         = "Programmer",
+                .name           = "Opaque flash chip",
+                .bustype        = BUS_PROG,
+                .manufacture_id = PROGMANUF_ID,
+                .model_id       = PROGDEV_ID,
+                .total_size     = 0,
+                .page_size      = 256,
+                /* probe is assumed to work, rest will be filled in by probe */
+                .tested         = TEST_OK_PROBE,
+                .probe          = probe_opaque,
+                /* eraseblock sizes will be set by the probing function */
+                .block_erasers  =
+                {
+                        {
+                                .block_erase = erase_opaque,
+                        }
+                },
+                .write          = write_opaque,
+                .read           = read_opaque,
+        },
+
+        {
                 .vendor         = "AMIC",
                 .name           = "unknown AMIC SPI chip",

trunk/flashchips.h

@@ -647 +647 @@
 #define WINBOND_W49V002FA       0x32
 
+#define PROGMANUF_ID            0xFFFE  /* dummy ID for opaque chips behind a programmer */
+#define PROGDEV_ID              0x01    /* dummy ID for opaque chips behind a programmer */
+
 #endif /* !FLASHCHIPS_H */

trunk/print.c

@@ -33 +33 @@
 {
         char *ret = calloc(1, 1);
-        if (bustype == BUS_UNKNOWN) {
-                ret = strcat_realloc(ret, "Unknown, ");
         /*
          * FIXME: Once all chipsets and flash chips have been updated, NONSPI
          * will cease to exist and should be eliminated here as well.
          */
-        } else if (bustype == BUS_NONSPI) {
+        if (bustype == BUS_NONSPI) {
                 ret = strcat_realloc(ret, "Non-SPI, ");
         } else {
@@ -50 +48 @@
                 if (bustype & BUS_SPI)
                         ret = strcat_realloc(ret, "SPI, ");
+                if (bustype & BUS_PROG)
+                        ret = strcat_realloc(ret, "Programmer-specific, ");
                 if (bustype == BUS_NONE)
                         ret = strcat_realloc(ret, "None, ");

trunk/programmer.h

@@ -24 +24 @@
 #ifndef __PROGRAMMER_H__
 #define __PROGRAMMER_H__ 1
+
+#include "flash.h"      /* for chipaddr and flashchip */
 
 enum programmer {
@@ -602 +604 @@
 #endif
 
+/* opaque.c */
+struct opaque_programmer {
+        int max_data_read;
+        int max_data_write;
+        /* Specific functions for this programmer */
+        int (*probe) (struct flashchip *flash);
+        int (*read) (struct flashchip *flash, uint8_t *buf, int start, int len);
+        int (*write) (struct flashchip *flash, uint8_t *buf, int start, int len);
+        int (*erase) (struct flashchip *flash, unsigned int blockaddr, unsigned int blocklen);
+};
+extern const struct opaque_programmer *opaque_programmer;
+void register_opaque_programmer(const struct opaque_programmer *pgm);
+
 /* serprog.c */
 #if CONFIG_SERPROG == 1