From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E0EC2C41514 for ; Fri, 2 Aug 2019 13:22:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AFD7520880 for ; Fri, 2 Aug 2019 13:22:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564752177; bh=A8tPzKVZoQ3B5fe6QJTNAfk+W0Z4KRu0sKrKlp/NYQQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=kG3oDHeO/BiF4NX+/EbrtYakxHAr9YRYftDjT5VHO7kkji+2lbkHSzetNCuGruH+a WYTXeNhfb04WafMqeipHwstZZDHn2/J84LUTp40Mmoahu8KRfnBGv7e0z9PZUsDZ/U neD3jtAJnf+i011RKMEBecV/pbum1/bl/Nvv67V4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393890AbfHBNW4 (ORCPT ); Fri, 2 Aug 2019 09:22:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:33406 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393864AbfHBNWx (ORCPT ); Fri, 2 Aug 2019 09:22:53 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3587A2183F; Fri, 2 Aug 2019 13:22:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564752173; bh=A8tPzKVZoQ3B5fe6QJTNAfk+W0Z4KRu0sKrKlp/NYQQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A+w4wdcuUQ3e/NF6CziBRXRrU5Qrd6Pb431/cJ6HTuBcbbyVJx8+s42v5gfBPegup F+U8TJL2/RFjCUldqJMS+hPOuUdIHOfRWvFU31THUVbDKh24n2tY5HSayyKRfHVmhU +Kg7mF+GNc1eTds0s1urbfGNatNkgEXu9FfJBQSA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Halil Pasic , Petr Tesarik , Heiko Carstens , Sasha Levin , linux-s390@vger.kernel.org Subject: [PATCH AUTOSEL 5.2 75/76] s390/dma: provide proper ARCH_ZONE_DMA_BITS value Date: Fri, 2 Aug 2019 09:19:49 -0400 Message-Id: <20190802131951.11600-75-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190802131951.11600-1-sashal@kernel.org> References: <20190802131951.11600-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Halil Pasic [ Upstream commit 1a2dcff881059dedc14fafc8a442664c8dbd60f1 ] On s390 ZONE_DMA is up to 2G, i.e. ARCH_ZONE_DMA_BITS should be 31 bits. The current value is 24 and makes __dma_direct_alloc_pages() take a wrong turn first (but __dma_direct_alloc_pages() recovers then). Let's correct ARCH_ZONE_DMA_BITS value and avoid wrong turns. Signed-off-by: Halil Pasic Reported-by: Petr Tesarik Fixes: c61e9637340e ("dma-direct: add support for allocation from ZONE_DMA and ZONE_DMA32") Signed-off-by: Heiko Carstens Signed-off-by: Sasha Levin --- arch/s390/include/asm/page.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/s390/include/asm/page.h b/arch/s390/include/asm/page.h index a4d38092530ab..823578c6b9e2c 100644 --- a/arch/s390/include/asm/page.h +++ b/arch/s390/include/asm/page.h @@ -177,6 +177,8 @@ static inline int devmem_is_allowed(unsigned long pfn) #define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) +#define ARCH_ZONE_DMA_BITS 31 + #include #include -- 2.20.1