From patchwork Tue Apr 14 04:28:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Axtens X-Patchwork-Id: 461029 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 3C2FF140276 for ; Tue, 14 Apr 2015 14:44:02 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=axtens.net header.i=@axtens.net header.b=MzW7lHgq; 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 17DEE1A0E2B for ; Tue, 14 Apr 2015 14:44:02 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=axtens.net header.i=@axtens.net header.b=MzW7lHgq; 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 573B71A0C19 for ; Tue, 14 Apr 2015 14:28:46 +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=MzW7lHgq; dkim-adsp=pass; dkim-atps=neutral Received: by ozlabs.org (Postfix) id 468111402AE; Tue, 14 Apr 2015 14:28:46 +1000 (AEST) Delivered-To: linuxppc-dev@ozlabs.org Received: from mail-pd0-x22c.google.com (mail-pd0-x22c.google.com [IPv6:2607:f8b0:400e:c02::22c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id CEC36140281 for ; Tue, 14 Apr 2015 14:28:45 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass reason="1024-bit key; unprotected key" header.d=axtens.net header.i=@axtens.net header.b=MzW7lHgq; dkim-adsp=pass; dkim-atps=neutral Received: by pdbqa5 with SMTP id qa5so130485162pdb.1 for ; Mon, 13 Apr 2015 21:28:44 -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=ktNOfT2MKz4juIZA2YWHD+1v4F1oB/ON6cyqfATZdDI=; b=MzW7lHgq96Sw+fAIA+LvUI5HsKxjBtJ8oFqcAw2a+1imOWp/olywtvaHdZnk8PxCKO VU918qsON5DT/rL1R/7LGCfKd6PalDuUznvh9rFWb8k2BxoDt0k1iRhmsN/2R5+z4zcc aEwPbNkB3SgFtdLeR0I5xQjZ8x8Ph3K8bn9mE= 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=ktNOfT2MKz4juIZA2YWHD+1v4F1oB/ON6cyqfATZdDI=; b=fPNYXOL43c9nr+j2r+TWcGCPYiwKtWf93Ax4sgKipRCExJX1GEdEDNf7S5VzLqw1y9 oLEeO6n+VYmoigOS1plG1heewjihlCK0rwMsMSDSG36Uib6ZkUlSRgrBp0CUzgR7F2Fc SRE0SGE2iNmlUrzorwBrqVYdLh+Qt+5mzI9ylpI+TCQCnoqz/eXohf+VZSxBzyjOYTK+ UXtvoRQqsi3Kmb9KBfC0hhGetwJSOVh8wjssCzZdQl+eVz0KcFmFTWKexIKzOywDNpqe 12VSHhUyN0NyZI8Ufqd/Jc37D8ZOwnk4OL/JVsxzwkouHCTl0TOhK21ijWwE8J/lrgK7 6Ajg== X-Gm-Message-State: ALoCoQkVsDtXCXU7cJJzA+m9uk+bffd0hF6YCKlbyFmk9J/ke/WPGP89abp5mrCfpFQkgLdy3kfV X-Received: by 10.70.45.169 with SMTP id o9mr32131438pdm.81.1428985724497; Mon, 13 Apr 2015 21:28:44 -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.41 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 13 Apr 2015 21:28:43 -0700 (PDT) From: Daniel Axtens To: linuxppc-dev@ozlabs.org, benh@kernel.crashing.org, mpe@ellerman.id.au Subject: [PATCH 09/10] powerpc/mpic_u3msi: Move MSI-related ops to pci_controller_ops Date: Tue, 14 Apr 2015 14:28:02 +1000 Message-Id: <1428985683-24767-10-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 u3 MPIC msi subsystem to use the pci_controller_ops structure rather than ppc_md for MSI related PCI controller operations. As with fsl_msi, operations are plugged in at the subsys level, after controller creation. Again, we iterate over all controllers and populate them with the MSI ops. --- arch/powerpc/sysdev/mpic_u3msi.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/sysdev/mpic_u3msi.c b/arch/powerpc/sysdev/mpic_u3msi.c index b2cef18..fc46ef3 100644 --- a/arch/powerpc/sysdev/mpic_u3msi.c +++ b/arch/powerpc/sysdev/mpic_u3msi.c @@ -181,6 +181,7 @@ static int u3msi_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type) int mpic_u3msi_init(struct mpic *mpic) { int rc; + struct pci_controller *phb; rc = mpic_msi_init_allocator(mpic); if (rc) { @@ -193,9 +194,11 @@ int mpic_u3msi_init(struct mpic *mpic) BUG_ON(msi_mpic); msi_mpic = mpic; - WARN_ON(ppc_md.setup_msi_irqs); - ppc_md.setup_msi_irqs = u3msi_setup_msi_irqs; - ppc_md.teardown_msi_irqs = u3msi_teardown_msi_irqs; + list_for_each_entry(phb, &hose_list, list_node) { + WARN_ON(phb->controller_ops.setup_msi_irqs); + phb->controller_ops.setup_msi_irqs = u3msi_setup_msi_irqs; + phb->controller_ops.teardown_msi_irqs = u3msi_teardown_msi_irqs; + } return 0; }