From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-oi0-f72.google.com (mail-oi0-f72.google.com [209.85.218.72]) by kanga.kvack.org (Postfix) with ESMTP id 6B09E6B0038 for ; Wed, 13 Sep 2017 05:24:25 -0400 (EDT) Received: by mail-oi0-f72.google.com with SMTP id g15so11831406oib.2 for ; Wed, 13 Sep 2017 02:24:25 -0700 (PDT) Received: from smtpbgau1.qq.com (smtpbgau1.qq.com. [54.206.16.166]) by mx.google.com with ESMTPS id 2si9232036oik.166.2017.09.13.02.24.22 for (version=TLS1 cipher=AES128-SHA bits=128/128); Wed, 13 Sep 2017 02:24:24 -0700 (PDT) From: Huacai Chen Subject: [PATCH V3 2/3] mm: dmapool: Align to ARCH_DMA_MINALIGN in non-coherent DMA mode Date: Wed, 13 Sep 2017 17:20:51 +0800 Message-Id: <1505294451-21312-1-git-send-email-chenhc@lemote.com> Sender: owner-linux-mm@kvack.org List-ID: To: Andrew Morton Cc: Fuxin Zhang , linux-mm@kvack.org, linux-kernel@vger.kernel.org, Huacai Chen , stable@vger.kernel.org In non-coherent DMA mode, kernel uses cache flushing operations to maintain I/O coherency, so the dmapool objects should be aligned to ARCH_DMA_MINALIGN. Cc: stable@vger.kernel.org Signed-off-by: Huacai Chen --- mm/dmapool.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/mm/dmapool.c b/mm/dmapool.c index 4d90a64..2ac6f4a 100644 --- a/mm/dmapool.c +++ b/mm/dmapool.c @@ -140,6 +140,9 @@ struct dma_pool *dma_pool_create(const char *name, struct device *dev, else if (align & (align - 1)) return NULL; + if (!plat_device_is_coherent(dev)) + align = max_t(size_t, align, dma_get_cache_alignment()); + if (size == 0) return NULL; else if (size < 4) -- 2.7.0 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: email@kvack.org