Hi Sasha, On Wed, Mar 16, 2022 at 3:15 PM Sasha Levin <sashal@xxxxxxxxxx> wrote: > From: Biju Das <biju.das.jz@xxxxxxxxxxxxxx> > > [ Upstream commit 1a4e53d2fc4f68aa654ad96d13ad042e1a8e8a7d ] This commit is not 100% correct, cfr. https://lore.kernel.org/lkml/CAHk-=wiZnS6n1ROQg3FHd=bcVTHi-sKutKT+toiViQEH47ZACg@xxxxxxxxxxxxxx Please postpone backporting until the issue has been resolved. > > max_seg_size is unsigned int and it can have a value up to 2^32 > (for eg:-RZ_DMAC driver sets dma_set_max_seg_size as U32_MAX) > When this value is used in min_t() as an integer type, it becomes > -1 and the value of sgs becomes 0. > > Fix this issue by replacing the 'int' data type with 'unsigned int' > in min_t(). > > Signed-off-by: Biju Das <biju.das.jz@xxxxxxxxxxxxxx> > Reviewed-by: Lad Prabhakar <prabhakar.mahadev-lad.rj@xxxxxxxxxxxxxx> > Reviewed-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx> > Link: https://lore.kernel.org/r/20220307184843.9994-1-biju.das.jz@xxxxxxxxxxxxxx > Signed-off-by: Mark Brown <broonie@xxxxxxxxxx> > Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx> > --- > drivers/spi/spi.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c > index 8ba87b7f8f1a..ed4e6983eda0 100644 > --- a/drivers/spi/spi.c > +++ b/drivers/spi/spi.c > @@ -1021,10 +1021,10 @@ int spi_map_buf(struct spi_controller *ctlr, struct device *dev, > int i, ret; > > if (vmalloced_buf || kmap_buf) { > - desc_len = min_t(int, max_seg_size, PAGE_SIZE); > + desc_len = min_t(unsigned int, max_seg_size, PAGE_SIZE); > sgs = DIV_ROUND_UP(len + offset_in_page(buf), desc_len); > } else if (virt_addr_valid(buf)) { > - desc_len = min_t(int, max_seg_size, ctlr->max_dma_len); > + desc_len = min_t(unsigned int, max_seg_size, ctlr->max_dma_len); > sgs = DIV_ROUND_UP(len, desc_len); > } else { > return -EINVAL; Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
