Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

iio:ad5791: Do not store transfer buffers on the stack

Some SPI controllers may not be able to handle transfer buffers that are placed
on the stack.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>

authored by

Lars-Peter Clausen and committed by
Jonathan Cameron
791bb52a ae8bb9b1

+21 -25
+21 -25
drivers/iio/dac/ad5791.c
··· 91 91 unsigned ctrl; 92 92 unsigned pwr_down_mode; 93 93 bool pwr_down; 94 + 95 + union { 96 + __be32 d32; 97 + u8 d8[4]; 98 + } data[3] ____cacheline_aligned; 94 99 }; 95 100 96 101 /** ··· 109 104 ID_AD5791, 110 105 }; 111 106 112 - static int ad5791_spi_write(struct spi_device *spi, u8 addr, u32 val) 107 + static int ad5791_spi_write(struct ad5791_state *st, u8 addr, u32 val) 113 108 { 114 - union { 115 - __be32 d32; 116 - u8 d8[4]; 117 - } data; 118 - 119 - data.d32 = cpu_to_be32(AD5791_CMD_WRITE | 109 + st->data[0].d32 = cpu_to_be32(AD5791_CMD_WRITE | 120 110 AD5791_ADDR(addr) | 121 111 (val & AD5791_DAC_MASK)); 122 112 123 - return spi_write(spi, &data.d8[1], 3); 113 + return spi_write(st->spi, &st->data[0].d8[1], 3); 124 114 } 125 115 126 - static int ad5791_spi_read(struct spi_device *spi, u8 addr, u32 *val) 116 + static int ad5791_spi_read(struct ad5791_state *st, u8 addr, u32 *val) 127 117 { 128 - union { 129 - __be32 d32; 130 - u8 d8[4]; 131 - } data[3]; 132 118 int ret; 133 119 struct spi_transfer xfers[] = { 134 120 { 135 - .tx_buf = &data[0].d8[1], 121 + .tx_buf = &st->data[0].d8[1], 136 122 .bits_per_word = 8, 137 123 .len = 3, 138 124 .cs_change = 1, 139 125 }, { 140 - .tx_buf = &data[1].d8[1], 141 - .rx_buf = &data[2].d8[1], 126 + .tx_buf = &st->data[1].d8[1], 127 + .rx_buf = &st->data[2].d8[1], 142 128 .bits_per_word = 8, 143 129 .len = 3, 144 130 }, 145 131 }; 146 132 147 - data[0].d32 = cpu_to_be32(AD5791_CMD_READ | 133 + st->data[0].d32 = cpu_to_be32(AD5791_CMD_READ | 148 134 AD5791_ADDR(addr)); 149 - data[1].d32 = cpu_to_be32(AD5791_ADDR(AD5791_ADDR_NOOP)); 135 + st->data[1].d32 = cpu_to_be32(AD5791_ADDR(AD5791_ADDR_NOOP)); 150 136 151 - ret = spi_sync_transfer(spi, xfers, ARRAY_SIZE(xfers)); 137 + ret = spi_sync_transfer(st->spi, xfers, ARRAY_SIZE(xfers)); 152 138 153 - *val = be32_to_cpu(data[2].d32); 139 + *val = be32_to_cpu(st->data[2].d32); 154 140 155 141 return ret; 156 142 } ··· 206 210 } 207 211 st->pwr_down = pwr_down; 208 212 209 - ret = ad5791_spi_write(st->spi, AD5791_ADDR_CTRL, st->ctrl); 213 + ret = ad5791_spi_write(st, AD5791_ADDR_CTRL, st->ctrl); 210 214 211 215 return ret ? ret : len; 212 216 } ··· 259 263 260 264 switch (m) { 261 265 case IIO_CHAN_INFO_RAW: 262 - ret = ad5791_spi_read(st->spi, chan->address, val); 266 + ret = ad5791_spi_read(st, chan->address, val); 263 267 if (ret) 264 268 return ret; 265 269 *val &= AD5791_DAC_MASK; ··· 326 330 val &= AD5791_RES_MASK(chan->scan_type.realbits); 327 331 val <<= chan->scan_type.shift; 328 332 329 - return ad5791_spi_write(st->spi, chan->address, val); 333 + return ad5791_spi_write(st, chan->address, val); 330 334 331 335 default: 332 336 return -EINVAL; ··· 389 393 dev_warn(&spi->dev, "reference voltage unspecified\n"); 390 394 } 391 395 392 - ret = ad5791_spi_write(spi, AD5791_ADDR_SW_CTRL, AD5791_SWCTRL_RESET); 396 + ret = ad5791_spi_write(st, AD5791_ADDR_SW_CTRL, AD5791_SWCTRL_RESET); 393 397 if (ret) 394 398 goto error_disable_reg_neg; 395 399 ··· 401 405 | ((pdata && pdata->use_rbuf_gain2) ? 0 : AD5791_CTRL_RBUF) | 402 406 AD5791_CTRL_BIN2SC; 403 407 404 - ret = ad5791_spi_write(spi, AD5791_ADDR_CTRL, st->ctrl | 408 + ret = ad5791_spi_write(st, AD5791_ADDR_CTRL, st->ctrl | 405 409 AD5791_CTRL_OPGND | AD5791_CTRL_DACTRI); 406 410 if (ret) 407 411 goto error_disable_reg_neg;