samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge tag 'for-linus-20151006' of git://git.infradead.org/linux-mtd

Browse Source 
Pull MTD fixes from Brian Norris:
 "A few MTD fixes:

   - mxc_nand: a "refactoring only" change in 4.3-rc1 had some bad
     pointer (array) arithmetic.  Fix that

   - sunxi_nand:

   - Fix an old list manipulation / memory management bug in the device
     release() code path

   - Correct a few mistakes in OOB write support"

* tag 'for-linus-20151006' of git://git.infradead.org/linux-mtd:
  mxc_nand: fix copy_spare
  mtd: nand: sunxi: fix sunxi_nand_chips_cleanup()
  mtd: nand: sunxi: fix OOB handling in ->write_xxx() functions
This commit is contained in:
Linus Torvalds
2015-10-07 09:35:15 +01:00
parent a0eeb8dd34 e5a5d92d9d
commit 3f5e4a3116
2 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mtd/nand/mxc_nand.c
View File

@@ -879,7 +879,7 @@ static void copy_spare(struct mtd_info *mtd, bool bfrom)
oob_chunk_size); oob_chunk_size);
/* the last chunk */ /* the last chunk */
memcpy16_toio(&s[oob_chunk_size * sparebuf_size], memcpy16_toio(&s[i * sparebuf_size],
&d[i * oob_chunk_size], &d[i * oob_chunk_size],
host->used_oobsize - i * oob_chunk_size); host->used_oobsize - i * oob_chunk_size);
} }

27
drivers/mtd/nand/sunxi_nand.c
View File

@@ -147,6 +147,10 @@
#define NFC_ECC_MODE GENMASK(15, 12) #define NFC_ECC_MODE GENMASK(15, 12)
#define NFC_RANDOM_SEED GENMASK(30, 16) #define NFC_RANDOM_SEED GENMASK(30, 16)
/* NFC_USER_DATA helper macros */
#define NFC_BUF_TO_USER_DATA(buf) ((buf)[0] | ((buf)[1] << 8) | \
((buf)[2] << 16) | ((buf)[3] << 24))
#define NFC_DEFAULT_TIMEOUT_MS 1000 #define NFC_DEFAULT_TIMEOUT_MS 1000
#define NFC_SRAM_SIZE 1024 #define NFC_SRAM_SIZE 1024
@@ -646,15 +650,9 @@ static int sunxi_nfc_hw_ecc_write_page(struct mtd_info *mtd,
offset = layout->eccpos[i * ecc->bytes] - 4 + mtd->writesize; offset = layout->eccpos[i * ecc->bytes] - 4 + mtd->writesize;
/* Fill OOB data in */ /* Fill OOB data in */
if (oob_required) { writel(NFC_BUF_TO_USER_DATA(chip->oob_poi +
tmp = 0xffffffff; layout->oobfree[i].offset),
memcpy_toio(nfc->regs + NFC_REG_USER_DATA_BASE, &tmp, nfc->regs + NFC_REG_USER_DATA_BASE);
4);
} else {
memcpy_toio(nfc->regs + NFC_REG_USER_DATA_BASE,
chip->oob_poi + offset - mtd->writesize,
4);
}
chip->cmdfunc(mtd, NAND_CMD_RNDIN, offset, -1); chip->cmdfunc(mtd, NAND_CMD_RNDIN, offset, -1);
@@ -784,14 +782,8 @@ static int sunxi_nfc_hw_syndrome_ecc_write_page(struct mtd_info *mtd,
offset += ecc->size; offset += ecc->size;
/* Fill OOB data in */ /* Fill OOB data in */
if (oob_required) { writel(NFC_BUF_TO_USER_DATA(oob),
tmp = 0xffffffff; nfc->regs + NFC_REG_USER_DATA_BASE);
memcpy_toio(nfc->regs + NFC_REG_USER_DATA_BASE, &tmp,
4);
} else {
memcpy_toio(nfc->regs + NFC_REG_USER_DATA_BASE, oob,
4);
}
tmp = NFC_DATA_TRANS | NFC_DATA_SWAP_METHOD | NFC_ACCESS_DIR | tmp = NFC_DATA_TRANS | NFC_DATA_SWAP_METHOD | NFC_ACCESS_DIR |
(1 << 30); (1 << 30);
@@ -1389,6 +1381,7 @@ static void sunxi_nand_chips_cleanup(struct sunxi_nfc *nfc)
node); node);
nand_release(&chip->mtd); nand_release(&chip->mtd);
sunxi_nand_ecc_cleanup(&chip->nand.ecc); sunxi_nand_ecc_cleanup(&chip->nand.ecc);
list_del(&chip->node);
} }
} }