From patchwork Tue Apr 14 04:27:55 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Axtens X-Patchwork-Id: 461022 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 E9208140281 for ; Tue, 14 Apr 2015 14:32:41 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=axtens.net header.i=@axtens.net header.b=fICHTCIC; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id C4C721A0C8E for ; Tue, 14 Apr 2015 14:32:41 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=axtens.net header.i=@axtens.net header.b=fICHTCIC; 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 ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id E8ECB1A0BBE for ; Tue, 14 Apr 2015 14:28:23 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass reason="1024-bit key; unprotected key" header.d=axtens.net header.i=@axtens.net header.b=fICHTCIC; dkim-adsp=pass; dkim-atps=neutral Received: by ozlabs.org (Postfix) id D6CF81402AE; Tue, 14 Apr 2015 14:28:23 +1000 (AEST) Delivered-To: linuxppc-dev@ozlabs.org Received: from mail-pa0-x231.google.com (mail-pa0-x231.google.com [IPv6:2607:f8b0:400e:c03::231]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 678D01402A8 for ; Tue, 14 Apr 2015 14:28:23 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass reason="1024-bit key; unprotected key" header.d=axtens.net header.i=@axtens.net header.b=fICHTCIC; dkim-adsp=pass; dkim-atps=neutral Received: by paboj16 with SMTP id oj16so124964318pab.0 for ; Mon, 13 Apr 2015 21:28:22 -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=O1hks3ZHcm+syhnpkxXEfMUGU4Ja9kFwDu3wqro4e34=; b=fICHTCICq5iDbs8zalnH9XxySpNILUiFCby21wzAZ3hmQ3fNsk7Cnl76lwxxBZLzza +W4QoUHo3WHpvFzP8BS2a2SA9GFcXxlQWvbwmWNcGVrgoKlDZdVvWph/sZY9du9fE3Qv 6+h9K+/PYL8H2uDGsUcknzcrxFlFE/LTZok0A= 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=O1hks3ZHcm+syhnpkxXEfMUGU4Ja9kFwDu3wqro4e34=; b=j5FYjTLGN9lfi3+zKXrOOspKYPOG8Sqz+FE3Mx2Wgqh/RAWeBDC55vMoDuwR5ZAWWo PTAOtJ3lDU9z1+9CvxWPykfGIXX4NJIIQAeQyqAMUAMj8E0Mv5DNhRgbPMkXywkmU9vy oKArPhMrC7TpdIrEYgJEOEv+YbQWg96UECmbCct1H8UHs5u7yIRB8rc6Stve5Elm9sUM c6GZaBLYhrtL4S3rNkebS+Bx+GNxUpCeZV76+WTE2odYxerRsD6L5J09LZtF4w3yOkBu TdML+/+0lDj7KJhD+vWGCzTLZCx9LhcMq2/3TMmznG4XKKplKMZloMfrQIrapNhTtvEk hE3w== X-Gm-Message-State: ALoCoQl9lwPjo3eE8+EpcPau9o4ThCUUUiglBnylsM+fj6BoJsg5UUn191v21iHTM5Nv2Yj9eLmh X-Received: by 10.70.128.67 with SMTP id nm3mr32492826pdb.42.1428985702066; Mon, 13 Apr 2015 21:28:22 -0700 (PDT) Received: from omicron.ozlabs.ibm.com ([122.99.82.10]) by mx.google.com with ESMTPSA id fm3sm8863468pab.29.2015.04.13.21.28.19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Apr 2015 21:28:21 -0700 (PDT) From: Daniel Axtens To: linuxppc-dev@ozlabs.org, benh@kernel.crashing.org, mpe@ellerman.id.au Subject: [PATCH 02/10] powerpc/powernv: Move MSI-related ops to pci_controller_ops Date: Tue, 14 Apr 2015 14:27:55 +1000 Message-Id: <1428985683-24767-3-git-send-email-dja@axtens.net> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1428985683-24767-1-git-send-email-dja@axtens.net> References: <1428985683-24767-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" Move the PowerNV/BML platform to use the pci_controller_ops structure rather than ppc_md for MSI related PCI controller operations. Signed-off-by: Daniel Axtens --- arch/powerpc/platforms/powernv/pci.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/arch/powerpc/platforms/powernv/pci.c b/arch/powerpc/platforms/powernv/pci.c index bca2aeb..0f04940 100644 --- a/arch/powerpc/platforms/powernv/pci.c +++ b/arch/powerpc/platforms/powernv/pci.c @@ -768,16 +768,14 @@ void __init pnv_pci_init(void) ppc_md.tce_free_rm = pnv_tce_free_rm; ppc_md.tce_get = pnv_tce_get; set_pci_dma_ops(&dma_iommu_ops); - - /* Configure MSIs */ -#ifdef CONFIG_PCI_MSI - ppc_md.setup_msi_irqs = pnv_setup_msi_irqs; - ppc_md.teardown_msi_irqs = pnv_teardown_msi_irqs; -#endif } machine_subsys_initcall_sync(powernv, tce_iommu_bus_notifier_init); struct pci_controller_ops pnv_pci_controller_ops = { .dma_dev_setup = pnv_pci_dma_dev_setup, +#ifdef CONFIG_PCI_MSI + .setup_msi_irqs = pnv_setup_msi_irqs, + .teardown_msi_irqs = pnv_teardown_msi_irqs, +#endif };