From patchwork Wed Mar 25 05:35:38 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Axtens X-Patchwork-Id: 454165 X-Patchwork-Delegate: michael@ellerman.id.au Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 0D531140119 for ; Wed, 25 Mar 2015 16:44:15 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=axtens.net header.i=@axtens.net header.b=AoSuPtnM; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id CF20C1A1947 for ; Wed, 25 Mar 2015 16:44:14 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=axtens.net header.i=@axtens.net header.b=AoSuPtnM; dkim-adsp=none (unprotected policy); dkim-atps=neutral X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mail-pd0-x229.google.com (mail-pd0-x229.google.com [IPv6:2607:f8b0:400e:c02::229]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 2F0521A0769 for ; Wed, 25 Mar 2015 16:36:22 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=pass reason="1024-bit key; unprotected key" header.d=axtens.net header.i=@axtens.net header.b=AoSuPtnM; dkim-adsp=pass; dkim-atps=neutral Received: by pdnc3 with SMTP id c3so17183246pdn.0 for ; Tue, 24 Mar 2015 22:36:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axtens.net; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=EqNcEnZdrnoj7uZe7UVkD7H6XgI0BsJuggyfog5YQVw=; b=AoSuPtnMcwU2izh7WxGZKZogVF5xDlGRtYuXnrMngfF/EieaTHkAVA7O3A5/V2c1fb lQ+/f0yb4NzojgWk1ROhwlc5s4SiF4IosbMku4/tgD1d2FulCk8D+wilRijXsF0N2TPi +jwdHEv2zGbQ25c80AIA+j9fwVAy47UqP9L2E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=EqNcEnZdrnoj7uZe7UVkD7H6XgI0BsJuggyfog5YQVw=; b=BAySgjd2vQQErh+6zTf+SP70fH/1ngSzgks5RNTjU7CCBlQfJz/BNMJYFAh1YqodiT SinfAZfEVM2fJuw+paETiz6HD7aGyrl200w/4mwSW5cGjRZ/9+HTDx9oXIUkbMgTZtsN 4DOelj6U/QvpXpD3Gsle0sCAbrrMIBJMFzc+CxcGf1oWmV3qeZm4J4YIjMZKm7OWpmao YeF6M9/i/B+wwTpvapBs8kOS8Bg5YmEc+a3i6ee2ooqd5NYouULBBd8f15dXITbnwjHq EFAZsD+7bTzEHjt3XvFRfU2FNaLxuod824WsxCT3yf06w+uCwEcT+PLzPyKHgZS/icIq /rXw== X-Gm-Message-State: ALoCoQn1qbdMTtipIwB2PqtFAFzs1MWcb/AxoQMDCTAufUiiSUfQ1PICLaU8eCQYMYXLEJxF7pCU X-Received: by 10.66.172.164 with SMTP id bd4mr13454377pac.145.1427261779719; Tue, 24 Mar 2015 22:36:19 -0700 (PDT) Received: from omicron.ozlabs.ibm.com ([122.99.82.10]) by mx.google.com with ESMTPSA id ve3sm1054803pbc.22.2015.03.24.22.36.16 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 24 Mar 2015 22:36:19 -0700 (PDT) From: Daniel Axtens To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH 04/27] powerpc/fsl_pci: Don't change ppc_swiotlb_enable after swiotlb_subsys_init Date: Wed, 25 Mar 2015 16:35:38 +1100 Message-Id: <1427261761-22952-5-git-send-email-dja@axtens.net> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1427261761-22952-1-git-send-email-dja@axtens.net> References: <1427261761-22952-1-git-send-email-dja@axtens.net> Cc: Daniel Axtens X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" The only function that checks ppc_swiotlb_enable is swiotlb_subsys_init. The code in fsl_pci.c is called well after that, so don't bother changing it. (ppc_swiotlb is usually set in swiotlb_detect_4g, which is called by a number of arch initcalls.) Signed-off-by: Daniel Axtens --- arch/powerpc/sysdev/fsl_pci.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index 4b74c27..7071feb 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c @@ -376,9 +376,7 @@ static void setup_pci_atmu(struct pci_controller *hose) } if (hose->dma_window_size < mem) { -#ifdef CONFIG_SWIOTLB - ppc_swiotlb_enable = 1; -#else +#ifndef CONFIG_SWIOTLB pr_err("%s: ERROR: Memory size exceeds PCI ATMU ability to " "map - enable CONFIG_SWIOTLB to avoid dma errors.\n", name);