From patchwork Tue Aug 12 07:25:58 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wangyijing X-Patchwork-Id: 35240 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f71.google.com (mail-yh0-f71.google.com [209.85.213.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C2F71203C5 for ; Tue, 12 Aug 2014 07:07:50 +0000 (UTC) Received: by mail-yh0-f71.google.com with SMTP id 29sf31093770yhl.10 for ; Tue, 12 Aug 2014 00:07:50 -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:subject:date:message-id :in-reply-to:references:mime-version:cc:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :sender:errors-to:x-original-sender :x-original-authentication-results:mailing-list:content-type :content-transfer-encoding; bh=0698VF6cmRSGDKEv3obIEDnURbetXe4VAcioxJ995LI=; b=aMwy/SeG2ihEGUw7GW+II5r7XNp6Js4JT6VeTYOCwruvgBa1jTrZP2eUZGQhWQQ9Yg XfpZu8V9VwTDBbZXXED48OGnv55ff41rudLwWd6E0ts+rmztyksEtQw1zOYf1QBqoTNQ Wzj+gBXWRvECH3k/ThyzhQ1ItHwpdcPjvUaW+o8cpDTNLqvd2/4ayGAB+u8S17By6Sau DhbcJPmMZ8N+3yuyPmCGBkDSv269istamq9kA686Xnkmu+qOhxZoKzXSXCeL3pKJvqOp 81B495Lf/DdyKrwbRJ1npJjOBbbOLGtdX7VIskSfiyS5bPxWmHxiYgBjZEGa1GGFPoIA tI1A== X-Gm-Message-State: ALoCoQlYSDS4zG/qGHKhdMKzzHBnSrBkHAeazz74uqHf0/aa7jDj+b9y2MoF6dYc9Ru0Q3oobYgd X-Received: by 10.236.7.14 with SMTP id 14mr6304928yho.34.1407827270599; Tue, 12 Aug 2014 00:07:50 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.87.214 with SMTP id r80ls6648qgd.44.gmail; Tue, 12 Aug 2014 00:07:50 -0700 (PDT) X-Received: by 10.220.167.9 with SMTP id o9mr2221320vcy.8.1407827270446; Tue, 12 Aug 2014 00:07:50 -0700 (PDT) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id t1si7766517vcx.69.2014.08.12.00.07.50 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 12 Aug 2014 00:07:50 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.171 as permitted sender) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id hq11so12843039vcb.30 for ; Tue, 12 Aug 2014 00:07:50 -0700 (PDT) X-Received: by 10.52.245.66 with SMTP id xm2mr22050952vdc.36.1407827270350; Tue, 12 Aug 2014 00:07:50 -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.221.37.5 with SMTP id tc5csp224757vcb; Tue, 12 Aug 2014 00:07:49 -0700 (PDT) X-Received: by 10.70.35.207 with SMTP id k15mr2636428pdj.5.1407827269354; Tue, 12 Aug 2014 00:07:49 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id i5si11780671pdh.56.2014.08.12.00.07.49 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Aug 2014 00:07:49 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XH6AQ-00039R-DR; Tue, 12 Aug 2014 07:06:46 +0000 Received: from szxga03-in.huawei.com ([119.145.14.66]) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XH6A8-0000x9-Er for linux-arm-kernel@lists.infradead.org; Tue, 12 Aug 2014 07:06:30 +0000 Received: from 172.24.2.119 (EHLO szxeml421-hub.china.huawei.com) ([172.24.2.119]) by szxrg03-dlp.huawei.com (MOS 4.4.3-GA FastPath queued) with ESMTP id ASY16060; Tue, 12 Aug 2014 15:02:41 +0800 (CST) Received: from localhost.localdomain (10.175.100.166) by szxeml421-hub.china.huawei.com (10.82.67.160) with Microsoft SMTP Server id 14.3.158.1; Tue, 12 Aug 2014 15:02:30 +0800 From: Yijing Wang To: Bjorn Helgaas Subject: [RFC PATCH 05/20] MSI: Refactor struct msi_chip to become more common Date: Tue, 12 Aug 2014 15:25:58 +0800 Message-ID: <1407828373-24322-6-git-send-email-wangyijing@huawei.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1407828373-24322-1-git-send-email-wangyijing@huawei.com> References: <1407828373-24322-1-git-send-email-wangyijing@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.175.100.166] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020205.53E9BC13.0086,ss=1,re=0.000,fgs=0, ip=0.0.0.0, so=2013-05-26 15:14:31, dmn=2011-05-27 18:58:46 X-Mirapoint-Loop-Id: c6341c0ed4bcc387b32ede7dcf80a5e9 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140812_000629_295052_9B2BF4AD X-CRM114-Status: GOOD ( 14.22 ) X-Spam-Score: -1.4 (-) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-1.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [119.145.14.66 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [119.145.14.66 listed in wl.mailspike.net] -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: linux-mips@linux-mips.org, linux-ia64@vger.kernel.org, linux-pci@vger.kernel.org, Thierry Reding , Xinwei Hu , Yijing Wang , "H. Peter Anvin" , sparclinux@vger.kernel.org, linux-s390@vger.kernel.org, Russell King , Joerg Roedel , x86@kernel.org, Sebastian Ott , Benjamin Herrenschmidt , xen-devel@lists.xenproject.org, arnab.basu@freescale.com, Arnd Bergmann , Konrad Rzeszutek Wilk , Marc Zyngier , Chris Metcalf , Thomas Gleixner , linux-arm-kernel@lists.infradead.org, Thomas Petazzoni , Tony Luck , linux-kernel@vger.kernel.org, iommu@lists.linux-foundation.org, Wuyun , linuxppc-dev@lists.ozlabs.org, "David S. Miller" X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.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.220.171 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 Now there are a lot of __weak arch functions in MSI code. These functions make MSI driver complex, It's time to refactor it. Add .restore_irq(), .setup_irqs(), .teardown_irqs() to make msi_chip common across all platforms. Also replace the argument "struct pci_dev" with "struct device" to support future Non-PCI MSI device. Signed-off-by: Yijing Wang CC: Thierry Reding CC: Thomas Petazzoni --- drivers/irqchip/irq-armada-370-xp.c | 4 ++-- drivers/pci/host/pci-tegra.c | 3 ++- drivers/pci/host/pcie-designware.c | 4 ++-- drivers/pci/host/pcie-rcar.c | 3 ++- drivers/pci/msi.c | 4 ++-- include/linux/msi.h | 7 +++++-- 6 files changed, 15 insertions(+), 10 deletions(-) diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c index ee1f0ba..3761e52 100644 --- a/drivers/irqchip/irq-armada-370-xp.c +++ b/drivers/irqchip/irq-armada-370-xp.c @@ -129,7 +129,7 @@ static void armada_370_xp_free_msi(int hwirq) mutex_unlock(&msi_used_lock); } -static int armada_370_xp_setup_msi_irq(struct pci_dev *pdev, +static int armada_370_xp_setup_msi_irq(struct device *dev, struct msi_desc *desc) { struct msi_msg msg; @@ -164,7 +164,7 @@ static void armada_370_xp_teardown_msi_irq(unsigned int irq) armada_370_xp_free_msi(hwirq); } -static int armada_370_xp_check_msi_device(struct pci_dev *dev, +static int armada_370_xp_check_msi_device(struct device *dev, int nvec, int type) { /* We support MSI, but not MSI-X */ diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c index 3872bc0..a2fa0ec 100644 --- a/drivers/pci/host/pci-tegra.c +++ b/drivers/pci/host/pci-tegra.c @@ -1192,9 +1192,10 @@ static irqreturn_t tegra_pcie_msi_irq(int irq, void *data) return processed > 0 ? IRQ_HANDLED : IRQ_NONE; } -static int tegra_msi_setup_irq(struct pci_dev *pdev, +static int tegra_msi_setup_irq(struct device *dev, struct msi_desc *desc) { + struct pci_dev *pdev = to_pci_dev(dev); struct msi_chip *chip = pdev->bus->msi; struct tegra_msi *msi = to_tegra_msi(chip); struct msi_msg msg; diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c index 2204456..9c3816d 100644 --- a/drivers/pci/host/pcie-designware.c +++ b/drivers/pci/host/pcie-designware.c @@ -342,12 +342,12 @@ static void clear_irq(unsigned int irq) msi->msi_attrib.multiple = 0; } -static int dw_msi_setup_irq(struct pci_dev *pdev, - struct msi_desc *desc) +static int dw_msi_setup_irq(struct device *dev, struct msi_desc *desc) { int irq, pos, msgvec; u16 msg_ctr; struct msi_msg msg; + struct pci_dev *pdev = to_pci_dev(dev); struct pcie_port *pp = sys_to_pcie(pdev->bus->sysdata); if (!pp) { diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c index 647bc9f..fa33432 100644 --- a/drivers/pci/host/pcie-rcar.c +++ b/drivers/pci/host/pcie-rcar.c @@ -615,9 +615,10 @@ static irqreturn_t rcar_pcie_msi_irq(int irq, void *data) return IRQ_HANDLED; } -static int rcar_msi_setup_irq(struct pci_dev *pdev, +static int rcar_msi_setup_irq(struct device *dev, struct msi_desc *desc) { + struct pci_dev *pdev = to_pci_dev(dev); struct msi_chip *chip = pdev->bus->msi; struct rcar_msi *msi = to_rcar_msi(chip); struct rcar_pcie *pcie = container_of(chip, struct rcar_pcie, msi.chip); diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 242d775..7b7abe9 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -37,7 +37,7 @@ int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) if (!chip || !chip->setup_irq) return -EINVAL; - err = chip->setup_irq(dev, desc); + err = chip->setup_irq(&dev->dev, desc); if (err < 0) return err; @@ -61,7 +61,7 @@ int __weak arch_msi_check_device(struct pci_dev *dev, int nvec, int type) if (!chip || !chip->check_device) return 0; - return chip->check_device(dev, nvec, type); + return chip->check_device(&dev->dev, nvec, type); } int __weak arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) diff --git a/include/linux/msi.h b/include/linux/msi.h index a510d25..2068d25 100644 --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -72,9 +72,12 @@ struct msi_chip { struct device_node *of_node; struct list_head list; - int (*setup_irq)(struct pci_dev *dev, struct msi_desc *desc); + int (*check_device)(struct device *dev, int nvec, int type); + int (*setup_irq)(struct device *dev, struct msi_desc *desc); + int (*setup_irqs)(struct device *dev, int nvec, int type); void (*teardown_irq)(unsigned int irq); - int (*check_device)(struct pci_dev *dev, int nvec, int type); + void (*teardown_irqs)(struct device *dev); + void (*restore_irqs)(struct device *dev); }; #endif /* LINUX_MSI_H */