From patchwork Fri Nov 28 03:43:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ming Lei X-Patchwork-Id: 415776 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 19EF41401D0; Fri, 28 Nov 2014 14:43:54 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XuCTB-0004cq-Bl; Fri, 28 Nov 2014 03:43:45 +0000 Received: from mail-pd0-f175.google.com ([209.85.192.175]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1XuCT6-0004cV-Jh for kernel-team@lists.ubuntu.com; Fri, 28 Nov 2014 03:43:40 +0000 Received: by mail-pd0-f175.google.com with SMTP id y10so5898539pdj.20 for ; Thu, 27 Nov 2014 19:43:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=from:to:subject:date:message-id; bh=vb2x90X6zLt8FqPLCqIHbJZDN+v8eM5eR0erRM097fA=; b=NDZJkh2eG+hHoRS0KCZqCiXAh868XNQ8n2ze2QwwHilcPrw9ZMHrquBcE4i416G3bv oG8hYYWF/088KrDW7EoOkk494Rzwqqzm9nPoU40eIYCEr7qwiat8sEqIC2UdX56hHX7R /Yx25UDSt4ktnxOalVy8DUr46mSSofpaMtjtLCEHjEk0iV/QhkAdY+y1r23B6NnMIOOA pNTJULaW64XRa7VAMUlCllNwrVND3QwYp4sCXzAJlQGG8M4dxplELlo1evCn9pf7otHw uhP2dSA1tFeYHwhFnbZugkFC50ugbJ3mpeElvo6g64LgNFEWGPhrqOwCL9uB0VN5q35F WbDQ== X-Received: by 10.70.103.231 with SMTP id fz7mr68639760pdb.32.1417146219935; Thu, 27 Nov 2014 19:43:39 -0800 (PST) Received: from localhost ([116.24.101.9]) by mx.google.com with ESMTPSA id ek5sm8405921pbd.4.2014.11.27.19.43.38 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 27 Nov 2014 19:43:39 -0800 (PST) From: Ming Lei To: kernel-team@lists.ubuntu.com Subject: [PATCH] Revert "arm64: Make default dma_ops to be noncoherent" Date: Fri, 28 Nov 2014 11:43:34 +0800 Message-Id: <1417146214-24621-1-git-send-email-ming.lei@canonical.com> X-Mailer: git-send-email 1.7.9.5 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com This reverts commit c7a4a7658d689f664050c45493d79adf053f226e. Conflicts: arch/arm64/mm/dma-mapping.c On ARM64, Utopic kernel ships APM's PCI host controller driver which isn't upstreamed yet, and APM's ARM64 Soc is a coherent platform. On the other side, ARM64 maintainer[1] said the commit c7a4a7658 can be reverted safely if booting with ACPI which can be supported by APM's own kernel release too. So please revert the commit c7a4a7658 to avoid breaking PCI function on APM ARM64. BugLink: https://bugs.launchpad.net/bugs/1386490 [1] http://marc.info/?l=linux-arm-kernel&m=141708838404470&w=2 Cc: Dann Frazier Signed-off-by: Ming Lei Acked-by: dann frazier --- arch/arm64/mm/dma-mapping.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index 4164c5a..acc807a 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c @@ -342,7 +342,7 @@ static int __init swiotlb_late_init(void) bus_register_notifier(&platform_bus_type, &platform_bus_nb); bus_register_notifier(&amba_bustype, &amba_bus_nb); - dma_ops = &noncoherent_swiotlb_dma_ops; + dma_ops = &coherent_swiotlb_dma_ops; return swiotlb_late_init_with_default_size(swiotlb_size); }