From patchwork Thu Dec 29 20:45:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nikita Yushchenko X-Patchwork-Id: 709568 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3tqM7C5Xwvz9sR9 for ; Fri, 30 Dec 2016 07:45:27 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=cogentembedded-com.20150623.gappssmtp.com header.i=@cogentembedded-com.20150623.gappssmtp.com header.b="Y+5zzOIB"; dkim-atps=neutral Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751344AbcL2UpX (ORCPT ); Thu, 29 Dec 2016 15:45:23 -0500 Received: from mail-lf0-f49.google.com ([209.85.215.49]:36752 "EHLO mail-lf0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750886AbcL2UpU (ORCPT ); Thu, 29 Dec 2016 15:45:20 -0500 Received: by mail-lf0-f49.google.com with SMTP id t196so227449626lff.3 for ; Thu, 29 Dec 2016 12:45:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cogentembedded-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=vmEkUoFm55ZCUg1FIOxmaAJ3IJZfcBxa6loNvMv6z8s=; b=Y+5zzOIBVVc6NUPqzIVJFJFR2B2N41eYCHGg88ghsnkesWQHi7xwYycsOJi5AhMWp1 cMKdN44RoToJlRNUdDuydGOuEg4SZxdn7LTfShiCs0b0I2xiqij5qPacrq7kECY6poon 8jKHBUazZwOe9Cv5AjvCtTutOjch8grpmFFnD3IXbYf3FbJeCejJd61A8worGsi1gUty qWb5Pgx+F/ln6W8EF7yxWnjogHRiPk+8G5U26XJnas84eFU/sE240mvGE9k0rmY4bMFE d/Ube+bHB5pqMP1EF+swUucdnSkq6Ah8k9SfyaLzrix0XFgdEc5jUuUyv1ymNi/5qnff dF4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=vmEkUoFm55ZCUg1FIOxmaAJ3IJZfcBxa6loNvMv6z8s=; b=DMVqqt0nxNjQqXFHO1LzXj4CMUkl5vP/E1dMEiVaFUiPuCi7En9uWKeSoVYLJEEfiA mIRWolOtBArssiwVUabIJtQPvbtce3v8wrT4AL6u/zd43Zn9TiKCKtaFTxdyXS4R0RC7 BqbxJ/TTFwFPxwxWDAHsxUeDiHz87c1J+3axHzF0BbIemcp/1cvAJlBhAW/CyXYWkdJf a9Aq8V5PP484t6PcPGiJDsz9lO6zgSmdl9wEclVyUOmyqbiQHJ3TousVgtbXgxsBSZi+ 7L8+m+NKMkxPDw88ZtHwBLCbUNmMsHT2XZyATx0UZY0vzH7qFFurPSQ2in0PBuMp782G l6Mg== X-Gm-Message-State: AIkVDXLz2+ka0Ksz1v0y6e+PjdJJoyhxooe2DJX8g8Oik0wjNYXKkqHxox+BdSlQV4sF5A== X-Received: by 10.25.215.212 with SMTP id q81mr15728133lfi.126.1483044318349; Thu, 29 Dec 2016 12:45:18 -0800 (PST) Received: from hugenb.home (nikaet.starlink.ru. [94.141.168.29]) by smtp.gmail.com with ESMTPSA id d2sm3338104lfe.13.2016.12.29.12.45.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 29 Dec 2016 12:45:16 -0800 (PST) From: Nikita Yushchenko To: Catalin Marinas , Will Deacon , Arnd Bergmann , linux-arm-kernel@lists.infradead.org, Simon Horman , Bjorn Helgaas , linux-pci@vger.kernel.org, linux-renesas-soc@vger.kernel.org Cc: artemi.ivanov@cogentembedded.com, linux-kernel@vger.kernel.org, Nikita Yushchenko Subject: [PATCH 2/2] rcar-pcie: set host bridge's DMA mask Date: Thu, 29 Dec 2016 23:45:04 +0300 Message-Id: <1483044304-2085-2-git-send-email-nikita.yoush@cogentembedded.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1483044304-2085-1-git-send-email-nikita.yoush@cogentembedded.com> References: <1483044304-2085-1-git-send-email-nikita.yoush@cogentembedded.com> Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org This gives platform DMA mapping code a chance to disallow setting device DMA mask to something that host bridge can't support. Signed-off-by: Nikita Yushchenko --- drivers/pci/host/pcie-rcar.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c index aca85be..b1edc3c 100644 --- a/drivers/pci/host/pcie-rcar.c +++ b/drivers/pci/host/pcie-rcar.c @@ -451,6 +451,7 @@ static int rcar_pcie_enable(struct rcar_pcie *pcie) { struct device *dev = pcie->dev; struct pci_bus *bus, *child; + struct pci_host_bridge *bridge; LIST_HEAD(res); /* Try setting 5 GT/s link speed */ @@ -480,6 +481,10 @@ static int rcar_pcie_enable(struct rcar_pcie *pcie) list_for_each_entry(child, &bus->children, node) pcie_bus_configure_settings(child); + bridge = pci_find_host_bridge(bus); + bridge->dev.coherent_dma_mask = DMA_BIT_MASK(32); + bridge->dev.dma_mask = &bridge->dev.coherent_dma_mask; + pci_bus_add_devices(bus); return 0;