Do not call EC programmer shutdown functions explicitly.

mec1308.c

 /*
  * This file is part of the flashrom project.
  *
  * Copyright (C) 2010 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * Redistributions of source code must retain the above copyright
@@ skipping 24 matching lines @@
 #if defined(__i386__) || defined(__x86_64__)
 #include <inttypes.h>
 #include <string.h>
 #include <unistd.h>
 
 #include "flash.h"
 #include "chipdrivers.h"
 #include "programmer.h"
 #include "spi.h"
 
+void mec1308_shutdown(void *);
+
 #define MEC1308_SIO_PORT1       0x2e
 #define MEC1308_SIO_PORT2       0x4e
 #define MEC1308_SIO_ENTRY_KEY   0x55
 #define MEC1308_SIO_EXIT_KEY    0xaa
 
 #define MEC1308_SIOCFG_LDN      0x07    /* LDN Bank Selector */
 #define MEC1308_DEVICE_ID_REG   0x20    /* Device ID Register */
 #define MEC1308_DEVICE_ID_VAL   0x4d    /* Device ID Value */
 #define MEC1308_DEVICE_REV      0x21    /* Device Revision ID Register */
 
@@ skipping 308 matching lines @@
 
         /*
          * Enter SPI Pass-Thru Mode after commands which do not require access
          * to SPI ROM are complete. We'll start by doing the exit_passthru_mode
          * sequence, which is benign if the EC is already in passthru mode.
          */
         mec1308_exit_passthru_mode();
         if (enter_passthru_mode())
                 return 1;
 
         msg_pdbg("%s(): successfully initialized mec1308\n", __func__);

[Louis, 2011/04/26 10:06:06]

Swap this message to next line?  To sync the same behavior as wpce775.

[dhendrix, 2011/04/27 02:08:06]

On second thought, I think we should do these earlier so that we ensure the
shutdown callback is registered _before_ entering passthru mode. LMK what you
think.

+        register_shutdown(mec1308_shutdown, NULL);
         return 0;
 }
 
-int mec1308_shutdown(void)
+void mec1308_shutdown(void *data)
 {
         if (spi_controller != SPI_CONTROLLER_MEC1308)
-                return 0;
+                return;
 
         /* Exit passthru mode before performing commands which do not affect
            the SPI ROM */
         mec1308_exit_passthru_mode();
 
         /* Re-enable SMI and ACPI.
            FIXME: is there an ordering dependency? */
         mbx_write(MEC1308_MBX_CMD, MEC1308_CMD_SMI_ENABLE);
         mbx_write(MEC1308_MBX_CMD, MEC1308_CMD_ACPI_ENABLE);
-
-        return 0;
 }
 
 int mec1308_spi_read(struct flashchip *flash, uint8_t * buf, int start, int len)
 {
         return spi_read_chunked(flash, buf, start, len, flash->page_size);
 }
 
 int mec1308_spi_write_256(struct flashchip *flash,
                           uint8_t *buf, int start, int len)
 {
@@ skipping 34 matching lines @@
                 mbx_write(MEC1308_MBX_CMD, MEC1308_CMD_PASSTHRU_READ);
                 readarr[i] = mbx_read(MEC1308_MBX_DATA_START);
         }
 
         if (mec1308_chip_deselect())
                 return 1;
 
         return 0;
 }
 #endif