git.openwrt.org Git - openwrt/staging/jow.git/blob

   1 From 8367085242d7541f30069a8100d6adf62b7bb181 Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
   3 Date: Thu, 27 Aug 2020 16:30:26 +0100
   4 Subject: [PATCH] media: bcm2835-unicam: Drop WARN on uing direct cache
   5  alias
   6
   7 Pi 0&1 pass all ARM accesses through the VPU L2 cache, therefore
   8 the dma-ranges property sets the cache alias bits to other
   9 than the direct alias, hence this WARN was firing.
  10
  11 It was overprotective coding, so assume that everything is OK
  12 with the dma-ranges, and remove the WARN.
  13
  14 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  15 ---
  16  drivers/media/platform/bcm2835/bcm2835-unicam.c | 7 -------
  17  1 file changed, 7 deletions(-)
  18
  19 --- a/drivers/media/platform/bcm2835/bcm2835-unicam.c
  20 +++ b/drivers/media/platform/bcm2835/bcm2835-unicam.c
  21 @@ -711,13 +711,6 @@ static void unicam_wr_dma_addr(struct un
  22  {
  23         dma_addr_t endaddr = dmaaddr + buffer_size;
  24
  25 -       /*
  26 -        * dmaaddr and endaddr should be a 32-bit address with the top two bits
  27 -        * set to 0x3 to signify uncached access through the Videocore memory
  28 -        * controller.
  29 -        */
  30 -       WARN_ON((dmaaddr >> 30) != 0x3 || (endaddr >> 30) != 0x3);
  31 -
  32         if (pad_id == IMAGE_PAD) {
  33                 reg_write(dev, UNICAM_IBSA0, dmaaddr);
  34                 reg_write(dev, UNICAM_IBEA0, endaddr);