From patchwork Mon Oct 27 13:22:14 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wangyijing X-Patchwork-Id: 39627 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ee0-f71.google.com (mail-ee0-f71.google.com [74.125.83.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C76122118A for ; Mon, 27 Oct 2014 12:47:01 +0000 (UTC) Received: by mail-ee0-f71.google.com with SMTP id e51sf494372eek.2 for ; Mon, 27 Oct 2014 05:47:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe:content-type; bh=zQXzei+2OW2/vWkErpj3PcPto6k40BVzwXY+MdDJL4Q=; b=RD1MNg8X6JiO1vd14rEt5KUGkg+xj5Jxw0AU6IAcbZ5O3/txICNe1rFnzSDhghnl6E QvotnHoKrhIROgpnISJkePxrvUSocpYbJ5u5QDA0c4iqBtBAzTXJQBzBheOKpkmdxAtc hq7EpPOD4qILOfMkCvkc0wqU6LOYzG67KrGE7QCbSPQtjbo7yAd1fAAstvofLZnj90wY GuGTMXb/8+aAdqxubfEUFP/ABxdM39JSbRxjZyXVpr9+wuJwpU6sBPaVBcq0XF33TM0Y mWD6RT6knNG3FBW7wReGjMfcZwnSRMJXNBr50W5Vm+auN65Bp0sjJLAL8xli85Aye4h/ r0yg== X-Gm-Message-State: ALoCoQlGm0wy3SOjdFVKDnjGCZgZ3DzNvnVtITfw22BevbYW9YqRU3SCKc+OrG5pQ63iqeJ+I2Rs X-Received: by 10.112.254.226 with SMTP id al2mr5469690lbd.1.1414414020051; Mon, 27 Oct 2014 05:47:00 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.36.67 with SMTP id o3ls708364laj.22.gmail; Mon, 27 Oct 2014 05:46:59 -0700 (PDT) X-Received: by 10.152.234.136 with SMTP id ue8mr16316378lac.21.1414414019878; Mon, 27 Oct 2014 05:46:59 -0700 (PDT) Received: from mail-lb0-f178.google.com (mail-lb0-f178.google.com. [209.85.217.178]) by mx.google.com with ESMTPS id ld12si19753308lac.105.2014.10.27.05.46.59 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 27 Oct 2014 05:46:59 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) client-ip=209.85.217.178; Received: by mail-lb0-f178.google.com with SMTP id f15so1992666lbj.9 for ; Mon, 27 Oct 2014 05:46:59 -0700 (PDT) X-Received: by 10.152.120.199 with SMTP id le7mr23037061lab.67.1414414019788; Mon, 27 Oct 2014 05:46:59 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp282409lbz; Mon, 27 Oct 2014 05:46:58 -0700 (PDT) X-Received: by 10.69.16.69 with SMTP id fu5mr1689948pbd.159.1414414018020; Mon, 27 Oct 2014 05:46:58 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id by5si10476329pad.78.2014.10.27.05.46.57 for ; Mon, 27 Oct 2014 05:46:58 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752857AbaJ0Mlt (ORCPT + 26 others); Mon, 27 Oct 2014 08:41:49 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:28067 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751492AbaJ0Mlm (ORCPT ); Mon, 27 Oct 2014 08:41:42 -0400 Received: from 172.24.2.119 (EHLO szxeml404-hub.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id CBJ49239; Mon, 27 Oct 2014 20:41:33 +0800 (CST) Received: from localhost.localdomain (10.175.100.166) by szxeml404-hub.china.huawei.com (10.82.67.59) with Microsoft SMTP Server id 14.3.158.1; Mon, 27 Oct 2014 20:41:25 +0800 From: Yijing Wang To: Bjorn Helgaas CC: , , Xinwei Hu , Wuyun , , Russell King , , Thomas Gleixner , Konrad Rzeszutek Wilk , , Joerg Roedel , , , "Benjamin Herrenschmidt" , , , Sebastian Ott , "Tony Luck" , , "David S. Miller" , , Chris Metcalf , Ralf Baechle , Lucas Stach , David Vrabel , "Sergei Shtylyov" , Michael Ellerman , Thierry Reding , "Thomas Petazzoni" , Yijing Wang Subject: [PATCH 08/16] MIPS/Xlp/MSI: Use MSI controller framework to configure MSI/MSI-X irq Date: Mon, 27 Oct 2014 21:22:14 +0800 Message-ID: <1414416142-31239-9-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1414416142-31239-1-git-send-email-wangyijing@huawei.com> References: <1414416142-31239-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.100.166] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: wangyijing@huawei.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.178 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Use MSI controller framework instead of arch MSI functions to configure MSI/MSI-X IRQ. So we can manage MSI/MSI-X irq in a unified framework. Signed-off-by: Yijing Wang --- arch/mips/include/asm/netlogic/xlp-hal/pcibus.h | 1 + arch/mips/pci/msi-xlp.c | 11 +++++++++-- arch/mips/pci/pci-xlp.c | 3 +++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/arch/mips/include/asm/netlogic/xlp-hal/pcibus.h b/arch/mips/include/asm/netlogic/xlp-hal/pcibus.h index 91540f4..8e6869a 100644 --- a/arch/mips/include/asm/netlogic/xlp-hal/pcibus.h +++ b/arch/mips/include/asm/netlogic/xlp-hal/pcibus.h @@ -103,6 +103,7 @@ #ifdef CONFIG_PCI_MSI void xlp_init_node_msi_irqs(int node, int link); +extern struct msi_controller xlp_msi_ctrl; #else static inline void xlp_init_node_msi_irqs(int node, int link) {} #endif diff --git a/arch/mips/pci/msi-xlp.c b/arch/mips/pci/msi-xlp.c index fa374fe..d18a162 100644 --- a/arch/mips/pci/msi-xlp.c +++ b/arch/mips/pci/msi-xlp.c @@ -245,7 +245,8 @@ static struct irq_chip xlp_msix_chip = { .irq_unmask = unmask_msi_irq, }; -void arch_teardown_msi_irq(unsigned int irq) +static void xlp_teardown_msi_irq(struct msi_controller *ctrl, + unsigned int irq) { } @@ -452,7 +453,8 @@ static int xlp_setup_msix(uint64_t lnkbase, int node, int link, return 0; } -int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) +static int xlp_setup_msi_irq(struct msi_controller *ctrl, + struct pci_dev *dev, struct msi_desc *desc) { struct pci_dev *lnkdev; uint64_t lnkbase; @@ -474,6 +476,11 @@ int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) return xlp_setup_msi(lnkbase, node, link, desc); } +struct msi_controller xlp_msi_ctrl = { + .setup_irq = xlp_setup_msi_irq, + .teardown_irq = xlp_teardown_msi_irq, +}; + void __init xlp_init_node_msi_irqs(int node, int link) { struct nlm_soc_info *nodep; diff --git a/arch/mips/pci/pci-xlp.c b/arch/mips/pci/pci-xlp.c index 7babf01..ab80417 100644 --- a/arch/mips/pci/pci-xlp.c +++ b/arch/mips/pci/pci-xlp.c @@ -174,6 +174,9 @@ struct pci_controller nlm_pci_controller = { .mem_offset = 0x00000000UL, .io_resource = &nlm_pci_io_resource, .io_offset = 0x00000000UL, +#ifdef CONFIG_PCI_MSI + .msi_ctrl = &xlp_msi_ctrl, +#endif }; struct pci_dev *xlp_get_pcie_link(const struct pci_dev *dev)