mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 21:33:00 +00:00
mtd: rawnand: denali: switch over to ->exec_op() from legacy hooks
Implement ->exec_op(), and remove the deprecated hooks. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com> Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
This commit is contained in:
Masahiro Yamada
Miquel Raynal
parent
cf067b5be0
commit
f55411427f
@ -206,85 +206,11 @@ static uint32_t denali_wait_for_irq(struct denali_nand_info *denali,
|
||||
return denali->irq_status;
|
||||
}
|
||||
|
||||
static void denali_read_buf(struct nand_chip *chip, uint8_t *buf, int len)
|
||||
static void denali_select_target(struct nand_chip *chip, int cs)
|
||||
{
|
||||
struct mtd_info *mtd = nand_to_mtd(chip);
|
||||
struct denali_nand_info *denali = mtd_to_denali(mtd);
|
||||
u32 addr = DENALI_MAP11_DATA | DENALI_BANK(denali);
|
||||
int i;
|
||||
struct denali_nand_info *denali = to_denali(chip);
|
||||
|
||||
for (i = 0; i < len; i++)
|
||||
buf[i] = denali->host_read(denali, addr);
|
||||
}
|
||||
|
||||
static void denali_write_buf(struct nand_chip *chip, const uint8_t *buf,
|
||||
int len)
|
||||
{
|
||||
struct denali_nand_info *denali = mtd_to_denali(nand_to_mtd(chip));
|
||||
u32 addr = DENALI_MAP11_DATA | DENALI_BANK(denali);
|
||||
int i;
|
||||
|
||||
for (i = 0; i < len; i++)
|
||||
denali->host_write(denali, addr, buf[i]);
|
||||
}
|
||||
|
||||
static void denali_read_buf16(struct nand_chip *chip, uint8_t *buf, int len)
|
||||
{
|
||||
struct denali_nand_info *denali = mtd_to_denali(nand_to_mtd(chip));
|
||||
u32 addr = DENALI_MAP11_DATA | DENALI_BANK(denali);
|
||||
uint16_t *buf16 = (uint16_t *)buf;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < len / 2; i++)
|
||||
buf16[i] = denali->host_read(denali, addr);
|
||||
}
|
||||
|
||||
static void denali_write_buf16(struct nand_chip *chip, const uint8_t *buf,
|
||||
int len)
|
||||
{
|
||||
struct denali_nand_info *denali = mtd_to_denali(nand_to_mtd(chip));
|
||||
u32 addr = DENALI_MAP11_DATA | DENALI_BANK(denali);
|
||||
const uint16_t *buf16 = (const uint16_t *)buf;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < len / 2; i++)
|
||||
denali->host_write(denali, addr, buf16[i]);
|
||||
}
|
||||
|
||||
static uint8_t denali_read_byte(struct nand_chip *chip)
|
||||
{
|
||||
uint8_t byte;
|
||||
|
||||
denali_read_buf(chip, &byte, 1);
|
||||
|
||||
return byte;
|
||||
}
|
||||
|
||||
static void denali_write_byte(struct nand_chip *chip, uint8_t byte)
|
||||
{
|
||||
denali_write_buf(chip, &byte, 1);
|
||||
}
|
||||
|
||||
static void denali_cmd_ctrl(struct nand_chip *chip, int dat, unsigned int ctrl)
|
||||
{
|
||||
struct denali_nand_info *denali = mtd_to_denali(nand_to_mtd(chip));
|
||||
uint32_t type;
|
||||
|
||||
if (ctrl & NAND_CLE)
|
||||
type = DENALI_MAP11_CMD;
|
||||
else if (ctrl & NAND_ALE)
|
||||
type = DENALI_MAP11_ADDR;
|
||||
else
|
||||
return;
|
||||
|
||||
/*
|
||||
* Some commands are followed by chip->legacy.waitfunc.
|
||||
* irq_status must be cleared here to catch the R/B# interrupt later.
|
||||
*/
|
||||
if (ctrl & NAND_CTRL_CHANGE)
|
||||
denali_reset_irq(denali);
|
||||
|
||||
denali->host_write(denali, DENALI_BANK(denali) | type, dat);
|
||||
denali->active_bank = cs;
|
||||
}
|
||||
|
||||
static int denali_change_column(struct nand_chip *chip, unsigned int offset,
|
||||
@ -772,6 +698,8 @@ static int denali_page_xfer(struct nand_chip *chip, void *buf, size_t size,
|
||||
{
|
||||
struct denali_nand_info *denali = to_denali(chip);
|
||||
|
||||
denali_select_target(chip, chip->cur_cs);
|
||||
|
||||
if (denali->dma_avail)
|
||||
return denali_dma_xfer(denali, buf, size, page, write);
|
||||
else
|
||||
@ -819,24 +747,6 @@ static int denali_write_page(struct nand_chip *chip, const uint8_t *buf,
|
||||
return denali_page_xfer(chip, (void *)buf, mtd->writesize, page, 1);
|
||||
}
|
||||
|
||||
static void denali_select_chip(struct nand_chip *chip, int cs)
|
||||
{
|
||||
struct denali_nand_info *denali = mtd_to_denali(nand_to_mtd(chip));
|
||||
|
||||
denali->active_bank = cs;
|
||||
}
|
||||
|
||||
static int denali_waitfunc(struct nand_chip *chip)
|
||||
{
|
||||
struct denali_nand_info *denali = mtd_to_denali(nand_to_mtd(chip));
|
||||
uint32_t irq_status;
|
||||
|
||||
/* R/B# pin transitioned from low to high? */
|
||||
irq_status = denali_wait_for_irq(denali, INTR__INT_ACT);
|
||||
|
||||
return irq_status & INTR__INT_ACT ? 0 : NAND_STATUS_FAIL;
|
||||
}
|
||||
|
||||
static int denali_setup_data_interface(struct nand_chip *chip, int chipnr,
|
||||
const struct nand_data_interface *conf)
|
||||
{
|
||||
@ -1153,13 +1063,6 @@ static int denali_attach_chip(struct nand_chip *chip)
|
||||
|
||||
mtd_set_ooblayout(mtd, &denali_ooblayout_ops);
|
||||
|
||||
if (chip->options & NAND_BUSWIDTH_16) {
|
||||
chip->legacy.read_buf = denali_read_buf16;
|
||||
chip->legacy.write_buf = denali_write_buf16;
|
||||
} else {
|
||||
chip->legacy.read_buf = denali_read_buf;
|
||||
chip->legacy.write_buf = denali_write_buf;
|
||||
}
|
||||
chip->ecc.read_page = denali_read_page;
|
||||
chip->ecc.read_page_raw = denali_read_page_raw;
|
||||
chip->ecc.write_page = denali_write_page;
|
||||
@ -1174,8 +1077,146 @@ static int denali_attach_chip(struct nand_chip *chip)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void denali_exec_in8(struct denali_nand_info *denali, u32 type,
|
||||
u8 *buf, unsigned int len)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < len; i++)
|
||||
buf[i] = denali->host_read(denali, type | DENALI_BANK(denali));
|
||||
}
|
||||
|
||||
static void denali_exec_in16(struct denali_nand_info *denali, u32 type,
|
||||
u8 *buf, unsigned int len)
|
||||
{
|
||||
u32 data;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < len; i += 2) {
|
||||
data = denali->host_read(denali, type | DENALI_BANK(denali));
|
||||
/* bit 31:24 and 15:8 are used for DDR */
|
||||
buf[i] = data;
|
||||
buf[i + 1] = data >> 16;
|
||||
}
|
||||
}
|
||||
|
||||
static void denali_exec_in(struct denali_nand_info *denali, u32 type,
|
||||
u8 *buf, unsigned int len, bool width16)
|
||||
{
|
||||
if (width16)
|
||||
denali_exec_in16(denali, type, buf, len);
|
||||
else
|
||||
denali_exec_in8(denali, type, buf, len);
|
||||
}
|
||||
|
||||
static void denali_exec_out8(struct denali_nand_info *denali, u32 type,
|
||||
const u8 *buf, unsigned int len)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < len; i++)
|
||||
denali->host_write(denali, type | DENALI_BANK(denali), buf[i]);
|
||||
}
|
||||
|
||||
static void denali_exec_out16(struct denali_nand_info *denali, u32 type,
|
||||
const u8 *buf, unsigned int len)
|
||||
{
|
||||
int i;
|
||||
|
||||
for (i = 0; i < len; i += 2)
|
||||
denali->host_write(denali, type | DENALI_BANK(denali),
|
||||
buf[i + 1] << 16 | buf[i]);
|
||||
}
|
||||
|
||||
static void denali_exec_out(struct denali_nand_info *denali, u32 type,
|
||||
const u8 *buf, unsigned int len, bool width16)
|
||||
{
|
||||
if (width16)
|
||||
denali_exec_out16(denali, type, buf, len);
|
||||
else
|
||||
denali_exec_out8(denali, type, buf, len);
|
||||
}
|
||||
|
||||
static int denali_exec_waitrdy(struct denali_nand_info *denali)
|
||||
{
|
||||
u32 irq_stat;
|
||||
|
||||
/* R/B# pin transitioned from low to high? */
|
||||
irq_stat = denali_wait_for_irq(denali, INTR__INT_ACT);
|
||||
|
||||
/* Just in case nand_operation has multiple NAND_OP_WAITRDY_INSTR. */
|
||||
denali_reset_irq(denali);
|
||||
|
||||
return irq_stat & INTR__INT_ACT ? 0 : -EIO;
|
||||
}
|
||||
|
||||
static int denali_exec_instr(struct nand_chip *chip,
|
||||
const struct nand_op_instr *instr)
|
||||
{
|
||||
struct denali_nand_info *denali = to_denali(chip);
|
||||
|
||||
switch (instr->type) {
|
||||
case NAND_OP_CMD_INSTR:
|
||||
denali_exec_out8(denali, DENALI_MAP11_CMD,
|
||||
&instr->ctx.cmd.opcode, 1);
|
||||
return 0;
|
||||
case NAND_OP_ADDR_INSTR:
|
||||
denali_exec_out8(denali, DENALI_MAP11_ADDR,
|
||||
instr->ctx.addr.addrs,
|
||||
instr->ctx.addr.naddrs);
|
||||
return 0;
|
||||
case NAND_OP_DATA_IN_INSTR:
|
||||
denali_exec_in(denali, DENALI_MAP11_DATA,
|
||||
instr->ctx.data.buf.in,
|
||||
instr->ctx.data.len,
|
||||
!instr->ctx.data.force_8bit &&
|
||||
chip->options & NAND_BUSWIDTH_16);
|
||||
return 0;
|
||||
case NAND_OP_DATA_OUT_INSTR:
|
||||
denali_exec_out(denali, DENALI_MAP11_DATA,
|
||||
instr->ctx.data.buf.out,
|
||||
instr->ctx.data.len,
|
||||
!instr->ctx.data.force_8bit &&
|
||||
chip->options & NAND_BUSWIDTH_16);
|
||||
return 0;
|
||||
case NAND_OP_WAITRDY_INSTR:
|
||||
return denali_exec_waitrdy(denali);
|
||||
default:
|
||||
WARN_ONCE(1, "unsupported NAND instruction type: %d\n",
|
||||
instr->type);
|
||||
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
|
||||
static int denali_exec_op(struct nand_chip *chip,
|
||||
const struct nand_operation *op, bool check_only)
|
||||
{
|
||||
int i, ret;
|
||||
|
||||
if (check_only)
|
||||
return 0;
|
||||
|
||||
denali_select_target(chip, op->cs);
|
||||
|
||||
/*
|
||||
* Some commands contain NAND_OP_WAITRDY_INSTR.
|
||||
* irq must be cleared here to catch the R/B# interrupt there.
|
||||
*/
|
||||
denali_reset_irq(to_denali(chip));
|
||||
|
||||
for (i = 0; i < op->ninstrs; i++) {
|
||||
ret = denali_exec_instr(chip, &op->instrs[i]);
|
||||
if (ret)
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct nand_controller_ops denali_controller_ops = {
|
||||
.attach_chip = denali_attach_chip,
|
||||
.exec_op = denali_exec_op,
|
||||
.setup_data_interface = denali_setup_data_interface,
|
||||
};
|
||||
|
||||
@ -1210,12 +1251,6 @@ int denali_init(struct denali_nand_info *denali)
|
||||
if (!mtd->name)
|
||||
mtd->name = "denali-nand";
|
||||
|
||||
chip->legacy.select_chip = denali_select_chip;
|
||||
chip->legacy.read_byte = denali_read_byte;
|
||||
chip->legacy.write_byte = denali_write_byte;
|
||||
chip->legacy.cmd_ctrl = denali_cmd_ctrl;
|
||||
chip->legacy.waitfunc = denali_waitfunc;
|
||||
|
||||
if (features & FEATURES__INDEX_ADDR) {
|
||||
denali->host_read = denali_indexed_read;
|
||||
denali->host_write = denali_indexed_write;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user