nand/denali: Fixed probe function bugs
[pandora-kernel.git] / drivers / mtd / nand / denali.c
index 52278d8..ab960ef 100644 (file)
@@ -21,6 +21,7 @@
 #include <linux/delay.h>
 #include <linux/wait.h>
 #include <linux/mutex.h>
+#include <linux/slab.h>
 #include <linux/pci.h>
 #include <linux/mtd/mtd.h>
 #include <linux/module.h>
@@ -221,7 +222,7 @@ static void reset_bank(struct denali_nand_info *denali)
 }
 
 /* Reset the flash controller */
-static uint16_t NAND_Flash_Reset(struct denali_nand_info *denali)
+static uint16_t denali_nand_reset(struct denali_nand_info *denali)
 {
        uint32_t i;
 
@@ -256,7 +257,7 @@ static uint16_t NAND_Flash_Reset(struct denali_nand_info *denali)
  * programs the clocking register accordingly. The mode is determined by
  * the get_onfi_nand_para routine.
  */
-static void NAND_ONFi_Timing_Mode(struct denali_nand_info *denali,
+static void nand_onfi_timing_set(struct denali_nand_info *denali,
                                                                uint16_t mode)
 {
        uint16_t Trea[6] = {40, 30, 25, 20, 20, 16};
@@ -354,129 +355,13 @@ static void NAND_ONFi_Timing_Mode(struct denali_nand_info *denali,
        denali_write32(cs_cnt, denali->flash_reg + CS_SETUP_CNT);
 }
 
-/* configures the initial ECC settings for the controller */
-static void set_ecc_config(struct denali_nand_info *denali)
-{
-#if SUPPORT_8BITECC
-       if ((ioread32(denali->flash_reg + DEVICE_MAIN_AREA_SIZE) < 4096) ||
-               (ioread32(denali->flash_reg + DEVICE_SPARE_AREA_SIZE) <= 128))
-               denali_write32(8, denali->flash_reg + ECC_CORRECTION);
-#endif
-
-       if ((ioread32(denali->flash_reg + ECC_CORRECTION) &
-                               ECC_CORRECTION__VALUE) == 1) {
-               denali->dev_info.wECCBytesPerSector = 4;
-               denali->dev_info.wECCBytesPerSector *=
-                       denali->dev_info.wDevicesConnected;
-               denali->dev_info.wNumPageSpareFlag =
-                       denali->dev_info.wPageSpareSize -
-                       denali->dev_info.wPageDataSize /
-                       (ECC_SECTOR_SIZE * denali->dev_info.wDevicesConnected) *
-                       denali->dev_info.wECCBytesPerSector
-                       - denali->dev_info.wSpareSkipBytes;
-       } else {
-               denali->dev_info.wECCBytesPerSector =
-                       (ioread32(denali->flash_reg + ECC_CORRECTION) &
-                       ECC_CORRECTION__VALUE) * 13 / 8;
-               if ((denali->dev_info.wECCBytesPerSector) % 2 == 0)
-                       denali->dev_info.wECCBytesPerSector += 2;
-               else
-                       denali->dev_info.wECCBytesPerSector += 1;
-
-               denali->dev_info.wECCBytesPerSector *=
-                       denali->dev_info.wDevicesConnected;
-               denali->dev_info.wNumPageSpareFlag =
-                       denali->dev_info.wPageSpareSize -
-                       denali->dev_info.wPageDataSize /
-                       (ECC_SECTOR_SIZE * denali->dev_info.wDevicesConnected) *
-                       denali->dev_info.wECCBytesPerSector
-                       - denali->dev_info.wSpareSkipBytes;
-       }
-}
-
 /* queries the NAND device to see what ONFI modes it supports. */
 static uint16_t get_onfi_nand_para(struct denali_nand_info *denali)
 {
        int i;
-       uint16_t blks_lun_l, blks_lun_h, n_of_luns;
-       uint32_t blockperlun, id;
-
-       denali_write32(DEVICE_RESET__BANK0, denali->flash_reg + DEVICE_RESET);
-
-       while (!((ioread32(denali->flash_reg + INTR_STATUS0) &
-                       INTR_STATUS0__RST_COMP) |
-                       (ioread32(denali->flash_reg + INTR_STATUS0) &
-                       INTR_STATUS0__TIME_OUT)))
-               ;
-
-       if (ioread32(denali->flash_reg + INTR_STATUS0) &
-                       INTR_STATUS0__RST_COMP) {
-               denali_write32(DEVICE_RESET__BANK1,
-                               denali->flash_reg + DEVICE_RESET);
-               while (!((ioread32(denali->flash_reg + INTR_STATUS1) &
-                       INTR_STATUS1__RST_COMP) |
-                       (ioread32(denali->flash_reg + INTR_STATUS1) &
-                       INTR_STATUS1__TIME_OUT)))
-                       ;
-
-               if (ioread32(denali->flash_reg + INTR_STATUS1) &
-                       INTR_STATUS1__RST_COMP) {
-                       denali_write32(DEVICE_RESET__BANK2,
-                               denali->flash_reg + DEVICE_RESET);
-                       while (!((ioread32(denali->flash_reg + INTR_STATUS2) &
-                               INTR_STATUS2__RST_COMP) |
-                               (ioread32(denali->flash_reg + INTR_STATUS2) &
-                               INTR_STATUS2__TIME_OUT)))
-                               ;
-
-                       if (ioread32(denali->flash_reg + INTR_STATUS2) &
-                               INTR_STATUS2__RST_COMP) {
-                               denali_write32(DEVICE_RESET__BANK3,
-                                       denali->flash_reg + DEVICE_RESET);
-                               while (!((ioread32(denali->flash_reg +
-                                               INTR_STATUS3) &
-                                               INTR_STATUS3__RST_COMP) |
-                                               (ioread32(denali->flash_reg +
-                                               INTR_STATUS3) &
-                                               INTR_STATUS3__TIME_OUT)))
-                                       ;
-                       } else {
-                               printk(KERN_ERR "Getting a time out for bank 2!\n");
-                       }
-               } else {
-                       printk(KERN_ERR "Getting a time out for bank 1!\n");
-               }
-       }
-
-       denali_write32(INTR_STATUS0__TIME_OUT,
-                       denali->flash_reg + INTR_STATUS0);
-       denali_write32(INTR_STATUS1__TIME_OUT,
-                       denali->flash_reg + INTR_STATUS1);
-       denali_write32(INTR_STATUS2__TIME_OUT,
-                       denali->flash_reg + INTR_STATUS2);
-       denali_write32(INTR_STATUS3__TIME_OUT,
-                       denali->flash_reg + INTR_STATUS3);
-
-       denali->dev_info.wONFIDevFeatures =
-               ioread32(denali->flash_reg + ONFI_DEVICE_FEATURES);
-       denali->dev_info.wONFIOptCommands =
-               ioread32(denali->flash_reg + ONFI_OPTIONAL_COMMANDS);
-       denali->dev_info.wONFITimingMode =
-               ioread32(denali->flash_reg + ONFI_TIMING_MODE);
-       denali->dev_info.wONFIPgmCacheTimingMode =
-               ioread32(denali->flash_reg + ONFI_PGM_CACHE_TIMING_MODE);
-
-       n_of_luns = ioread32(denali->flash_reg + ONFI_DEVICE_NO_OF_LUNS) &
-               ONFI_DEVICE_NO_OF_LUNS__NO_OF_LUNS;
-       blks_lun_l = ioread32(denali->flash_reg +
-                               ONFI_DEVICE_NO_OF_BLOCKS_PER_LUN_L);
-       blks_lun_h = ioread32(denali->flash_reg +
-                               ONFI_DEVICE_NO_OF_BLOCKS_PER_LUN_U);
-
-       blockperlun = (blks_lun_h << 16) | blks_lun_l;
-
-       denali->dev_info.wTotalBlocks = n_of_luns * blockperlun;
-
+       /* we needn't to do a reset here because driver has already
+        * reset all the banks before
+        * */
        if (!(ioread32(denali->flash_reg + ONFI_TIMING_MODE) &
                ONFI_TIMING_MODE__VALUE))
                return FAIL;
@@ -487,17 +372,7 @@ static uint16_t get_onfi_nand_para(struct denali_nand_info *denali)
                        break;
        }
 
-       NAND_ONFi_Timing_Mode(denali, i);
-
-       index_addr(denali, MODE_11 | 0, 0x90);
-       index_addr(denali, MODE_11 | 1, 0);
-
-       for (i = 0; i < 3; i++)
-               index_addr_read_data(denali, MODE_11 | 2, &id);
-
-       nand_dbg_print(NAND_DBG_DEBUG, "3rd ID: 0x%x\n", id);
-
-       denali->dev_info.MLCDevice = id & 0x0C;
+       nand_onfi_timing_set(denali, i);
 
        /* By now, all the ONFI devices we know support the page cache */
        /* rw feature. So here we enable the pipeline_rw_ahead feature */
@@ -507,26 +382,10 @@ static uint16_t get_onfi_nand_para(struct denali_nand_info *denali)
        return PASS;
 }
 
-static void get_samsung_nand_para(struct denali_nand_info *denali)
+static void get_samsung_nand_para(struct denali_nand_info *denali,
+                                                       uint8_t device_id)
 {
-       uint8_t no_of_planes;
-       uint32_t blk_size;
-       uint64_t plane_size, capacity;
-       uint32_t id_bytes[5];
-       int i;
-
-       index_addr(denali, (uint32_t)(MODE_11 | 0), 0x90);
-       index_addr(denali, (uint32_t)(MODE_11 | 1), 0);
-       for (i = 0; i < 5; i++)
-               index_addr_read_data(denali, (uint32_t)(MODE_11 | 2),
-                                                       &id_bytes[i]);
-
-       nand_dbg_print(NAND_DBG_DEBUG,
-               "ID bytes: 0x%x, 0x%x, 0x%x, 0x%x, 0x%x\n",
-               id_bytes[0], id_bytes[1], id_bytes[2],
-               id_bytes[3], id_bytes[4]);
-
-       if ((id_bytes[1] & 0xff) == 0xd3) { /* Samsung K9WAG08U1A */
+       if (device_id == 0xd3) { /* Samsung K9WAG08U1A */
                /* Set timing register values according to datasheet */
                denali_write32(5, denali->flash_reg + ACC_CLKS);
                denali_write32(20, denali->flash_reg + RE_2_WE);
@@ -536,20 +395,10 @@ static void get_samsung_nand_para(struct denali_nand_info *denali)
                denali_write32(2, denali->flash_reg + RDWR_EN_HI_CNT);
                denali_write32(2, denali->flash_reg + CS_SETUP_CNT);
        }
-
-       no_of_planes = 1 << ((id_bytes[4] & 0x0c) >> 2);
-       plane_size  = (uint64_t)64 << ((id_bytes[4] & 0x70) >> 4);
-       blk_size = 64 << ((ioread32(denali->flash_reg + DEVICE_PARAM_1) &
-                                       0x30) >> 4);
-       capacity = (uint64_t)128 * plane_size * no_of_planes;
-
-       do_div(capacity, blk_size);
-       denali->dev_info.wTotalBlocks = capacity;
 }
 
 static void get_toshiba_nand_para(struct denali_nand_info *denali)
 {
-       void __iomem *scratch_reg;
        uint32_t tmp;
 
        /* Workaround to fix a controller bug which reports a wrong */
@@ -567,33 +416,14 @@ static void get_toshiba_nand_para(struct denali_nand_info *denali)
                denali_write32(8, denali->flash_reg + ECC_CORRECTION);
 #endif
        }
-
-       /* As Toshiba NAND can not provide it's block number, */
-       /* so here we need user to provide the correct block */
-       /* number in a scratch register before the Linux NAND */
-       /* driver is loaded. If no valid value found in the scratch */
-       /* register, then we use default block number value */
-       scratch_reg = ioremap_nocache(SCRATCH_REG_ADDR, SCRATCH_REG_SIZE);
-       if (!scratch_reg) {
-               printk(KERN_ERR "Spectra: ioremap failed in %s, Line %d",
-                       __FILE__, __LINE__);
-               denali->dev_info.wTotalBlocks = GLOB_HWCTL_DEFAULT_BLKS;
-       } else {
-               nand_dbg_print(NAND_DBG_WARN,
-                       "Spectra: ioremap reg address: 0x%p\n", scratch_reg);
-               denali->dev_info.wTotalBlocks = 1 << ioread8(scratch_reg);
-               if (denali->dev_info.wTotalBlocks < 512)
-                       denali->dev_info.wTotalBlocks = GLOB_HWCTL_DEFAULT_BLKS;
-               iounmap(scratch_reg);
-       }
 }
 
-static void get_hynix_nand_para(struct denali_nand_info *denali)
+static void get_hynix_nand_para(struct denali_nand_info *denali,
+                                                       uint8_t device_id)
 {
-       void __iomem *scratch_reg;
        uint32_t main_size, spare_size;
 
-       switch (denali->dev_info.wDeviceID) {
+       switch (device_id) {
        case 0xD5: /* Hynix H27UAG8T2A, H27UBG8U5A or H27UCG8VFA */
        case 0xD7: /* Hynix H27UDG8VEM, H27UCG8UDM or H27UCG8V5A */
                denali_write32(128, denali->flash_reg + PAGES_PER_BLOCK);
@@ -613,27 +443,12 @@ static void get_hynix_nand_para(struct denali_nand_info *denali)
 #elif SUPPORT_8BITECC
                denali_write32(8, denali->flash_reg + ECC_CORRECTION);
 #endif
-               denali->dev_info.MLCDevice  = 1;
                break;
        default:
                nand_dbg_print(NAND_DBG_WARN,
                        "Spectra: Unknown Hynix NAND (Device ID: 0x%x)."
                        "Will use default parameter values instead.\n",
-                       denali->dev_info.wDeviceID);
-       }
-
-       scratch_reg = ioremap_nocache(SCRATCH_REG_ADDR, SCRATCH_REG_SIZE);
-       if (!scratch_reg) {
-               printk(KERN_ERR "Spectra: ioremap failed in %s, Line %d",
-                       __FILE__, __LINE__);
-               denali->dev_info.wTotalBlocks = GLOB_HWCTL_DEFAULT_BLKS;
-       } else {
-               nand_dbg_print(NAND_DBG_WARN,
-                       "Spectra: ioremap reg address: 0x%p\n", scratch_reg);
-               denali->dev_info.wTotalBlocks = 1 << ioread8(scratch_reg);
-               if (denali->dev_info.wTotalBlocks < 512)
-                       denali->dev_info.wTotalBlocks = GLOB_HWCTL_DEFAULT_BLKS;
-               iounmap(scratch_reg);
+                       device_id);
        }
 }
 
@@ -683,160 +498,60 @@ static void find_valid_banks(struct denali_nand_info *denali)
 
 static void detect_partition_feature(struct denali_nand_info *denali)
 {
+       /* For MRST platform, denali->fwblks represent the
+        * number of blocks firmware is taken,
+        * FW is in protect partition and MTD driver has no
+        * permission to access it. So let driver know how many
+        * blocks it can't touch.
+        * */
        if (ioread32(denali->flash_reg + FEATURES) & FEATURES__PARTITION) {
                if ((ioread32(denali->flash_reg + PERM_SRC_ID_1) &
                        PERM_SRC_ID_1__SRCID) == SPECTRA_PARTITION_ID) {
-                       denali->dev_info.wSpectraStartBlock =
+                       denali->fwblks =
                            ((ioread32(denali->flash_reg + MIN_MAX_BANK_1) &
                              MIN_MAX_BANK_1__MIN_VALUE) *
-                            denali->dev_info.wTotalBlocks)
+                            denali->blksperchip)
                            +
                            (ioread32(denali->flash_reg + MIN_BLK_ADDR_1) &
                            MIN_BLK_ADDR_1__VALUE);
-
-                       denali->dev_info.wSpectraEndBlock =
-                           (((ioread32(denali->flash_reg + MIN_MAX_BANK_1) &
-                              MIN_MAX_BANK_1__MAX_VALUE) >> 2) *
-                            denali->dev_info.wTotalBlocks)
-                           +
-                           (ioread32(denali->flash_reg + MAX_BLK_ADDR_1) &
-                           MAX_BLK_ADDR_1__VALUE);
-
-                       denali->dev_info.wTotalBlocks *=
-                               denali->total_used_banks;
-
-                       if (denali->dev_info.wSpectraEndBlock >=
-                           denali->dev_info.wTotalBlocks) {
-                               denali->dev_info.wSpectraEndBlock =
-                                   denali->dev_info.wTotalBlocks - 1;
-                       }
-
-                       denali->dev_info.wDataBlockNum =
-                               denali->dev_info.wSpectraEndBlock -
-                               denali->dev_info.wSpectraStartBlock + 1;
-               } else {
-                       denali->dev_info.wTotalBlocks *=
-                               denali->total_used_banks;
-                       denali->dev_info.wSpectraStartBlock =
-                               SPECTRA_START_BLOCK;
-                       denali->dev_info.wSpectraEndBlock =
-                               denali->dev_info.wTotalBlocks - 1;
-                       denali->dev_info.wDataBlockNum =
-                               denali->dev_info.wSpectraEndBlock -
-                               denali->dev_info.wSpectraStartBlock + 1;
-               }
-       } else {
-               denali->dev_info.wTotalBlocks *= denali->total_used_banks;
-               denali->dev_info.wSpectraStartBlock = SPECTRA_START_BLOCK;
-               denali->dev_info.wSpectraEndBlock =
-                       denali->dev_info.wTotalBlocks - 1;
-               denali->dev_info.wDataBlockNum =
-                       denali->dev_info.wSpectraEndBlock -
-                       denali->dev_info.wSpectraStartBlock + 1;
-       }
+               } else
+                       denali->fwblks = SPECTRA_START_BLOCK;
+       } else
+               denali->fwblks = SPECTRA_START_BLOCK;
 }
 
-static void dump_device_info(struct denali_nand_info *denali)
-{
-       nand_dbg_print(NAND_DBG_DEBUG, "denali->dev_info:\n");
-       nand_dbg_print(NAND_DBG_DEBUG, "DeviceMaker: 0x%x\n",
-               denali->dev_info.wDeviceMaker);
-       nand_dbg_print(NAND_DBG_DEBUG, "DeviceID: 0x%x\n",
-               denali->dev_info.wDeviceID);
-       nand_dbg_print(NAND_DBG_DEBUG, "DeviceType: 0x%x\n",
-               denali->dev_info.wDeviceType);
-       nand_dbg_print(NAND_DBG_DEBUG, "SpectraStartBlock: %d\n",
-               denali->dev_info.wSpectraStartBlock);
-       nand_dbg_print(NAND_DBG_DEBUG, "SpectraEndBlock: %d\n",
-               denali->dev_info.wSpectraEndBlock);
-       nand_dbg_print(NAND_DBG_DEBUG, "TotalBlocks: %d\n",
-               denali->dev_info.wTotalBlocks);
-       nand_dbg_print(NAND_DBG_DEBUG, "PagesPerBlock: %d\n",
-               denali->dev_info.wPagesPerBlock);
-       nand_dbg_print(NAND_DBG_DEBUG, "PageSize: %d\n",
-               denali->dev_info.wPageSize);
-       nand_dbg_print(NAND_DBG_DEBUG, "PageDataSize: %d\n",
-               denali->dev_info.wPageDataSize);
-       nand_dbg_print(NAND_DBG_DEBUG, "PageSpareSize: %d\n",
-               denali->dev_info.wPageSpareSize);
-       nand_dbg_print(NAND_DBG_DEBUG, "NumPageSpareFlag: %d\n",
-               denali->dev_info.wNumPageSpareFlag);
-       nand_dbg_print(NAND_DBG_DEBUG, "ECCBytesPerSector: %d\n",
-               denali->dev_info.wECCBytesPerSector);
-       nand_dbg_print(NAND_DBG_DEBUG, "BlockSize: %d\n",
-               denali->dev_info.wBlockSize);
-       nand_dbg_print(NAND_DBG_DEBUG, "BlockDataSize: %d\n",
-               denali->dev_info.wBlockDataSize);
-       nand_dbg_print(NAND_DBG_DEBUG, "DataBlockNum: %d\n",
-               denali->dev_info.wDataBlockNum);
-       nand_dbg_print(NAND_DBG_DEBUG, "PlaneNum: %d\n",
-               denali->dev_info.bPlaneNum);
-       nand_dbg_print(NAND_DBG_DEBUG, "DeviceMainAreaSize: %d\n",
-               denali->dev_info.wDeviceMainAreaSize);
-       nand_dbg_print(NAND_DBG_DEBUG, "DeviceSpareAreaSize: %d\n",
-               denali->dev_info.wDeviceSpareAreaSize);
-       nand_dbg_print(NAND_DBG_DEBUG, "DevicesConnected: %d\n",
-               denali->dev_info.wDevicesConnected);
-       nand_dbg_print(NAND_DBG_DEBUG, "DeviceWidth: %d\n",
-               denali->dev_info.wDeviceWidth);
-       nand_dbg_print(NAND_DBG_DEBUG, "HWRevision: 0x%x\n",
-               denali->dev_info.wHWRevision);
-       nand_dbg_print(NAND_DBG_DEBUG, "HWFeatures: 0x%x\n",
-               denali->dev_info.wHWFeatures);
-       nand_dbg_print(NAND_DBG_DEBUG, "ONFIDevFeatures: 0x%x\n",
-               denali->dev_info.wONFIDevFeatures);
-       nand_dbg_print(NAND_DBG_DEBUG, "ONFIOptCommands: 0x%x\n",
-               denali->dev_info.wONFIOptCommands);
-       nand_dbg_print(NAND_DBG_DEBUG, "ONFITimingMode: 0x%x\n",
-               denali->dev_info.wONFITimingMode);
-       nand_dbg_print(NAND_DBG_DEBUG, "ONFIPgmCacheTimingMode: 0x%x\n",
-               denali->dev_info.wONFIPgmCacheTimingMode);
-       nand_dbg_print(NAND_DBG_DEBUG, "MLCDevice: %s\n",
-               denali->dev_info.MLCDevice ? "Yes" : "No");
-       nand_dbg_print(NAND_DBG_DEBUG, "SpareSkipBytes: %d\n",
-               denali->dev_info.wSpareSkipBytes);
-       nand_dbg_print(NAND_DBG_DEBUG, "BitsInPageNumber: %d\n",
-               denali->dev_info.nBitsInPageNumber);
-       nand_dbg_print(NAND_DBG_DEBUG, "BitsInPageDataSize: %d\n",
-               denali->dev_info.nBitsInPageDataSize);
-       nand_dbg_print(NAND_DBG_DEBUG, "BitsInBlockDataSize: %d\n",
-               denali->dev_info.nBitsInBlockDataSize);
-}
-
-static uint16_t NAND_Read_Device_ID(struct denali_nand_info *denali)
+static uint16_t denali_nand_timing_set(struct denali_nand_info *denali)
 {
        uint16_t status = PASS;
-       uint8_t no_of_planes;
+       uint32_t id_bytes[5], addr;
+       uint8_t i, maf_id, device_id;
 
        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
                       __FILE__, __LINE__, __func__);
 
-       denali->dev_info.wDeviceMaker =
-               ioread32(denali->flash_reg + MANUFACTURER_ID);
-       denali->dev_info.wDeviceID =
-               ioread32(denali->flash_reg + DEVICE_ID);
-       denali->dev_info.bDeviceParam0 =
-               ioread32(denali->flash_reg + DEVICE_PARAM_0);
-       denali->dev_info.bDeviceParam1 =
-               ioread32(denali->flash_reg + DEVICE_PARAM_1);
-       denali->dev_info.bDeviceParam2 =
-               ioread32(denali->flash_reg + DEVICE_PARAM_2);
-
-       denali->dev_info.MLCDevice =
-               ioread32(denali->flash_reg + DEVICE_PARAM_0) & 0x0c;
+       /* Use read id method to get device ID and other
+        * params. For some NAND chips, controller can't
+        * report the correct device ID by reading from
+        * DEVICE_ID register
+        * */
+       addr = (uint32_t)MODE_11 | BANK(denali->flash_bank);
+       index_addr(denali, (uint32_t)addr | 0, 0x90);
+       index_addr(denali, (uint32_t)addr | 1, 0);
+       for (i = 0; i < 5; i++)
+               index_addr_read_data(denali, addr | 2, &id_bytes[i]);
+       maf_id = id_bytes[0];
+       device_id = id_bytes[1];
 
        if (ioread32(denali->flash_reg + ONFI_DEVICE_NO_OF_LUNS) &
                ONFI_DEVICE_NO_OF_LUNS__ONFI_DEVICE) { /* ONFI 1.0 NAND */
                if (FAIL == get_onfi_nand_para(denali))
                        return FAIL;
-       } else if (denali->dev_info.wDeviceMaker == 0xEC) { /* Samsung NAND */
-               get_samsung_nand_para(denali);
-       } else if (denali->dev_info.wDeviceMaker == 0x98) { /* Toshiba NAND */
+       } else if (maf_id == 0xEC) { /* Samsung NAND */
+               get_samsung_nand_para(denali, device_id);
+       } else if (maf_id == 0x98) { /* Toshiba NAND */
                get_toshiba_nand_para(denali);
-       } else if (denali->dev_info.wDeviceMaker == 0xAD) { /* Hynix NAND */
-               get_hynix_nand_para(denali);
-       } else {
-               denali->dev_info.wTotalBlocks = GLOB_HWCTL_DEFAULT_BLKS;
+       } else if (maf_id == 0xAD) { /* Hynix NAND */
+               get_hynix_nand_para(denali, device_id);
        }
 
        nand_dbg_print(NAND_DBG_DEBUG, "Dump timing register values:"
@@ -851,89 +566,20 @@ static uint16_t NAND_Read_Device_ID(struct denali_nand_info *denali)
                        ioread32(denali->flash_reg + RDWR_EN_HI_CNT),
                        ioread32(denali->flash_reg + CS_SETUP_CNT));
 
-       denali->dev_info.wHWRevision = ioread32(denali->flash_reg + REVISION);
-       denali->dev_info.wHWFeatures = ioread32(denali->flash_reg + FEATURES);
-
-       denali->dev_info.wDeviceMainAreaSize =
-               ioread32(denali->flash_reg + DEVICE_MAIN_AREA_SIZE);
-       denali->dev_info.wDeviceSpareAreaSize =
-               ioread32(denali->flash_reg + DEVICE_SPARE_AREA_SIZE);
-
-       denali->dev_info.wPageDataSize =
-               ioread32(denali->flash_reg + LOGICAL_PAGE_DATA_SIZE);
-
-       /* Note: When using the Micon 4K NAND device, the controller will report
-        * Page Spare Size as 216 bytes. But Micron's Spec say it's 218 bytes.
-        * And if force set it to 218 bytes, the controller can not work
-        * correctly. So just let it be. But keep in mind that this bug may
-        * cause
-        * other problems in future.       - Yunpeng  2008-10-10
-        */
-       denali->dev_info.wPageSpareSize =
-               ioread32(denali->flash_reg + LOGICAL_PAGE_SPARE_SIZE);
-
-       denali->dev_info.wPagesPerBlock =
-               ioread32(denali->flash_reg + PAGES_PER_BLOCK);
-
-       denali->dev_info.wPageSize =
-           denali->dev_info.wPageDataSize + denali->dev_info.wPageSpareSize;
-       denali->dev_info.wBlockSize =
-           denali->dev_info.wPageSize * denali->dev_info.wPagesPerBlock;
-       denali->dev_info.wBlockDataSize =
-           denali->dev_info.wPagesPerBlock * denali->dev_info.wPageDataSize;
-
-       denali->dev_info.wDeviceWidth =
-               ioread32(denali->flash_reg + DEVICE_WIDTH);
-       denali->dev_info.wDeviceType =
-               ((ioread32(denali->flash_reg + DEVICE_WIDTH) > 0) ? 16 : 8);
-
-       denali->dev_info.wDevicesConnected =
-               ioread32(denali->flash_reg + DEVICES_CONNECTED);
-
-       denali->dev_info.wSpareSkipBytes =
-               ioread32(denali->flash_reg + SPARE_AREA_SKIP_BYTES) *
-               denali->dev_info.wDevicesConnected;
-
-       denali->dev_info.nBitsInPageNumber =
-               ilog2(denali->dev_info.wPagesPerBlock);
-       denali->dev_info.nBitsInPageDataSize =
-               ilog2(denali->dev_info.wPageDataSize);
-       denali->dev_info.nBitsInBlockDataSize =
-               ilog2(denali->dev_info.wBlockDataSize);
-
-       set_ecc_config(denali);
-
-       no_of_planes = ioread32(denali->flash_reg + NUMBER_OF_PLANES) &
-               NUMBER_OF_PLANES__VALUE;
-
-       switch (no_of_planes) {
-       case 0:
-       case 1:
-       case 3:
-       case 7:
-               denali->dev_info.bPlaneNum = no_of_planes + 1;
-               break;
-       default:
-               status = FAIL;
-               break;
-       }
-
        find_valid_banks(denali);
 
        detect_partition_feature(denali);
 
-       dump_device_info(denali);
-
        /* If the user specified to override the default timings
         * with a specific ONFI mode, we apply those changes here.
         */
        if (onfi_timing_mode != NAND_DEFAULT_TIMINGS)
-               NAND_ONFi_Timing_Mode(denali, onfi_timing_mode);
+               nand_onfi_timing_set(denali, onfi_timing_mode);
 
        return status;
 }
 
-static void NAND_LLD_Enable_Disable_Interrupts(struct denali_nand_info *denali,
+static void denali_set_intr_modes(struct denali_nand_info *denali,
                                        uint16_t INT_ENABLE)
 {
        nand_dbg_print(NAND_DBG_TRACE, "%s, Line %d, Function: %s\n",
@@ -958,7 +604,7 @@ static void denali_irq_init(struct denali_nand_info *denali)
        uint32_t int_mask = 0;
 
        /* Disable global interrupts */
-       NAND_LLD_Enable_Disable_Interrupts(denali, false);
+       denali_set_intr_modes(denali, false);
 
        int_mask = DENALI_IRQ_ALL;
 
@@ -973,7 +619,7 @@ static void denali_irq_init(struct denali_nand_info *denali)
 
 static void denali_irq_cleanup(int irqnum, struct denali_nand_info *denali)
 {
-       NAND_LLD_Enable_Disable_Interrupts(denali, false);
+       denali_set_intr_modes(denali, false);
        free_irq(irqnum, denali);
 }
 
@@ -1720,6 +1366,8 @@ static void denali_cmdfunc(struct mtd_info *mtd, unsigned int cmd, int col,
                           int page)
 {
        struct denali_nand_info *denali = mtd_to_denali(mtd);
+       uint32_t addr, id;
+       int i;
 
 #if DEBUG_DENALI
        printk(KERN_INFO "cmdfunc: 0x%x %d %d\n", cmd, col, page);
@@ -1732,24 +1380,18 @@ static void denali_cmdfunc(struct mtd_info *mtd, unsigned int cmd, int col,
                break;
        case NAND_CMD_READID:
                reset_buf(denali);
-               if (denali->flash_bank < denali->total_used_banks) {
-                       /* write manufacturer information into nand
-                          buffer for NAND subsystem to fetch.
-                          */
-                       write_byte_to_buf(denali,
-                                       denali->dev_info.wDeviceMaker);
-                       write_byte_to_buf(denali,
-                                       denali->dev_info.wDeviceID);
-                       write_byte_to_buf(denali,
-                                       denali->dev_info.bDeviceParam0);
-                       write_byte_to_buf(denali,
-                                       denali->dev_info.bDeviceParam1);
-                       write_byte_to_buf(denali,
-                                       denali->dev_info.bDeviceParam2);
-               } else {
-                       int i;
-                       for (i = 0; i < 5; i++)
-                               write_byte_to_buf(denali, 0xff);
+               /*sometimes ManufactureId read from register is not right
+                * e.g. some of Micron MT29F32G08QAA MLC NAND chips
+                * So here we send READID cmd to NAND insteand
+                * */
+               addr = (uint32_t)MODE_11 | BANK(denali->flash_bank);
+               index_addr(denali, (uint32_t)addr | 0, 0x90);
+               index_addr(denali, (uint32_t)addr | 1, 0);
+               for (i = 0; i < 5; i++) {
+                       index_addr_read_data(denali,
+                                               (uint32_t)addr | 2,
+                                               &id);
+                       write_byte_to_buf(denali, id);
                }
                break;
        case NAND_CMD_READ0:
@@ -1796,8 +1438,15 @@ static void denali_ecc_hwctl(struct mtd_info *mtd, int mode)
 /* Initialization code to bring the device up to a known good state */
 static void denali_hw_init(struct denali_nand_info *denali)
 {
+       /* tell driver how many bit controller will skip before
+        * writing ECC code in OOB, this register may be already
+        * set by firmware. So we read this value out.
+        * if this value is 0, just let it be.
+        * */
+       denali->bbtskipbytes = ioread32(denali->flash_reg +
+                                               SPARE_AREA_SKIP_BYTES);
        denali_irq_init(denali);
-       NAND_Flash_Reset(denali);
+       denali_nand_reset(denali);
        denali_write32(0x0F, denali->flash_reg + RB_PIN_ENABLED);
        denali_write32(CHIP_EN_DONT_CARE__FLAG,
                        denali->flash_reg + CHIP_ENABLE_DONT_CARE);
@@ -1810,29 +1459,18 @@ static void denali_hw_init(struct denali_nand_info *denali)
        denali_write32(1, denali->flash_reg + ECC_ENABLE);
 }
 
-/* ECC layout for SLC devices. Denali spec indicates SLC fixed at 4 bytes */
-#define ECC_BYTES_SLC   (4 * (2048 / ECC_SECTOR_SIZE))
-static struct nand_ecclayout nand_oob_slc = {
-       .eccbytes = 4,
-       .eccpos = { 0, 1, 2, 3 }, /* not used */
-       .oobfree = {
-               {
-                       .offset = ECC_BYTES_SLC,
-                       .length = 64 - ECC_BYTES_SLC
-               }
-       }
+/* Althogh controller spec said SLC ECC is forceb to be 4bit,
+ * but denali controller in MRST only support 15bit and 8bit ECC
+ * correction
+ * */
+#define ECC_8BITS      14
+static struct nand_ecclayout nand_8bit_oob = {
+       .eccbytes = 14,
 };
 
-#define ECC_BYTES_MLC   (14 * (2048 / ECC_SECTOR_SIZE))
-static struct nand_ecclayout nand_oob_mlc_14bit = {
-       .eccbytes = 14,
-       .eccpos = { 0, 1, 2, 3, 5, 6, 7, 8, 9, 10, 11, 12, 13 }, /* not used */
-       .oobfree = {
-               {
-                       .offset = ECC_BYTES_MLC,
-                       .length = 64 - ECC_BYTES_MLC
-               }
-       }
+#define ECC_15BITS     26
+static struct nand_ecclayout nand_15bit_oob = {
+       .eccbytes = 26,
 };
 
 static uint8_t bbt_pattern[] = {'B', 'b', 't', '0' };
@@ -1858,7 +1496,7 @@ static struct nand_bbt_descr bbt_mirror_descr = {
        .pattern = mirror_pattern,
 };
 
-/* initalize driver data structures */
+/* initialize driver data structures */
 void denali_drv_init(struct denali_nand_info *denali)
 {
        denali->idx = 0;
@@ -1898,7 +1536,7 @@ static int denali_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
        ret = pci_enable_device(dev);
        if (ret) {
                printk(KERN_ERR "Spectra: pci_enable_device failed.\n");
-               goto failed_enable;
+               goto failed_alloc_memery;
        }
 
        if (id->driver_data == INTEL_CE4100) {
@@ -1909,7 +1547,7 @@ static int denali_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
                        printk(KERN_ERR "Intel CE4100 only supports"
                                        " ONFI timing mode 1 or below\n");
                        ret = -EINVAL;
-                       goto failed_enable;
+                       goto failed_enable_dev;
                }
                denali->platform = INTEL_CE4100;
                mem_base = pci_resource_start(dev, 0);
@@ -1919,7 +1557,7 @@ static int denali_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
        } else {
                denali->platform = INTEL_MRST;
                csr_base = pci_resource_start(dev, 0);
-               csr_len = pci_resource_start(dev, 0);
+               csr_len = pci_resource_len(dev, 0);
                mem_base = pci_resource_start(dev, 1);
                mem_len = pci_resource_len(dev, 1);
                if (!mem_len) {
@@ -1938,7 +1576,7 @@ static int denali_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
 
        if (ret) {
                printk(KERN_ERR "Spectra: no usable DMA configuration\n");
-               goto failed_enable;
+               goto failed_enable_dev;
        }
        denali->buf.dma_buf =
                pci_map_single(dev, denali->buf.buf,
@@ -1947,7 +1585,7 @@ static int denali_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
 
        if (pci_dma_mapping_error(dev, denali->buf.dma_buf)) {
                printk(KERN_ERR "Spectra: failed to map DMA buffer\n");
-               goto failed_enable;
+               goto failed_enable_dev;
        }
 
        pci_set_master(dev);
@@ -1956,14 +1594,14 @@ static int denali_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
        ret = pci_request_regions(dev, DENALI_NAND_NAME);
        if (ret) {
                printk(KERN_ERR "Spectra: Unable to request memory regions\n");
-               goto failed_req_csr;
+               goto failed_dma_map;
        }
 
        denali->flash_reg = ioremap_nocache(csr_base, csr_len);
        if (!denali->flash_reg) {
                printk(KERN_ERR "Spectra: Unable to remap memory region\n");
                ret = -ENOMEM;
-               goto failed_remap_csr;
+               goto failed_req_regions;
        }
        nand_dbg_print(NAND_DBG_DEBUG, "Spectra: CSR 0x%08Lx -> 0x%p (0x%lx)\n",
                       (uint64_t)csr_base, denali->flash_reg, csr_len);
@@ -1971,9 +1609,8 @@ static int denali_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
        denali->flash_mem = ioremap_nocache(mem_base, mem_len);
        if (!denali->flash_mem) {
                printk(KERN_ERR "Spectra: ioremap_nocache failed!");
-               iounmap(denali->flash_reg);
                ret = -ENOMEM;
-               goto failed_remap_csr;
+               goto failed_remap_reg;
        }
 
        nand_dbg_print(NAND_DBG_WARN,
@@ -1989,25 +1626,15 @@ static int denali_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
                        DENALI_NAND_NAME, denali)) {
                printk(KERN_ERR "Spectra: Unable to allocate IRQ\n");
                ret = -ENODEV;
-               goto failed_request_irq;
+               goto failed_remap_mem;
        }
 
        /* now that our ISR is registered, we can enable interrupts */
-       NAND_LLD_Enable_Disable_Interrupts(denali, true);
+       denali_set_intr_modes(denali, true);
 
        pci_set_drvdata(dev, denali);
 
-       NAND_Read_Device_ID(denali);
-
-       /* MTD supported page sizes vary by kernel. We validate our
-        * kernel supports the device here.
-        */
-       if (denali->dev_info.wPageSize > NAND_MAX_PAGESIZE + NAND_MAX_OOBSIZE) {
-               ret = -ENODEV;
-               printk(KERN_ERR "Spectra: device size not supported by this "
-                       "version of MTD.");
-               goto failed_nand;
-       }
+       denali_nand_timing_set(denali);
 
        nand_dbg_print(NAND_DBG_DEBUG, "Dump timing register values:"
                        "acc_clks: %d, re_2_we: %d, we_2_re: %d,"
@@ -2036,9 +1663,38 @@ static int denali_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
         * with the nand subsystem */
        if (nand_scan_ident(&denali->mtd, LLD_MAX_FLASH_BANKS, NULL)) {
                ret = -ENXIO;
-               goto failed_nand;
+               goto failed_req_irq;
        }
 
+       /* MTD supported page sizes vary by kernel. We validate our
+        * kernel supports the device here.
+        */
+       if (denali->mtd.writesize > NAND_MAX_PAGESIZE + NAND_MAX_OOBSIZE) {
+               ret = -ENODEV;
+               printk(KERN_ERR "Spectra: device size not supported by this "
+                       "version of MTD.");
+               goto failed_req_irq;
+       }
+
+       /* support for multi nand
+        * MTD known nothing about multi nand,
+        * so we should tell it the real pagesize
+        * and anything necessery
+        */
+       denali->devnum = ioread32(denali->flash_reg + DEVICES_CONNECTED);
+       denali->nand.chipsize <<= (denali->devnum - 1);
+       denali->nand.page_shift += (denali->devnum - 1);
+       denali->nand.pagemask = (denali->nand.chipsize >>
+                                               denali->nand.page_shift) - 1;
+       denali->nand.bbt_erase_shift += (denali->devnum - 1);
+       denali->nand.phys_erase_shift = denali->nand.bbt_erase_shift;
+       denali->nand.chip_shift += (denali->devnum - 1);
+       denali->mtd.writesize <<= (denali->devnum - 1);
+       denali->mtd.oobsize <<= (denali->devnum - 1);
+       denali->mtd.erasesize <<= (denali->devnum - 1);
+       denali->mtd.size = denali->nand.numchips * denali->nand.chipsize;
+       denali->bbtskipbytes *= denali->devnum;
+
        /* second stage of the NAND scan
         * this stage requires information regarding ECC and
         * bad block management. */
@@ -2051,14 +1707,48 @@ static int denali_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
        denali->nand.options |= NAND_USE_FLASH_BBT | NAND_SKIP_BBTSCAN;
        denali->nand.ecc.mode = NAND_ECC_HW_SYNDROME;
 
-       if (denali->dev_info.MLCDevice) {
-               denali->nand.ecc.layout = &nand_oob_mlc_14bit;
-               denali->nand.ecc.bytes = ECC_BYTES_MLC;
-       } else {/* SLC */
-               denali->nand.ecc.layout = &nand_oob_slc;
-               denali->nand.ecc.bytes = ECC_BYTES_SLC;
+       /* Denali Controller only support 15bit and 8bit ECC in MRST,
+        * so just let controller do 15bit ECC for MLC and 8bit ECC for
+        * SLC if possible.
+        * */
+       if (denali->nand.cellinfo & 0xc &&
+                       (denali->mtd.oobsize > (denali->bbtskipbytes +
+                       ECC_15BITS * (denali->mtd.writesize /
+                       ECC_SECTOR_SIZE)))) {
+               /* if MLC OOB size is large enough, use 15bit ECC*/
+               denali->nand.ecc.layout = &nand_15bit_oob;
+               denali->nand.ecc.bytes = ECC_15BITS;
+               denali_write32(15, denali->flash_reg + ECC_CORRECTION);
+       } else if (denali->mtd.oobsize < (denali->bbtskipbytes +
+                       ECC_8BITS * (denali->mtd.writesize /
+                       ECC_SECTOR_SIZE))) {
+               printk(KERN_ERR "Your NAND chip OOB is not large enough to"
+                               " contain 8bit ECC correction codes");
+               goto failed_req_irq;
+       } else {
+               denali->nand.ecc.layout = &nand_8bit_oob;
+               denali->nand.ecc.bytes = ECC_8BITS;
+               denali_write32(8, denali->flash_reg + ECC_CORRECTION);
        }
 
+       denali->nand.ecc.bytes *= denali->devnum;
+       denali->nand.ecc.layout->eccbytes *=
+               denali->mtd.writesize / ECC_SECTOR_SIZE;
+       denali->nand.ecc.layout->oobfree[0].offset =
+               denali->bbtskipbytes + denali->nand.ecc.layout->eccbytes;
+       denali->nand.ecc.layout->oobfree[0].length =
+               denali->mtd.oobsize - denali->nand.ecc.layout->eccbytes -
+               denali->bbtskipbytes;
+
+       /* Let driver know the total blocks number and
+        * how many blocks contained by each nand chip.
+        * blksperchip will help driver to know how many
+        * blocks is taken by FW.
+        * */
+       denali->totalblks = denali->mtd.size >>
+                               denali->nand.phys_erase_shift;
+       denali->blksperchip = denali->totalblks / denali->nand.numchips;
+
        /* These functions are required by the NAND core framework, otherwise,
         * the NAND core will assert. However, we don't need them, so we'll stub
         * them out. */
@@ -2067,7 +1757,7 @@ static int denali_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
        denali->nand.ecc.hwctl = denali_ecc_hwctl;
 
        /* override the default read operations */
-       denali->nand.ecc.size = denali->mtd.writesize;
+       denali->nand.ecc.size = ECC_SECTOR_SIZE * denali->devnum;
        denali->nand.ecc.read_page = denali_read_page;
        denali->nand.ecc.read_page_raw = denali_read_page_raw;
        denali->nand.ecc.write_page = denali_write_page;
@@ -2078,28 +1768,31 @@ static int denali_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
 
        if (nand_scan_tail(&denali->mtd)) {
                ret = -ENXIO;
-               goto failed_nand;
+               goto failed_req_irq;
        }
 
        ret = add_mtd_device(&denali->mtd);
        if (ret) {
                printk(KERN_ERR "Spectra: Failed to register"
                                " MTD device: %d\n", ret);
-               goto failed_nand;
+               goto failed_req_irq;
        }
        return 0;
 
- failed_nand:
+failed_req_irq:
        denali_irq_cleanup(dev->irq, denali);
- failed_request_irq:
-       iounmap(denali->flash_reg);
+failed_remap_mem:
        iounmap(denali->flash_mem);
- failed_remap_csr:
+failed_remap_reg:
+       iounmap(denali->flash_reg);
+failed_req_regions:
        pci_release_regions(dev);
- failed_req_csr:
+failed_dma_map:
        pci_unmap_single(dev, denali->buf.dma_buf, DENALI_BUF_SIZE,
                                                        PCI_DMA_BIDIRECTIONAL);
- failed_enable:
+failed_enable_dev:
+       pci_disable_device(dev);
+failed_alloc_memery:
        kfree(denali);
        return ret;
 }