Message ID | 1491823266-1209-6-git-send-email-sricharan@codeaurora.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4961D60244 for <patchwork-linux-arm@patchwork.kernel.org>; Mon, 10 Apr 2017 11:56:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 401912807E for <patchwork-linux-arm@patchwork.kernel.org>; Mon, 10 Apr 2017 11:56:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2F0FC282E2; Mon, 10 Apr 2017 11:56:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 9F1312807E for <patchwork-linux-arm@patchwork.kernel.org>; Mon, 10 Apr 2017 11:56:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=Li/H5P1N9578gXLxyQ2XZyaunBFVfWhcWJiCim7OlN8=; b=LiwKC8ZdwpaAyDeTQeIk/f7pKN 7a3dIoKOzsATfxko9xkBpzmB85p2Vawxe5H0FTwx1yLlROAKozUfhx8XLGv7z0r7wEK21TlxzLAN3 +rhBd6aukK12FmlCYwj7OQYT7KhlDl2LvW6/jVGcPD6okgY6JWGEoLgo7IeklqnWPlTJtAf9h4VuF y5FiH8k1XwcIWmX4j2nnsD7rjz6R91CWre363DsyvJP9si2SSga1/PQZvY3VLkNrjOVjriHN6Jxv1 ThlobHa88ZrxkzcuYfW8gTTV+iTTKFWqjYnPkN3TctGXK7hB/zoPD5P2KO/Rzwod4+7WZlP1aZ4xk Wwpyc7Pg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cxXvd-0004zl-2J; Mon, 10 Apr 2017 11:56:17 +0000 Received: from merlin.infradead.org ([2001:4978:20e::2]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cxXhv-0006hD-J0 for linux-arm-kernel@bombadil.infradead.org; Mon, 10 Apr 2017 11:42:07 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=cKiFFZrQ3eCWA0MNtnlwIPuXm/gHhlCUmLaGdVrOOuY=; b=YjwwzXXvvAX2sdevQ+il4zCMJ 7SqqPryNwUrWNTIf4phhwbpwgZFSLtqKKUsHfLmDFHiXqvKHgqYg6Y/UJ7DZsOTHpDZ6wRIQIGaVb iJIKsgY4kzMVFev7/y3okMe2FHwFaCXIyYEdl6d3QTeKifOYU3/MlfiafhV7JLWudlFGWbd1EFmSK X+5um8dSBQf7VsDLJWcYpRwsR+dY/dqDfHeKWXyMDOS5tVtbpJjyI5lg+LgOWErNRm3A7AKnaPypH UlMfD8VtL3vCQRWReX3tynDh7CS43rIkUWKHETol18CC3fN9Ihgapc/ZY/2NFaL8r4MixUv+Wv7EB Wi1IcPfJQ==; Received: from smtp.codeaurora.org ([198.145.29.96]) by merlin.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cxXP5-0004x4-E5 for linux-arm-kernel@lists.infradead.org; Mon, 10 Apr 2017 11:22:40 +0000 Received: by smtp.codeaurora.org (Postfix, from userid 1000) id F0D7B60B6B; Mon, 10 Apr 2017 11:22:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1491823337; bh=BjBYoLXlDXL7kOIIXo+glre3/G/4aJ+lp7uUBs4K6kY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W27QWnYsWZNRAdHmkspvFl50PllvnsiwrMHq9ncMvayYCv2fFjHvdswFGqF3ddcMF /gXAYW8Ey9VB2kbRGJeib6F29alw5uWH8w+ppiQr1opb+VSaVLOCISYMDYn2yFl+BJ PENydw766sTs98PaCUD/ivaMi2eBz2DCO4m8jwVo= Received: from srichara-linux.qualcomm.com (unknown [202.46.23.62]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) (Authenticated sender: sricharan@smtp.codeaurora.org) by smtp.codeaurora.org (Postfix) with ESMTPSA id 2AF4760CDE; Mon, 10 Apr 2017 11:22:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=codeaurora.org; s=default; t=1491823336; bh=BjBYoLXlDXL7kOIIXo+glre3/G/4aJ+lp7uUBs4K6kY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OfE4yf0xkWWbqSJEmeo8ds+Q0tq6nu5UlXSpX9LfTSaQNuAy8niqbjEkbJ3PTV4+q kD+HcIIAURu9C5lG250ykbPp2nCcZxpKB76KuBFTyfpsqFFWtFpNWTdq4cUFOtjPrp luGTmcdvPrIADB8czmWRVq4z4J0SnLwST3/Y3V+c= DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org 2AF4760CDE Authentication-Results: pdx-caf-mail.web.codeaurora.org; dmarc=none (p=none dis=none) header.from=codeaurora.org Authentication-Results: pdx-caf-mail.web.codeaurora.org; spf=none smtp.mailfrom=sricharan@codeaurora.org From: Sricharan R <sricharan@codeaurora.org> To: robin.murphy@arm.com, will.deacon@arm.com, joro@8bytes.org, lorenzo.pieralisi@arm.com, iommu@lists.linux-foundation.org, linux-arm-kernel@lists.infradead.org, linux-arm-msm@vger.kernel.org, m.szyprowski@samsung.com, bhelgaas@google.com, linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org, tn@semihalf.com, hanjun.guo@linaro.org, okaya@codeaurora.org, robh+dt@kernel.org, frowand.list@gmail.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, sudeep.holla@arm.com, rjw@rjwysocki.net, lenb@kernel.org, catalin.marinas@arm.com, arnd@arndb.de, linux-arch@vger.kernel.org, gregkh@linuxfoundation.org Subject: [PATCH V11 05/11] of: device: Fix overflow of coherent_dma_mask Date: Mon, 10 Apr 2017 16:51:00 +0530 Message-Id: <1491823266-1209-6-git-send-email-sricharan@codeaurora.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1491823266-1209-1-git-send-email-sricharan@codeaurora.org> References: <1491823266-1209-1-git-send-email-sricharan@codeaurora.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170410_072239_643637_61F2EE21 X-CRM114-Status: GOOD ( 16.54 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Cc: sricharan@codeaurora.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/drivers/of/device.c b/drivers/of/device.c index 0d378c0..e1ae9e7 100644 --- a/drivers/of/device.c +++ b/drivers/of/device.c @@ -107,7 +107,7 @@ void of_dma_configure(struct device *dev, struct device_node *np) ret = of_dma_get_range(np, &dma_addr, &paddr, &size); if (ret < 0) { dma_addr = offset = 0; - size = dev->coherent_dma_mask + 1; + size = max(dev->coherent_dma_mask, dev->coherent_dma_mask + 1); } else { offset = PFN_DOWN(paddr - dma_addr);