Received: by 2002:a25:b794:0:0:0:0:0 with SMTP id n20csp124755ybh; Fri, 2 Aug 2019 19:33:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqxqv6BO/WFvDdXdgtC6zpkxqC8pfgRA6ltJUlWHzaqYaZziNbTEVfGVwxRO8dOVKyhsX7iP X-Received: by 2002:a17:902:b48f:: with SMTP id y15mr136882334plr.268.1564799612860; Fri, 02 Aug 2019 19:33:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564799612; cv=none; d=google.com; s=arc-20160816; b=w9czQ4CBZG8QjUeyv1cYWY+7pPiNNSqxR1XIm681G1JMTn5mVd+tBulhfGtqMkv11O H9H7k54t8hRwqZby0I8dsx9ZtlcV0bAX7BRrzD1fD9IHEOBePOPb7xtXDhFUqLbQw/Py DdCJft5v5n+/IndC9lw+6fqasiJNGdLiMndAn5GJu4HmYkZgRyo9GFiD3HDBJ6xUPW/9 TUnjGdWqrhEuE4ZHCNUN2gG80RTSnbjbpCahgrDTKv9HNb9oNrV8o9POvzhL2ADq2YfP sWTjUHY0DFJtN/5ZY3PhAY8yUWmyQIDKT9XVUsXNKfln0rE11iKMhRVrkNdwDdM+TY+x oULQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=qxvAdRyHWgeNbFFYViD0JiyI6Cd37RKMovCAtEXLTsE=; b=aBp/y0yPD0Fy5DwGt2a0AUqCgprtKAus7C68t/u9u1UKl6zYnAhpotrcvhlEHZEgsL d0ickbGUCe+X/GcqXX3VA7y/RLX1o8ewoTe0dcQtlLBC7Erjktf/j19GI1CtDEP6gYxh Knczejq0zf/v4Wn/6ozWytsoAWwjeNbrssfIdH6VHEg9Exx7TfWWvSSYqPUHvBa20GVR s04Tp3E4i1Ed/t5rWKcSVZP/5tAF5+pRSLIznobfdT9m++hzqnP6qDZc4eSKAs0320fb raxvZvfLLQfHbbZ3Qv/lQf6yBuzVZJj0PkcnOtqlNsW4vATdCPeTIZr8VIdyWUZzuEbH swuA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=KeEtWPhc; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v24si40893263pgk.509.2019.08.02.19.33.17; Fri, 02 Aug 2019 19:33:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=KeEtWPhc; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404246AbfHBNao (ORCPT + 99 others); Fri, 2 Aug 2019 09:30:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:35100 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2394150AbfHBNYV (ORCPT ); Fri, 2 Aug 2019 09:24:21 -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 BAF0320644; Fri, 2 Aug 2019 13:24:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564752261; bh=dZeEXrzP2FGVY/ahJCjiRXYGxTXCSuAChtIkspnQDrc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KeEtWPhcRxc2NBKfoDV6iatO349wHPAp2ih1bpQDQm0jOGOEMAw68wYwfbDf0rtsi ZjaMLqk2/hMqokDP/Tho9rxLFy4FRVKpmcxPWRpnDhrXGI5tBACanWJbTKvFsVKSN2 w82zzR48avbPVT1uCURZD85MwM39sRHX38b+qdfY= 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 4.19 42/42] s390/dma: provide proper ARCH_ZONE_DMA_BITS value Date: Fri, 2 Aug 2019 09:23:02 -0400 Message-Id: <20190802132302.13537-42-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190802132302.13537-1-sashal@kernel.org> References: <20190802132302.13537-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 41e3908b397f8..0d753291c43c0 100644 --- a/arch/s390/include/asm/page.h +++ b/arch/s390/include/asm/page.h @@ -176,6 +176,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