From patchwork Tue Mar 31 05:00:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Axtens X-Patchwork-Id: 456494 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 [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 8C5F8140187 for ; Tue, 31 Mar 2015 16:28:05 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=axtens.net header.i=@axtens.net header.b=GsujnAdc; 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 5A72E1A2C00 for ; Tue, 31 Mar 2015 16:28:05 +1100 (AEDT) Authentication-Results: lists.ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=axtens.net header.i=@axtens.net header.b=GsujnAdc; 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-pa0-x233.google.com (mail-pa0-x233.google.com [IPv6:2607:f8b0:400e:c03::233]) (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 3F9E51A06DA for ; Tue, 31 Mar 2015 16:02:04 +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=GsujnAdc; dkim-adsp=pass; dkim-atps=neutral Received: by patj18 with SMTP id j18so8092043pat.2 for ; Mon, 30 Mar 2015 22:02:02 -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=Ic07dpiyAIHu5rb/WVtjHlak0hr2MQqvuiJfvF3CvJE=; b=GsujnAdcn176Mx1QNmWIf1VGvU0kkICC86WmaswMBRi9AIFDeqYdsV1uQmWfH8EldI jSncGiqRC9WMZTLN8y56bcFsh0c2NH+Bl+kgaonRfS0AmttZl3Ilwg5qaSlJzcA0PEsa 67kliSsKO5uK7AFciIjcmSErGjSIutsiQNG3M= 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=Ic07dpiyAIHu5rb/WVtjHlak0hr2MQqvuiJfvF3CvJE=; b=MkeXwg8RbhPdYK3/ttxze2hQHeYZ542Lt6fo0OgjoJxWXgzs+kP4U0ENEicm57B4hr euqqPxOcnvn/+zQqYdJxZHLZmrbigDVi2JCtJSMmlG0LNQGomJF72jM/GVBJtFhi/oB9 PtwU9GKb4Qed4Oyw/VJFHM9hLJbxxzc0pnYJETzd4E9/4raIq6FatE9pOPG9iLP8sDDl yOaNGRI9tCV3C97xtFAwezChu9+PHTq2ITQ2orif0v/c7p7EQaKZjYJntndgEeb5CSUY EwBnp/+bHme6XMHe2jjudizZoZU0muYnETsoqv8/Z8Ow++I7hISrkRO+CvRy3eLqlg4T 8aHw== X-Gm-Message-State: ALoCoQmitTfb1YZmeWP3G/zelnBK/hDfjlLS3CE3mWTlt1FO0vhFcVfQRQlp6z3ok6JQO4/kRGcm X-Received: by 10.70.90.161 with SMTP id bx1mr65745206pdb.146.1427778122571; Mon, 30 Mar 2015 22:02:02 -0700 (PDT) Received: from omicron.ozlabs.ibm.com ([122.99.82.10]) by mx.google.com with ESMTPSA id i6sm12385535pdp.53.2015.03.30.22.01.59 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 30 Mar 2015 22:02:02 -0700 (PDT) From: Daniel Axtens To: linuxppc-dev@lists.ozlabs.org Subject: [PATCH v2 15/19] powerpc/maple: Move controller ops from ppc_md to controller_ops Date: Tue, 31 Mar 2015 16:00:53 +1100 Message-Id: <1427778057-9505-16-git-send-email-dja@axtens.net> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1427778057-9505-1-git-send-email-dja@axtens.net> References: <1427778057-9505-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" This moves the Maple platform to use the pci_controller_ops structure rather than ppc_md for PCI controller operations. Signed-off-by: Daniel Axtens --- arch/powerpc/platforms/maple/maple.h | 2 ++ arch/powerpc/platforms/maple/pci.c | 4 ++++ arch/powerpc/platforms/maple/setup.c | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/platforms/maple/maple.h b/arch/powerpc/platforms/maple/maple.h index c6911dd..eecfa18 100644 --- a/arch/powerpc/platforms/maple/maple.h +++ b/arch/powerpc/platforms/maple/maple.h @@ -10,3 +10,5 @@ extern void maple_calibrate_decr(void); extern void maple_pci_init(void); extern void maple_pci_irq_fixup(struct pci_dev *dev); extern int maple_pci_get_legacy_ide_irq(struct pci_dev *dev, int channel); + +extern struct pci_controller_ops maple_pci_controller_ops; diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c index d3a1306..a923230 100644 --- a/arch/powerpc/platforms/maple/pci.c +++ b/arch/powerpc/platforms/maple/pci.c @@ -510,6 +510,7 @@ static int __init maple_add_bridge(struct device_node *dev) return -ENOMEM; hose->first_busno = bus_range ? bus_range[0] : 0; hose->last_busno = bus_range ? bus_range[1] : 0xff; + hose->controller_ops = maple_pci_controller_ops; disp_name = NULL; if (of_device_is_compatible(dev, "u3-agp")) { @@ -660,3 +661,6 @@ static void quirk_ipr_msi(struct pci_dev *dev) } DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_IBM, PCI_DEVICE_ID_IBM_OBSIDIAN, quirk_ipr_msi); + +struct pci_controller_ops maple_pci_controller_ops = { +}; diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c index 3bf2e03..a837188 100644 --- a/arch/powerpc/platforms/maple/setup.c +++ b/arch/powerpc/platforms/maple/setup.c @@ -203,7 +203,7 @@ static void __init maple_init_early(void) { DBG(" -> maple_init_early\n"); - iommu_init_early_dart(NULL); + iommu_init_early_dart(&maple_pci_controller_ops); DBG(" <- maple_init_early\n"); }