Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp6398902imu; Wed, 14 Nov 2018 00:26:35 -0800 (PST) X-Google-Smtp-Source: AJdET5euHMVHEypK/WWLvlbLFWMGkujaduVs7GcInRFkEI6NW0m3jH8AqJ9j+mPG1Ao3o4owE9dj X-Received: by 2002:a65:514c:: with SMTP id g12mr862516pgq.169.1542183995522; Wed, 14 Nov 2018 00:26:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542183995; cv=none; d=google.com; s=arc-20160816; b=dQFyEb2+3yy3RWzbmwyeJrQBSyDzwxniMSt/tmTm+uj5n1dLUZGPUcS1nDh479xDTV +5u9/WVMJMbbvkjG1dsyrzD2bO9h+U/hnZasVGxL1HF8IB4St/IJxEn7OKVvg0aqcwtj JGfnVlX+ozU+6SdiCfjdksB6MJ9Lv+vlomObf4GW9DE2SoVj4Fz+ASXvApGykkd/40/6 6ZdvMxMTq3ubHGAFQUEncVyqdgI2ZDb7cbymu8jqIPcuPsuIljLmAYdiEIA/oiQK+SXZ AGs9ik1msqER2IAOlkRzieUnOIpnWtw1R8CNrP0iUpUrpgu2IohdC6uxdTW0MLAv3ihW 2W3g== 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=gCVuzvVggZFIRBk8WXkwg5bZAcEMf1vQ3vY/a/Ab6FY=; b=N9pehvDetps3H0UvruIobydtYSGfiOie2pL4sOnJXP5+8/INX2PS6o/HiTOuIZKoJc hCQXoXRTBZKKCKElC5Nqhz4JxQuJY5MJvGB4xOZmAtfm3qtc6aDBk/A9dPGYOBJToIfv EYjxBj7CnF0uMKtC/EU16lTbQy7sI6y9vSoalbdF8zEuNq4OZfQr2O679ZrJVUHoRy+4 mptqRaqxwlnosqZehLIDl+MCsM22+tu+zlBPydutj7diVDV4BRj/8HE6PF+djI5MRggY cIPULPDud8u6vph+m2+MgcSjve7fG4sbi2/W5NKCEh5XyPuzksvznmPY1aCDKzmLgx8q exUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=iSZc5hx7; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 1-v6si24675537plj.53.2018.11.14.00.26.20; Wed, 14 Nov 2018 00:26:35 -0800 (PST) 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=fail header.i=@infradead.org header.s=bombadil.20170209 header.b=iSZc5hx7; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732704AbeKNS01 (ORCPT + 99 others); Wed, 14 Nov 2018 13:26:27 -0500 Received: from bombadil.infradead.org ([198.137.202.133]:49690 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728406AbeKNS01 (ORCPT ); Wed, 14 Nov 2018 13:26:27 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type: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=gCVuzvVggZFIRBk8WXkwg5bZAcEMf1vQ3vY/a/Ab6FY=; b=iSZc5hx715+ci5YXQA8EHRpLrf pHUBaGFdfHOsRplyvzUhMS4SsUPoZPDav3QZ3fyQsGjYKhCleOtDlpBlhiO46B3wzVZ8hGvg2iLc1 bTGzbmdSoM8mms8+yleQ16dw7zATnbDhr/cEmooQ62OzDqQpiTlZKjtW/5CnqfOZBhjXtIwgC1s0V C3b1kZUHbr4orJMiz8AdiBTxEc6Vl3/VeyonLkKG5+iHMWN1S1Tqf4Bl50EXkRlCsPpIvGsIZAWRx 2+/VztBXEdcbIk3AURTODsZx57XPSfYay5jJ4GMQn78JgYpIhZ+ApaPhDjz8VK2b/1mO3kEbFYHW6 t98ImeKQ==; Received: from 089144211136.atnat0020.highway.a1.net ([89.144.211.136] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.90_1 #2 (Red Hat Linux)) id 1gMqSj-0004rQ-H2; Wed, 14 Nov 2018 08:23:49 +0000 From: Christoph Hellwig To: Benjamin Herrenschmidt , Paul Mackerras , Michael Ellerman Cc: linuxppc-dev@lists.ozlabs.org, iommu@lists.linux-foundation.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 12/34] powerpc/cell: move dma direct window setup out of dma_configure Date: Wed, 14 Nov 2018 09:22:52 +0100 Message-Id: <20181114082314.8965-13-hch@lst.de> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181114082314.8965-1-hch@lst.de> References: <20181114082314.8965-1-hch@lst.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Configure the dma settings at device setup time, and stop playing games with get_pci_dma_ops. This prepares for using the common dma_configure code later on. Signed-off-by: Christoph Hellwig --- arch/powerpc/platforms/cell/iommu.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c index 12352a58072a..cce5bf9515e5 100644 --- a/arch/powerpc/platforms/cell/iommu.c +++ b/arch/powerpc/platforms/cell/iommu.c @@ -657,14 +657,21 @@ static const struct dma_map_ops dma_iommu_fixed_ops = { .mapping_error = dma_iommu_mapping_error, }; +static u64 cell_iommu_get_fixed_address(struct device *dev); + static void cell_dma_dev_setup(struct device *dev) { - if (get_pci_dma_ops() == &dma_iommu_ops) + if (get_pci_dma_ops() == &dma_iommu_ops) { + u64 addr = cell_iommu_get_fixed_address(dev); + + if (addr != OF_BAD_ADDR) + set_dma_offset(dev, addr + dma_iommu_fixed_base); set_iommu_table_base(dev, cell_get_iommu_table(dev)); - else if (get_pci_dma_ops() == &dma_nommu_ops) + } else if (get_pci_dma_ops() == &dma_nommu_ops) { set_dma_offset(dev, cell_dma_nommu_offset); - else + } else { BUG(); + } } static void cell_pci_dma_dev_setup(struct pci_dev *dev) @@ -950,19 +957,14 @@ static int dma_suported_and_switch(struct device *dev, u64 dma_mask) { if (dma_mask == DMA_BIT_MASK(64) && cell_iommu_get_fixed_address(dev) != OF_BAD_ADDR) { - u64 addr = cell_iommu_get_fixed_address(dev) + - dma_iommu_fixed_base; dev_dbg(dev, "iommu: 64-bit OK, using fixed ops\n"); - dev_dbg(dev, "iommu: fixed addr = %llx\n", addr); set_dma_ops(dev, &dma_iommu_fixed_ops); - set_dma_offset(dev, addr); return 1; } if (dma_iommu_dma_supported(dev, dma_mask)) { dev_dbg(dev, "iommu: not 64-bit, using default ops\n"); - set_dma_ops(dev, get_pci_dma_ops()); - cell_dma_dev_setup(dev); + set_dma_ops(dev, &dma_iommu_ops); return 1; } -- 2.19.1