media: bcm2835-unicam: Drop WARN on uing direct cache alias
authorDave Stevenson <dave.stevenson@raspberrypi.com>
Thu, 27 Aug 2020 15:30:26 +0000 (16:30 +0100)
committerDom Cobley <popcornmix@gmail.com>
Mon, 21 Mar 2022 16:04:05 +0000 (16:04 +0000)
Pi 0&1 pass all ARM accesses through the VPU L2 cache, therefore
the dma-ranges property sets the cache alias bits to other
than the direct alias, hence this WARN was firing.

It was overprotective coding, so assume that everything is OK
with the dma-ranges, and remove the WARN.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
drivers/media/platform/bcm2835/bcm2835-unicam.c

index 295db7564614454258a2a2d3fad67e62a6f73bba..35ddb97f7f754d0e181107fa157dc806b338aa3a 100644 (file)
@@ -709,13 +709,6 @@ static void unicam_wr_dma_addr(struct unicam_device *dev, dma_addr_t dmaaddr,
 {
        dma_addr_t endaddr = dmaaddr + buffer_size;
 
-       /*
-        * dmaaddr and endaddr should be a 32-bit address with the top two bits
-        * set to 0x3 to signify uncached access through the Videocore memory
-        * controller.
-        */
-       WARN_ON((dmaaddr >> 30) != 0x3 || (endaddr >> 30) != 0x3);
-
        if (pad_id == IMAGE_PAD) {
                reg_write(dev, UNICAM_IBSA0, dmaaddr);
                reg_write(dev, UNICAM_IBEA0, endaddr);