openocd: fix SPDX tag format for files .c
[fw/openocd] / src / flash / nand / mxc.c
index b6694ca0dd3dfe39291a3e9d4471c980c5f51335..845a3bb9a6997c383f7df5fd69d9668f28833282 100644 (file)
@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /***************************************************************************
  *   Copyright (C) 2009 by Alexei Babich                                   *
  *   Rezonans plc., Chelyabinsk, Russia                                    *
@@ -8,21 +10,6 @@
  *                                                                         *
  *   Copyright (C) 2011 by Erik Ahlen                                      *
  *   Avalon Innovation, Sweden                                             *
- *                                                                         *
- *   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.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
 /*
@@ -39,6 +26,7 @@
  * !! all function only tested with 2k page nand device; mxc_write_page
  *    writes the 4 MAIN_BUFFER's and is not compatible with < 2k page
  * !! oob must be be used due to NFS bug
+ * !! oob must be 64 bytes per 2KiB page
 */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #include "mxc.h"
 #include <target/target.h>
 
+#define OOB_SIZE        64
+
 #define nfc_is_v1() (mxc_nf_info->mxc_version == MXC_VERSION_MX27 || \
-                                       mxc_nf_info->mxc_version == MXC_VERSION_MX31)
+               mxc_nf_info->mxc_version == MXC_VERSION_MX31)
 #define nfc_is_v2() (mxc_nf_info->mxc_version == MXC_VERSION_MX25 || \
-                                       mxc_nf_info->mxc_version == MXC_VERSION_MX35)
+               mxc_nf_info->mxc_version == MXC_VERSION_MX35)
 
 /* This permits to print (in LOG_INFO) how much bytes
  * has been written after a page read or write.
@@ -64,7 +54,7 @@
 static const char target_not_halted_err_msg[] =
        "target must be halted to use mxc NAND flash controller";
 static const char data_block_size_err_msg[] =
-       "minimal granularity is one half-word, %" PRId32 " is incorrect";
+       "minimal granularity is one half-word, %" PRIu32 " is incorrect";
 static const char sram_buffer_bounds_err_msg[] =
        "trying to access out of SRAM buffer bound (addr=0x%" PRIx32 ")";
 static const char get_status_register_err_msg[] = "can't get NAND status";
@@ -86,10 +76,9 @@ NAND_DEVICE_COMMAND_HANDLER(mxc_nand_device_command)
 {
        struct mxc_nf_controller *mxc_nf_info;
        int hwecc_needed;
-       int x;
 
        mxc_nf_info = malloc(sizeof(struct mxc_nf_controller));
-       if (mxc_nf_info == NULL) {
+       if (!mxc_nf_info) {
                LOG_ERROR("no memory for nand controller");
                return ERROR_FAIL;
        }
@@ -133,10 +122,10 @@ NAND_DEVICE_COMMAND_HANDLER(mxc_nand_device_command)
        mxc_nf_info->optype = MXC_NF_DATAOUT_PAGE;
        mxc_nf_info->fin = MXC_NF_FIN_NONE;
        mxc_nf_info->flags.target_little_endian =
-       (nand->target->endianness == TARGET_LITTLE_ENDIAN);
+               (nand->target->endianness == TARGET_LITTLE_ENDIAN);
 
        /*
-        * should factory bad block indicator be swaped
+        * should factory bad block indicator be swapped
         * as a workaround for how the nfc handles pages.
         */
        if (CMD_ARGC > 4 && strcmp(CMD_ARGV[4], "biswap") == 0) {
@@ -144,14 +133,6 @@ NAND_DEVICE_COMMAND_HANDLER(mxc_nand_device_command)
                mxc_nf_info->flags.biswap_enabled = 1;
        }
 
-       /*
-        * testing host endianness
-        */
-       x = 1;
-       if (*(char *) &x == 1)
-               mxc_nf_info->flags.host_little_endian = 1;
-       else
-               mxc_nf_info->flags.host_little_endian = 0;
        return ERROR_OK;
 }
 
@@ -165,7 +146,7 @@ COMMAND_HANDLER(handle_mxc_biswap_command)
 
        int retval = CALL_COMMAND_HANDLER(nand_command_get_device, 0, &nand);
        if (retval != ERROR_OK) {
-               command_print(CMD_CTX, "invalid nand device number or name: %s", CMD_ARGV[0]);
+               command_print(CMD, "invalid nand device number or name: %s", CMD_ARGV[0]);
                return ERROR_COMMAND_ARGUMENT_INVALID;
        }
 
@@ -177,9 +158,9 @@ COMMAND_HANDLER(handle_mxc_biswap_command)
                        mxc_nf_info->flags.biswap_enabled = false;
        }
        if (mxc_nf_info->flags.biswap_enabled)
-               command_print(CMD_CTX, "BI-swapping enabled on %s", nand->name);
+               command_print(CMD, "BI-swapping enabled on %s", nand->name);
        else
-               command_print(CMD_CTX, "BI-swapping disabled on %s", nand->name);
+               command_print(CMD, "BI-swapping disabled on %s", nand->name);
 
        return ERROR_OK;
 }
@@ -187,9 +168,10 @@ COMMAND_HANDLER(handle_mxc_biswap_command)
 static const struct command_registration mxc_sub_command_handlers[] = {
        {
                .name = "biswap",
-               .handler = handle_mxc_biswap_command ,
-               .help = "Turns on/off bad block information swaping from main area, "
-                               "without parameter query status.",
+               .mode = COMMAND_EXEC,
+               .handler = handle_mxc_biswap_command,
+               .help = "Turns on/off bad block information swapping from main area, "
+                       "without parameter query status.",
                .usage = "bank_id ['enable'|'disable']",
        },
        COMMAND_REGISTRATION_DONE
@@ -200,7 +182,8 @@ static const struct command_registration mxc_nand_command_handler[] = {
                .name = "mxc",
                .mode = COMMAND_ANY,
                .help = "MXC NAND flash controller commands",
-               .chain = mxc_sub_command_handlers
+               .chain = mxc_sub_command_handlers,
+               .usage = "",
        },
        COMMAND_REGISTRATION_DONE
 };
@@ -213,9 +196,9 @@ static int mxc_init(struct nand_device *nand)
        int validate_target_result;
        uint16_t buffsize_register_content;
        uint32_t sreg_content;
-       uint32_t SREG = MX2_FMCR;
-       uint32_t SEL_16BIT = MX2_FMCR_NF_16BIT_SEL;
-       uint32_t SEL_FMS = MX2_FMCR_NF_FMS;
+       uint32_t sreg = MX2_FMCR;
+       uint32_t sel_16bit = MX2_FMCR_NF_16BIT_SEL;
+       uint32_t sel_fms = MX2_FMCR_NF_FMS;
        int retval;
        uint16_t nand_status_content;
        /*
@@ -232,45 +215,44 @@ static int mxc_init(struct nand_device *nand)
                mxc_nf_info->flags.one_kb_sram = 0;
 
        if (mxc_nf_info->mxc_version == MXC_VERSION_MX31) {
-               SREG = MX3_PCSR;
-               SEL_16BIT = MX3_PCSR_NF_16BIT_SEL;
-               SEL_FMS = MX3_PCSR_NF_FMS;
+               sreg = MX3_PCSR;
+               sel_16bit = MX3_PCSR_NF_16BIT_SEL;
+               sel_fms = MX3_PCSR_NF_FMS;
        } else if (mxc_nf_info->mxc_version == MXC_VERSION_MX25) {
-               SREG = MX25_RCSR;
-               SEL_16BIT = MX25_RCSR_NF_16BIT_SEL;
-               SEL_FMS = MX25_RCSR_NF_FMS;
+               sreg = MX25_RCSR;
+               sel_16bit = MX25_RCSR_NF_16BIT_SEL;
+               sel_fms = MX25_RCSR_NF_FMS;
        } else if (mxc_nf_info->mxc_version == MXC_VERSION_MX35) {
-               SREG = MX35_RCSR;
-               SEL_16BIT = MX35_RCSR_NF_16BIT_SEL;
-               SEL_FMS = MX35_RCSR_NF_FMS;
+               sreg = MX35_RCSR;
+               sel_16bit = MX35_RCSR_NF_16BIT_SEL;
+               sel_fms = MX35_RCSR_NF_FMS;
        }
 
-       target_read_u32(target, SREG, &sreg_content);
+       target_read_u32(target, sreg, &sreg_content);
        if (!nand->bus_width) {
                /* bus_width not yet defined. Read it from MXC_FMCR */
-               nand->bus_width = (sreg_content & SEL_16BIT) ? 16 : 8;
+               nand->bus_width = (sreg_content & sel_16bit) ? 16 : 8;
        } else {
                /* bus_width forced in soft. Sync it to MXC_FMCR */
-               sreg_content |= ((nand->bus_width == 16) ? SEL_16BIT : 0x00000000);
-               target_write_u32(target, SREG, sreg_content);
+               sreg_content |= ((nand->bus_width == 16) ? sel_16bit : 0x00000000);
+               target_write_u32(target, sreg, sreg_content);
        }
        if (nand->bus_width == 16)
                LOG_DEBUG("MXC_NF : bus is 16-bit width");
        else
                LOG_DEBUG("MXC_NF : bus is 8-bit width");
 
-       if (!nand->page_size) {
-               nand->page_size = (sreg_content & SEL_FMS) ? 2048 : 512;
-       else {
-               sreg_content |= ((nand->page_size == 2048) ? SEL_FMS : 0x00000000);
-               target_write_u32(target, SREG, sreg_content);
+       if (!nand->page_size)
+               nand->page_size = (sreg_content & sel_fms) ? 2048 : 512;
+       else {
+               sreg_content |= ((nand->page_size == 2048) ? sel_fms : 0x00000000);
+               target_write_u32(target, sreg, sreg_content);
        }
        if (mxc_nf_info->flags.one_kb_sram && (nand->page_size == 2048)) {
                LOG_ERROR("NAND controller have only 1 kb SRAM, so "
-                         "pagesize 2048 is incompatible with it");
-       } else {
+                       "pagesize 2048 is incompatible with it");
+       } else
                LOG_DEBUG("MXC_NF : NAND controller can handle pagesize of 2048");
-       }
 
        if (nfc_is_v2() && sreg_content & MX35_RCSR_NF_4K)
                LOG_ERROR("MXC driver does not have support for 4k pagesize.");
@@ -289,9 +271,8 @@ static int mxc_init(struct nand_device *nand)
        if (!(nand_status_content & 0x0080)) {
                LOG_INFO("NAND read-only");
                mxc_nf_info->flags.nand_readonly = 1;
-       } else {
+       } else
                mxc_nf_info->flags.nand_readonly = 0;
-       }
        return ERROR_OK;
 }
 
@@ -312,7 +293,7 @@ static int mxc_read_data(struct nand_device *nand, void *data)
        try_data_output_from_nand_chip = do_data_output(nand);
        if (try_data_output_from_nand_chip != ERROR_OK) {
                LOG_ERROR("mxc_read_data : read data failed : '%x'",
-                                 try_data_output_from_nand_chip);
+                       try_data_output_from_nand_chip);
                return try_data_output_from_nand_chip;
        }
 
@@ -357,26 +338,26 @@ static int mxc_command(struct nand_device *nand, uint8_t command)
                return validate_target_result;
 
        switch (command) {
-       case NAND_CMD_READOOB:
-               command = NAND_CMD_READ0;
-               /* set read point for data_read() and read_block_data() to
-                * spare area in SRAM buffer
-                */
-               if (nfc_is_v1())
-                       in_sram_address = MXC_NF_V1_SPARE_BUFFER0;
-               else
-                       in_sram_address = MXC_NF_V2_SPARE_BUFFER0;
-               break;
-       case NAND_CMD_READ1:
-               command = NAND_CMD_READ0;
-               /*
-                * offset == one half of page size
-                */
-               in_sram_address = MXC_NF_MAIN_BUFFER0 + (nand->page_size >> 1);
-               break;
-       default:
-               in_sram_address = MXC_NF_MAIN_BUFFER0;
-               break;
+               case NAND_CMD_READOOB:
+                       command = NAND_CMD_READ0;
+                       /* set read point for data_read() and read_block_data() to
+                        * spare area in SRAM buffer
+                        */
+                       if (nfc_is_v1())
+                               in_sram_address = MXC_NF_V1_SPARE_BUFFER0;
+                       else
+                               in_sram_address = MXC_NF_V2_SPARE_BUFFER0;
+                       break;
+               case NAND_CMD_READ1:
+                       command = NAND_CMD_READ0;
+                       /*
+                        * offset == one half of page size
+                        */
+                       in_sram_address = MXC_NF_MAIN_BUFFER0 + (nand->page_size >> 1);
+                       break;
+               default:
+                       in_sram_address = MXC_NF_MAIN_BUFFER0;
+                       break;
        }
 
        target_write_u16(target, MXC_NF_FCMD, command);
@@ -393,24 +374,24 @@ static int mxc_command(struct nand_device *nand, uint8_t command)
        sign_of_sequental_byte_read = 0;
        /* Handle special read command and adjust NF_CFG2(FDO) */
        switch (command) {
-       case NAND_CMD_READID:
-               mxc_nf_info->optype = MXC_NF_DATAOUT_NANDID;
-               mxc_nf_info->fin = MXC_NF_FIN_DATAOUT;
-               break;
-       case NAND_CMD_STATUS:
-               mxc_nf_info->optype = MXC_NF_DATAOUT_NANDSTATUS;
-               mxc_nf_info->fin = MXC_NF_FIN_DATAOUT;
-               target_write_u16 (target, MXC_NF_BUFADDR, 0);
-               in_sram_address = 0;
-               break;
-       case NAND_CMD_READ0:
-               mxc_nf_info->fin = MXC_NF_FIN_DATAOUT;
-               mxc_nf_info->optype = MXC_NF_DATAOUT_PAGE;
-               break;
-       default:
-               /* Ohter command use the default 'One page data out' FDO */
-               mxc_nf_info->optype = MXC_NF_DATAOUT_PAGE;
-               break;
+               case NAND_CMD_READID:
+                       mxc_nf_info->optype = MXC_NF_DATAOUT_NANDID;
+                       mxc_nf_info->fin = MXC_NF_FIN_DATAOUT;
+                       break;
+               case NAND_CMD_STATUS:
+                       mxc_nf_info->optype = MXC_NF_DATAOUT_NANDSTATUS;
+                       mxc_nf_info->fin = MXC_NF_FIN_DATAOUT;
+                       target_write_u16 (target, MXC_NF_BUFADDR, 0);
+                       in_sram_address = 0;
+                       break;
+               case NAND_CMD_READ0:
+                       mxc_nf_info->fin = MXC_NF_FIN_DATAOUT;
+                       mxc_nf_info->optype = MXC_NF_DATAOUT_PAGE;
+                       break;
+               default:
+                       /* Other command use the default 'One page data out' FDO */
+                       mxc_nf_info->optype = MXC_NF_DATAOUT_PAGE;
+                       break;
        }
        return ERROR_OK;
 }
@@ -460,14 +441,13 @@ static int mxc_nand_ready(struct nand_device *nand, int tout)
                        return tout;
 
                alive_sleep(1);
-       }
-       while (tout-- > 0);
+       } while (tout-- > 0);
        return tout;
 }
 
 static int mxc_write_page(struct nand_device *nand, uint32_t page,
-                                                       uint8_t *data, uint32_t data_size,
-                                                       uint8_t *oob, uint32_t oob_size)
+       uint8_t *data, uint32_t data_size,
+       uint8_t *oob, uint32_t oob_size)
 {
        struct mxc_nf_controller *mxc_nf_info = nand->controller_priv;
        struct target *target = nand->target;
@@ -501,21 +481,21 @@ static int mxc_write_page(struct nand_device *nand, uint32_t page,
        sign_of_sequental_byte_read = 0;
        retval = ERROR_OK;
        retval |= mxc_command(nand, NAND_CMD_SEQIN);
-       retval |= mxc_address(nand, 0); /* col */
-       retval |= mxc_address(nand, 0); /* col */
-       retval |= mxc_address(nand, page & 0xff); /* page address */
-       retval |= mxc_address(nand, (page >> 8) & 0xff); /* page address */
-       retval |= mxc_address(nand, (page >> 16) & 0xff); /* page address */
+       retval |= mxc_address(nand, 0); /* col */
+       retval |= mxc_address(nand, 0); /* col */
+       retval |= mxc_address(nand, page & 0xff);       /* page address */
+       retval |= mxc_address(nand, (page >> 8) & 0xff);/* page address */
+       retval |= mxc_address(nand, (page >> 16) & 0xff);       /* page address */
 
        target_write_buffer(target, MXC_NF_MAIN_BUFFER0, data_size, data);
        if (oob) {
                if (mxc_nf_info->flags.hw_ecc_enabled) {
                        /*
-                        * part of spare block will be overrided by hardware
+                        * part of spare block will be overridden by hardware
                         * ECC generator
                         */
-                       LOG_DEBUG("part of spare block will be overrided "
-                                 "by hardware ECC generator");
+                       LOG_DEBUG("part of spare block will be overridden "
+                               "by hardware ECC generator");
                }
                if (nfc_is_v1())
                        target_write_buffer(target, MXC_NF_V1_SPARE_BUFFER0, oob_size, oob);
@@ -538,12 +518,12 @@ static int mxc_write_page(struct nand_device *nand, uint32_t page,
                        LOG_ERROR("Due to NFC Bug, oob is not correctly implemented in mxc driver");
                        return ERROR_NAND_OPERATION_FAILED;
                }
-               swap2 = 0xffff;  /* Spare buffer unused forced to 0xffff */
+               swap2 = 0xffff; /* Spare buffer unused forced to 0xffff */
                new_swap1 = (swap1 & 0xFF00) | (swap2 >> 8);
                swap2 = (swap1 << 8) | (swap2 & 0xFF);
                target_write_u16(target, MXC_NF_MAIN_BUFFER3 + 464, new_swap1);
                if (nfc_is_v1())
-                       target_write_u16(target, MXC_NF_V1_SPARE_BUFFER3, swap2);
+                       target_write_u16(target, MXC_NF_V1_SPARE_BUFFER3 + 4, swap2);
                else
                        target_write_u16(target, MXC_NF_V2_SPARE_BUFFER3, swap2);
        }
@@ -556,7 +536,7 @@ static int mxc_write_page(struct nand_device *nand, uint32_t page,
        else
                bufs = 1;
 
-       for (uint8_t i = 0 ; i < bufs ; ++i) {
+       for (uint8_t i = 0; i < bufs; ++i) {
                target_write_u16(target, MXC_NF_BUFADDR, i);
                target_write_u16(target, MXC_NF_CFG2, MXC_NF_BIT_OP_FDI);
                poll_result = poll_for_complete_op(nand, "data input");
@@ -595,8 +575,8 @@ static int mxc_write_page(struct nand_device *nand, uint32_t page,
 }
 
 static int mxc_read_page(struct nand_device *nand, uint32_t page,
-                                                  uint8_t *data, uint32_t data_size,
-                                                  uint8_t *oob, uint32_t oob_size)
+       uint8_t *data, uint32_t data_size,
+       uint8_t *oob, uint32_t oob_size)
 {
        struct mxc_nf_controller *mxc_nf_info = nand->controller_priv;
        struct target *target = nand->target;
@@ -617,31 +597,37 @@ static int mxc_read_page(struct nand_device *nand, uint32_t page,
         * validate target state
         */
        retval = validate_target_state(nand);
-       if (retval != ERROR_OK) {
+       if (retval != ERROR_OK)
                return retval;
-       }
-       /* Reset address_cycles before mxc_command ?? */
+                               /* Reset address_cycles before mxc_command ?? */
        retval = mxc_command(nand, NAND_CMD_READ0);
-       if (retval != ERROR_OK) return retval;
-       retval = mxc_address(nand, 0); /* col */
-       if (retval != ERROR_OK) return retval;
-       retval = mxc_address(nand, 0); /* col */
-       if (retval != ERROR_OK) return retval;
-       retval = mxc_address(nand, page & 0xff); /* page address */
-       if (retval != ERROR_OK) return retval;
-       retval = mxc_address(nand, (page >> 8) & 0xff); /* page address */
-       if (retval != ERROR_OK) return retval;
-       retval = mxc_address(nand, (page >> 16) & 0xff); /* page address */
-       if (retval != ERROR_OK) return retval;
+       if (retval != ERROR_OK)
+               return retval;
+       retval = mxc_address(nand, 0);  /* col */
+       if (retval != ERROR_OK)
+               return retval;
+       retval = mxc_address(nand, 0);  /* col */
+       if (retval != ERROR_OK)
+               return retval;
+       retval = mxc_address(nand, page & 0xff);/* page address */
+       if (retval != ERROR_OK)
+               return retval;
+       retval = mxc_address(nand, (page >> 8) & 0xff); /* page address */
+       if (retval != ERROR_OK)
+               return retval;
+       retval = mxc_address(nand, (page >> 16) & 0xff);/* page address */
+       if (retval != ERROR_OK)
+               return retval;
        retval = mxc_command(nand, NAND_CMD_READSTART);
-       if (retval != ERROR_OK) return retval;
+       if (retval != ERROR_OK)
+               return retval;
 
        if (nfc_is_v1() && nand->page_size > 512)
                bufs = 4;
        else
                bufs = 1;
 
-       for (uint8_t i = 0 ; i < bufs ; ++i) {
+       for (uint8_t i = 0; i < bufs; ++i) {
                target_write_u16(target, MXC_NF_BUFADDR, i);
                mxc_nf_info->fin = MXC_NF_FIN_DATAOUT;
                retval = do_data_output(nand);
@@ -652,18 +638,18 @@ static int mxc_read_page(struct nand_device *nand, uint32_t page,
        }
 
        if (nand->page_size > 512 && mxc_nf_info->flags.biswap_enabled) {
-               uint32_t SPARE_BUFFER3;
+               uint32_t spare_buffer3;
                /* BI-swap -  work-around of mxc NFC for NAND device with page == 2k */
                target_read_u16(target, MXC_NF_MAIN_BUFFER3 + 464, &swap1);
                if (nfc_is_v1())
-                       SPARE_BUFFER3 = MXC_NF_V1_SPARE_BUFFER3;
+                       spare_buffer3 = MXC_NF_V1_SPARE_BUFFER3 + 4;
                else
-                       SPARE_BUFFER3 = MXC_NF_V2_SPARE_BUFFER3;
-               target_read_u16(target, SPARE_BUFFER3, &swap2);
+                       spare_buffer3 = MXC_NF_V2_SPARE_BUFFER3;
+               target_read_u16(target, spare_buffer3, &swap2);
                new_swap1 = (swap1 & 0xFF00) | (swap2 >> 8);
                swap2 = (swap1 << 8) | (swap2 & 0xFF);
                target_write_u16(target, MXC_NF_MAIN_BUFFER3 + 464, new_swap1);
-               target_write_u16(target, SPARE_BUFFER3, swap2);
+               target_write_u16(target, spare_buffer3, swap2);
        }
 
        if (data)
@@ -699,9 +685,9 @@ static uint32_t align_address_v2(struct nand_device *nand, uint32_t addr)
        struct mxc_nf_controller *mxc_nf_info = nand->controller_priv;
        uint32_t ret = addr;
        if (addr > MXC_NF_V2_SPARE_BUFFER0 &&
-          (addr & 0x1F) == MXC_NF_SPARE_BUFFER_LEN) {
+                       (addr & 0x1F) == MXC_NF_SPARE_BUFFER_LEN)
                ret += MXC_NF_SPARE_BUFFER_MAX - MXC_NF_SPARE_BUFFER_LEN;
-       else if (addr >= (mxc_nf_info->mxc_base_addr + (uint32_t)nand->page_size))
+       else if (addr >= (mxc_nf_info->mxc_base_addr + (uint32_t)nand->page_size))
                ret = MXC_NF_V2_SPARE_BUFFER0;
        return ret;
 }
@@ -713,7 +699,7 @@ static int initialize_nf_controller(struct nand_device *nand)
        uint16_t work_mode = 0;
        uint16_t temp;
        /*
-        * resets NAND flash controller in zero time ? I dont know.
+        * resets NAND flash controller in zero time ? I don't know.
         */
        target_write_u16(target, MXC_NF_CFG1, MXC_NF_BIT_RESET_EN);
        if (mxc_nf_info->mxc_version == MXC_VERSION_MX27)
@@ -722,16 +708,15 @@ static int initialize_nf_controller(struct nand_device *nand)
        if (target->endianness == TARGET_BIG_ENDIAN) {
                LOG_DEBUG("MXC_NF : work in Big Endian mode");
                work_mode |= MXC_NF_BIT_BE_EN;
-       } else {
+       } else
                LOG_DEBUG("MXC_NF : work in Little Endian mode");
-       }
        if (mxc_nf_info->flags.hw_ecc_enabled) {
                LOG_DEBUG("MXC_NF : work with ECC mode");
                work_mode |= MXC_NF_BIT_ECC_EN;
-       } else {
+       } else
                LOG_DEBUG("MXC_NF : work without ECC mode");
-       }
        if (nfc_is_v2()) {
+               target_write_u16(target, MXC_NF_V2_SPAS, OOB_SIZE / 2);
                if (nand->page_size) {
                        uint16_t pages_per_block = nand->erase_size / nand->page_size;
                        work_mode |= MXC_NF_V2_CFG1_PPB(ffs(pages_per_block) - 6);
@@ -784,7 +769,7 @@ static int get_next_byte_from_sram_buffer(struct nand_device *nand, uint8_t *val
 {
        struct mxc_nf_controller *mxc_nf_info = nand->controller_priv;
        struct target *target = nand->target;
-       static uint8_t even_byte = 0;
+       static uint8_t even_byte;
        uint16_t temp;
        /*
         * host-big_endian ??
@@ -792,8 +777,7 @@ static int get_next_byte_from_sram_buffer(struct nand_device *nand, uint8_t *val
        if (sign_of_sequental_byte_read == 0)
                even_byte = 0;
 
-       if (in_sram_address >
-               (nfc_is_v1() ? MXC_NF_V1_LAST_BUFFADDR : MXC_NF_V2_LAST_BUFFADDR)) {
+       if (in_sram_address > (nfc_is_v1() ? MXC_NF_V1_LAST_BUFFADDR : MXC_NF_V2_LAST_BUFFADDR)) {
                LOG_ERROR(sram_buffer_bounds_err_msg, in_sram_address);
                *value = 0;
                sign_of_sequental_byte_read = 0;
@@ -822,8 +806,7 @@ static int get_next_halfword_from_sram_buffer(struct nand_device *nand, uint16_t
        struct mxc_nf_controller *mxc_nf_info = nand->controller_priv;
        struct target *target = nand->target;
 
-       if (in_sram_address >
-               (nfc_is_v1() ? MXC_NF_V1_LAST_BUFFADDR : MXC_NF_V2_LAST_BUFFADDR)) {
+       if (in_sram_address > (nfc_is_v1() ? MXC_NF_V1_LAST_BUFFADDR : MXC_NF_V2_LAST_BUFFADDR)) {
                LOG_ERROR(sram_buffer_bounds_err_msg, in_sram_address);
                *value = 0;
                return ERROR_NAND_OPERATION_FAILED;
@@ -857,7 +840,7 @@ static int validate_target_state(struct nand_device *nand)
        }
 
        if (mxc_nf_info->flags.target_little_endian !=
-           (target->endianness == TARGET_LITTLE_ENDIAN)) {
+                       (target->endianness == TARGET_LITTLE_ENDIAN)) {
                /*
                 * endianness changed after NAND controller probed
                 */
@@ -866,7 +849,7 @@ static int validate_target_state(struct nand_device *nand)
        return ERROR_OK;
 }
 
-int ecc_status_v1(struct nand_device *nand)
+static int ecc_status_v1(struct nand_device *nand)
 {
        struct mxc_nf_controller *mxc_nf_info = nand->controller_priv;
        struct target *target = nand->target;
@@ -874,27 +857,25 @@ int ecc_status_v1(struct nand_device *nand)
 
        target_read_u16(target, MXC_NF_ECCSTATUS, &ecc_status);
        switch (ecc_status & 0x000c) {
-       case 1 << 2:
-               LOG_INFO("main area read with 1 (correctable) error");
-               break;
-       case 2 << 2:
-               LOG_INFO("main area read with more than 1 (incorrectable) error");
-               return ERROR_NAND_OPERATION_FAILED;
-               break;
+               case 1 << 2:
+                       LOG_INFO("main area read with 1 (correctable) error");
+                       break;
+               case 2 << 2:
+                       LOG_INFO("main area read with more than 1 (incorrectable) error");
+                       return ERROR_NAND_OPERATION_FAILED;
        }
        switch (ecc_status & 0x0003) {
-       case 1:
-               LOG_INFO("spare area read with 1 (correctable) error");
-               break;
-       case 2:
-               LOG_INFO("main area read with more than 1 (incorrectable) error");
-               return ERROR_NAND_OPERATION_FAILED;
-               break;
+               case 1:
+                       LOG_INFO("spare area read with 1 (correctable) error");
+                       break;
+               case 2:
+                       LOG_INFO("main area read with more than 1 (incorrectable) error");
+                       return ERROR_NAND_OPERATION_FAILED;
        }
        return ERROR_OK;
 }
 
-int ecc_status_v2(struct nand_device *nand)
+static int ecc_status_v2(struct nand_device *nand)
 {
        struct mxc_nf_controller *mxc_nf_info = nand->controller_priv;
        struct target *target = nand->target;
@@ -923,47 +904,46 @@ static int do_data_output(struct nand_device *nand)
        struct target *target = nand->target;
        int poll_result;
        switch (mxc_nf_info->fin) {
-       case MXC_NF_FIN_DATAOUT:
-               /*
-                * start data output operation (set MXC_NF_BIT_OP_DONE==0)
-                */
-               target_write_u16(target, MXC_NF_CFG2, MXC_NF_BIT_DATAOUT_TYPE(mxc_nf_info->optype));
-               poll_result = poll_for_complete_op(nand, "data output");
-               if (poll_result != ERROR_OK)
-                       return poll_result;
+               case MXC_NF_FIN_DATAOUT:
+                       /*
+                        * start data output operation (set MXC_NF_BIT_OP_DONE==0)
+                        */
+                       target_write_u16(target, MXC_NF_CFG2, MXC_NF_BIT_DATAOUT_TYPE(mxc_nf_info->optype));
+                       poll_result = poll_for_complete_op(nand, "data output");
+                       if (poll_result != ERROR_OK)
+                               return poll_result;
 
-               mxc_nf_info->fin = MXC_NF_FIN_NONE;
-               /*
-                * ECC stuff
-                */
-               if (mxc_nf_info->optype == MXC_NF_DATAOUT_PAGE &&
-                       mxc_nf_info->flags.hw_ecc_enabled) {
-                       int ecc_status;
-                       if (nfc_is_v1())
-                               ecc_status = ecc_status_v1(nand);
-                       else
-                               ecc_status = ecc_status_v2(nand);
-                       if (ecc_status != ERROR_OK)
-                               return ecc_status;
-               }
-               break;
-       case MXC_NF_FIN_NONE:
-               break;
+                       mxc_nf_info->fin = MXC_NF_FIN_NONE;
+                       /*
+                        * ECC stuff
+                        */
+                       if (mxc_nf_info->optype == MXC_NF_DATAOUT_PAGE && mxc_nf_info->flags.hw_ecc_enabled) {
+                               int ecc_status;
+                               if (nfc_is_v1())
+                                       ecc_status = ecc_status_v1(nand);
+                               else
+                                       ecc_status = ecc_status_v2(nand);
+                               if (ecc_status != ERROR_OK)
+                                       return ecc_status;
+                       }
+                       break;
+               case MXC_NF_FIN_NONE:
+                       break;
        }
        return ERROR_OK;
 }
 
 struct nand_flash_controller mxc_nand_flash_controller = {
-       .name                                   = "mxc",
-       .nand_device_command    = &mxc_nand_device_command,
-       .commands                               = mxc_nand_command_handler,
-       .init                                   = &mxc_init,
-       .reset                                  = &mxc_reset,
-       .command                                = &mxc_command,
-       .address                                = &mxc_address,
-       .write_data                             = &mxc_write_data,
-       .read_data                              = &mxc_read_data,
-       .write_page                             = &mxc_write_page,
-       .read_page                              = &mxc_read_page,
-       .nand_ready                             = &mxc_nand_ready,
+       .name = "mxc",
+       .nand_device_command = &mxc_nand_device_command,
+       .commands = mxc_nand_command_handler,
+       .init = &mxc_init,
+       .reset = &mxc_reset,
+       .command = &mxc_command,
+       .address = &mxc_address,
+       .write_data = &mxc_write_data,
+       .read_data = &mxc_read_data,
+       .write_page = &mxc_write_page,
+       .read_page = &mxc_read_page,
+       .nand_ready = &mxc_nand_ready,
 };