Merge remote-tracking branches 'spi/fix/pax2xx' and 'spi/fix/rockchip' into spi-linus

diff --combined drivers/spi/spi-rockchip.c
index 1026e18,cd89682,cf69f4d..7a58db4
--- 1/drivers/spi/spi-rockchip.c
--- 2/drivers/spi/spi-rockchip.c
--- 3/drivers/spi/spi-rockchip.c
+++ b/drivers/spi/spi-rockchip.c
@@@@ -142,6 -142,6 -142,12 +142,12 @@@@
   /* sclk_out: spi master internal logic in rk3x can support 50Mhz */
   #define MAX_SCLK_OUT         50000000
   
++ /*
++  * SPI_CTRLR1 is 16-bits, so we should support lengths of 0xffff + 1. However,
++  * the controller seems to hang when given 0x10000, so stick with this for now.
++  */
++ #define ROCKCHIP_SPI_MAX_TRANLEN             0xffff
++ 
   enum rockchip_ssi_type {
        SSI_MOTO_SPI = 0,
        SSI_TI_SSP,
@@@@ -573,12 -573,12 -579,17 +579,17 @@@@ static void rockchip_spi_config(struct 
        dev_dbg(rs->dev, "cr0 0x%x, div %d\n", cr0, div);
   }
   
++ static size_t rockchip_spi_max_transfer_size(struct spi_device *spi)
++ {
++      return ROCKCHIP_SPI_MAX_TRANLEN;
++ }
++ 
   static int rockchip_spi_transfer_one(
                struct spi_master *master,
                struct spi_device *spi,
                struct spi_transfer *xfer)
   {
 --     int ret = 1;
 ++     int ret = 0;
        struct rockchip_spi *rs = spi_master_get_devdata(master);
   
        WARN_ON(readl_relaxed(rs->regs + ROCKCHIP_SPI_SSIENR) &&
@@@@ -589,6 -589,6 -600,11 +600,11 @@@@
                return -EINVAL;
        }
   
++      if (xfer->len > ROCKCHIP_SPI_MAX_TRANLEN) {
++              dev_err(rs->dev, "Transfer is too long (%d)\n", xfer->len);
++              return -EINVAL;
++      }
++ 
        rs->speed = xfer->speed_hz;
        rs->bpw = xfer->bits_per_word;
        rs->n_bytes = rs->bpw >> 3;
@@@@ -627,8 -627,6 -643,6 +643,8 @@@@
                        spi_enable_chip(rs, 1);
                        ret = rockchip_spi_prepare_dma(rs);
                }
 ++             /* successful DMA prepare means the transfer is in progress */
 ++             ret = ret ? ret : 1;
        } else {
                spi_enable_chip(rs, 1);
                ret = rockchip_spi_pio_transfer(rs);
@@@@ -730,6 -728,6 -744,7 +746,7 @@@@ static int rockchip_spi_probe(struct pl
        master->prepare_message = rockchip_spi_prepare_message;
        master->unprepare_message = rockchip_spi_unprepare_message;
        master->transfer_one = rockchip_spi_transfer_one;
++      master->max_transfer_size = rockchip_spi_max_transfer_size;
        master->handle_err = rockchip_spi_handle_err;
   
        rs->dma_tx.ch = dma_request_chan(rs->dev, "tx");