Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2475273imu; Sun, 9 Dec 2018 02:26:15 -0800 (PST) X-Google-Smtp-Source: AFSGD/UZOn8lYsZtt4RBIYoiEs0Qall2A8hJ2hZ5caneIUjIFMfFuT5Qgtl9LVsa3AGC8VXfLAn6 X-Received: by 2002:a17:902:7044:: with SMTP id h4mr8133661plt.35.1544351175377; Sun, 09 Dec 2018 02:26:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544351175; cv=none; d=google.com; s=arc-20160816; b=tYgc3rX4ZmjGaw9DCcFK9l1elUo1DYUvLlCtIW9OWyHhMk+whOZ5Hfkod6RzP6gr8h 02jJ5lRwnu36HLJ9thHVxSNoSHWHa/oMYYFvtS3ySZNygnKXrDyYa0FZ/A5Tf8qC30da 1bhVkqZq0AomaFZlFmeYlG8W9h3GLOb5tJf/aotxLCDBKv1Rjmf7oiIQCZSJPp9PC6Wk gsaOmZ1UrSLLskW2sid3iQZbU/DCdng9hI2oJYoFy2I7L86ggWmC+yUj+4ITB08aQh5b 4qq2pgU1bKc9L5CejxYCSQzpefwTewqSr+0B1XWbxCWxeBakMDL5XrTGn09TolqtbPyE 0MeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from; bh=LQYsHFOtLPYkzDGh94P3tPNTLVF8phUiVaouJJsyN14=; b=bbdi47wsaDbp7V9gZdD+uIGHtwOlhH6D/geOFZGPSyV38Gq82pAwOtumFMHjYrMbv3 dJ9KM0/1uMbC2gvH9U050wLDLntAwYrnAZ1CxXsNcp4V90lIsbrOneOc7mjdCFMhc2Jq MP1uXAnKf6DC88+XdY1WWKv/N4r2HkStKO1GZWEaIZdMH7vJAm33F2f1Car58Z0UnHA/ BVcjK5b47lzNwnmEmbOfWDxaR8dkM/tQgrN2+adhIRd2oLnfmW3PcekRuMulqfMZoJGh oloLWqoFvo2K+jQK/Nvjr+PjWINPftJ1U5tkFawTMln+z7Xn28UDc/o109RPwZdB5s/r n8GQ== ARC-Authentication-Results: i=1; mx.google.com; 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 t12si7358392plq.190.2018.12.09.02.26.00; Sun, 09 Dec 2018 02:26:15 -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; 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 S1726235AbeLIKXn (ORCPT + 99 others); Sun, 9 Dec 2018 05:23:43 -0500 Received: from ozlabs.org ([203.11.71.1]:49115 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726079AbeLIKXn (ORCPT ); Sun, 9 Dec 2018 05:23:43 -0500 Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPSA id 43CMk40qChz9s2P; Sun, 9 Dec 2018 21:23:40 +1100 (AEDT) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=ellerman.id.au From: Michael Ellerman To: Christoph Hellwig , Benjamin Herrenschmidt , Paul Mackerras 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: Re: [PATCH 12/34] powerpc/cell: move dma direct window setup out of dma_configure In-Reply-To: <20181114082314.8965-13-hch@lst.de> References: <20181114082314.8965-1-hch@lst.de> <20181114082314.8965-13-hch@lst.de> Date: Sun, 09 Dec 2018 21:23:39 +1100 Message-ID: <871s6r3sno.fsf@concordia.ellerman.id.au> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Christoph Hellwig writes: > 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(-) This one's crashing, haven't dug into why yet: [ 1.347085] Unable to handle kernel paging request for data at address 0x00000040 [ 1.391505] Faulting instruction address: 0xc0000000006b6e6c cpu 0x0: Vector: 380 (Data SLB Access) at [c0000007fc9032d0] pc: c0000000006b6e6c: .of_n_addr_cells+0x34/0xc0 lr: c000000000070b30: .cell_iommu_get_fixed_address+0x58/0x2b0 sp: c0000007fc903560 msr: 9000000000009032 dar: 40 current = 0xc0000007fc8d0000 paca = 0xc000000000f60000 irqmask: 0x03 irq_happened: 0x01 pid = 1, comm = swapper/0 Linux version 4.20.0-rc2-gcc7x-g1e32f48 (kerkins@p82) (gcc version 7.4.1 20181208 (Custom eb377405ab2d1900)) #1 SMP Sun Dec 9 12:16:48 AEDT 2018 enter ? for help [c0000007fc9035f0] c000000000070b30 .cell_iommu_get_fixed_address+0x58/0x2b0 [c0000007fc9036c0] c0000000000711ac .cell_dma_dev_setup.part.1+0x24/0x118 [c0000007fc903740] c000000000071374 .cell_of_bus_notify+0x6c/0xbc [c0000007fc9037c0] c0000000000e7ef0 .notifier_call_chain+0x90/0xf8 [c0000007fc903860] c0000000000e8c2c .blocking_notifier_call_chain+0x84/0xb8 [c0000007fc9038f0] c000000000597544 .device_add+0x584/0x7b8 [c0000007fc9039c0] c0000000005a0308 .platform_device_add+0x148/0x2f0 [c0000007fc903a60] c0000000005a1508 .platform_device_register_full+0x148/0x168 [c0000007fc903ae0] c000000000a9a8a0 .__machine_initcall_cell_cell_publish_devices+0x1bc/0x210 [c0000007fc903be0] c00000000000eca4 .do_one_initcall+0x64/0x2d8 [c0000007fc903cc0] c000000000a844ec .kernel_init_freeable+0x3dc/0x4e4 [c0000007fc903da0] c00000000000f06c .kernel_init+0x24/0x150 [c0000007fc903e20] c00000000000a9c0 .ret_from_kernel_thread+0x58/0x78 cheers > 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