Commit ba3900e6 authored by Sascha Hauer's avatar Sascha Hauer Committed by Boris Brezillon

mtd: rawnand: gpmi: pass buffer and len around

Instead of putting the buffer and len passed in from the mtd core
into the private data struct, just pass it around in the GPMI
drivers functions. This makes the lifetime of the variables more
clear and the code easier to follow.
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: default avatarBoris Brezillon <boris.brezillon@bootlin.com>
parent c3ee3f3d
...@@ -587,7 +587,7 @@ int gpmi_send_command(struct gpmi_nand_data *this) ...@@ -587,7 +587,7 @@ int gpmi_send_command(struct gpmi_nand_data *this)
return ret; return ret;
} }
int gpmi_send_data(struct gpmi_nand_data *this) int gpmi_send_data(struct gpmi_nand_data *this, const void *buf, int len)
{ {
struct dma_async_tx_descriptor *desc; struct dma_async_tx_descriptor *desc;
struct dma_chan *channel = get_dma_chan(this); struct dma_chan *channel = get_dma_chan(this);
...@@ -606,7 +606,7 @@ int gpmi_send_data(struct gpmi_nand_data *this) ...@@ -606,7 +606,7 @@ int gpmi_send_data(struct gpmi_nand_data *this)
| BF_GPMI_CTRL0_CS(chip, this) | BF_GPMI_CTRL0_CS(chip, this)
| BF_GPMI_CTRL0_LOCK_CS(LOCK_CS_ENABLE, this) | BF_GPMI_CTRL0_LOCK_CS(LOCK_CS_ENABLE, this)
| BF_GPMI_CTRL0_ADDRESS(address) | BF_GPMI_CTRL0_ADDRESS(address)
| BF_GPMI_CTRL0_XFER_COUNT(this->upper_len); | BF_GPMI_CTRL0_XFER_COUNT(len);
pio[1] = 0; pio[1] = 0;
desc = dmaengine_prep_slave_sg(channel, (struct scatterlist *)pio, desc = dmaengine_prep_slave_sg(channel, (struct scatterlist *)pio,
ARRAY_SIZE(pio), DMA_TRANS_NONE, 0); ARRAY_SIZE(pio), DMA_TRANS_NONE, 0);
...@@ -614,7 +614,7 @@ int gpmi_send_data(struct gpmi_nand_data *this) ...@@ -614,7 +614,7 @@ int gpmi_send_data(struct gpmi_nand_data *this)
return -EINVAL; return -EINVAL;
/* [2] send DMA request */ /* [2] send DMA request */
prepare_data_dma(this, DMA_TO_DEVICE); prepare_data_dma(this, buf, len, DMA_TO_DEVICE);
desc = dmaengine_prep_slave_sg(channel, &this->data_sgl, desc = dmaengine_prep_slave_sg(channel, &this->data_sgl,
1, DMA_MEM_TO_DEV, 1, DMA_MEM_TO_DEV,
DMA_PREP_INTERRUPT | DMA_CTRL_ACK); DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
...@@ -629,7 +629,7 @@ int gpmi_send_data(struct gpmi_nand_data *this) ...@@ -629,7 +629,7 @@ int gpmi_send_data(struct gpmi_nand_data *this)
return ret; return ret;
} }
int gpmi_read_data(struct gpmi_nand_data *this) int gpmi_read_data(struct gpmi_nand_data *this, void *buf, int len)
{ {
struct dma_async_tx_descriptor *desc; struct dma_async_tx_descriptor *desc;
struct dma_chan *channel = get_dma_chan(this); struct dma_chan *channel = get_dma_chan(this);
...@@ -643,7 +643,7 @@ int gpmi_read_data(struct gpmi_nand_data *this) ...@@ -643,7 +643,7 @@ int gpmi_read_data(struct gpmi_nand_data *this)
| BF_GPMI_CTRL0_CS(chip, this) | BF_GPMI_CTRL0_CS(chip, this)
| BF_GPMI_CTRL0_LOCK_CS(LOCK_CS_ENABLE, this) | BF_GPMI_CTRL0_LOCK_CS(LOCK_CS_ENABLE, this)
| BF_GPMI_CTRL0_ADDRESS(BV_GPMI_CTRL0_ADDRESS__NAND_DATA) | BF_GPMI_CTRL0_ADDRESS(BV_GPMI_CTRL0_ADDRESS__NAND_DATA)
| BF_GPMI_CTRL0_XFER_COUNT(this->upper_len); | BF_GPMI_CTRL0_XFER_COUNT(len);
pio[1] = 0; pio[1] = 0;
desc = dmaengine_prep_slave_sg(channel, desc = dmaengine_prep_slave_sg(channel,
(struct scatterlist *)pio, (struct scatterlist *)pio,
...@@ -652,7 +652,7 @@ int gpmi_read_data(struct gpmi_nand_data *this) ...@@ -652,7 +652,7 @@ int gpmi_read_data(struct gpmi_nand_data *this)
return -EINVAL; return -EINVAL;
/* [2] : send DMA request */ /* [2] : send DMA request */
prepare_data_dma(this, DMA_FROM_DEVICE); prepare_data_dma(this, buf, len, DMA_FROM_DEVICE);
desc = dmaengine_prep_slave_sg(channel, &this->data_sgl, desc = dmaengine_prep_slave_sg(channel, &this->data_sgl,
1, DMA_DEV_TO_MEM, 1, DMA_DEV_TO_MEM,
DMA_PREP_INTERRUPT | DMA_CTRL_ACK); DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
...@@ -665,7 +665,7 @@ int gpmi_read_data(struct gpmi_nand_data *this) ...@@ -665,7 +665,7 @@ int gpmi_read_data(struct gpmi_nand_data *this)
dma_unmap_sg(this->dev, &this->data_sgl, 1, DMA_FROM_DEVICE); dma_unmap_sg(this->dev, &this->data_sgl, 1, DMA_FROM_DEVICE);
if (this->direct_dma_map_ok == false) if (this->direct_dma_map_ok == false)
memcpy(this->upper_buf, this->data_buffer_dma, this->upper_len); memcpy(buf, this->data_buffer_dma, len);
return ret; return ret;
} }
......
...@@ -447,15 +447,15 @@ struct dma_chan *get_dma_chan(struct gpmi_nand_data *this) ...@@ -447,15 +447,15 @@ struct dma_chan *get_dma_chan(struct gpmi_nand_data *this)
} }
/* Can we use the upper's buffer directly for DMA? */ /* Can we use the upper's buffer directly for DMA? */
void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr) void prepare_data_dma(struct gpmi_nand_data *this, const void *buf, int len,
enum dma_data_direction dr)
{ {
struct scatterlist *sgl = &this->data_sgl; struct scatterlist *sgl = &this->data_sgl;
int ret; int ret;
/* first try to map the upper buffer directly */ /* first try to map the upper buffer directly */
if (virt_addr_valid(this->upper_buf) && if (virt_addr_valid(buf) && !object_is_on_stack(buf)) {
!object_is_on_stack(this->upper_buf)) { sg_init_one(sgl, buf, len);
sg_init_one(sgl, this->upper_buf, this->upper_len);
ret = dma_map_sg(this->dev, sgl, 1, dr); ret = dma_map_sg(this->dev, sgl, 1, dr);
if (ret == 0) if (ret == 0)
goto map_fail; goto map_fail;
...@@ -466,10 +466,10 @@ void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr) ...@@ -466,10 +466,10 @@ void prepare_data_dma(struct gpmi_nand_data *this, enum dma_data_direction dr)
map_fail: map_fail:
/* We have to use our own DMA buffer. */ /* We have to use our own DMA buffer. */
sg_init_one(sgl, this->data_buffer_dma, this->upper_len); sg_init_one(sgl, this->data_buffer_dma, len);
if (dr == DMA_TO_DEVICE) if (dr == DMA_TO_DEVICE)
memcpy(this->data_buffer_dma, this->upper_buf, this->upper_len); memcpy(this->data_buffer_dma, buf, len);
dma_map_sg(this->dev, sgl, 1, dr); dma_map_sg(this->dev, sgl, 1, dr);
...@@ -929,10 +929,8 @@ static void gpmi_read_buf(struct mtd_info *mtd, uint8_t *buf, int len) ...@@ -929,10 +929,8 @@ static void gpmi_read_buf(struct mtd_info *mtd, uint8_t *buf, int len)
struct gpmi_nand_data *this = nand_get_controller_data(chip); struct gpmi_nand_data *this = nand_get_controller_data(chip);
dev_dbg(this->dev, "len is %d\n", len); dev_dbg(this->dev, "len is %d\n", len);
this->upper_buf = buf;
this->upper_len = len;
gpmi_read_data(this); gpmi_read_data(this, buf, len);
} }
static void gpmi_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len) static void gpmi_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len)
...@@ -941,10 +939,8 @@ static void gpmi_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len) ...@@ -941,10 +939,8 @@ static void gpmi_write_buf(struct mtd_info *mtd, const uint8_t *buf, int len)
struct gpmi_nand_data *this = nand_get_controller_data(chip); struct gpmi_nand_data *this = nand_get_controller_data(chip);
dev_dbg(this->dev, "len is %d\n", len); dev_dbg(this->dev, "len is %d\n", len);
this->upper_buf = (uint8_t *)buf;
this->upper_len = len;
gpmi_send_data(this); gpmi_send_data(this, buf, len);
} }
static uint8_t gpmi_read_byte(struct mtd_info *mtd) static uint8_t gpmi_read_byte(struct mtd_info *mtd)
......
...@@ -141,10 +141,6 @@ struct gpmi_nand_data { ...@@ -141,10 +141,6 @@ struct gpmi_nand_data {
int current_chip; int current_chip;
unsigned int command_length; unsigned int command_length;
/* passed from upper layer */
uint8_t *upper_buf;
int upper_len;
/* for DMA operations */ /* for DMA operations */
bool direct_dma_map_ok; bool direct_dma_map_ok;
...@@ -178,7 +174,7 @@ struct gpmi_nand_data { ...@@ -178,7 +174,7 @@ struct gpmi_nand_data {
/* Common Services */ /* Common Services */
int common_nfc_set_geometry(struct gpmi_nand_data *); int common_nfc_set_geometry(struct gpmi_nand_data *);
struct dma_chan *get_dma_chan(struct gpmi_nand_data *); struct dma_chan *get_dma_chan(struct gpmi_nand_data *);
void prepare_data_dma(struct gpmi_nand_data *, void prepare_data_dma(struct gpmi_nand_data *, const void *buf, int len,
enum dma_data_direction dr); enum dma_data_direction dr);
int start_dma_without_bch_irq(struct gpmi_nand_data *, int start_dma_without_bch_irq(struct gpmi_nand_data *,
struct dma_async_tx_descriptor *); struct dma_async_tx_descriptor *);
...@@ -197,8 +193,9 @@ int gpmi_disable_clk(struct gpmi_nand_data *this); ...@@ -197,8 +193,9 @@ int gpmi_disable_clk(struct gpmi_nand_data *this);
int gpmi_setup_data_interface(struct mtd_info *mtd, int chipnr, int gpmi_setup_data_interface(struct mtd_info *mtd, int chipnr,
const struct nand_data_interface *conf); const struct nand_data_interface *conf);
void gpmi_nfc_apply_timings(struct gpmi_nand_data *this); void gpmi_nfc_apply_timings(struct gpmi_nand_data *this);
int gpmi_read_data(struct gpmi_nand_data *); int gpmi_read_data(struct gpmi_nand_data *, void *buf, int len);
int gpmi_send_data(struct gpmi_nand_data *); int gpmi_send_data(struct gpmi_nand_data *, const void *buf, int len);
int gpmi_send_page(struct gpmi_nand_data *, int gpmi_send_page(struct gpmi_nand_data *,
dma_addr_t payload, dma_addr_t auxiliary); dma_addr_t payload, dma_addr_t auxiliary);
int gpmi_read_page(struct gpmi_nand_data *, int gpmi_read_page(struct gpmi_nand_data *,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment