From patchwork Tue Aug 12 07:26:13 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wangyijing X-Patchwork-Id: 35239 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pa0-f71.google.com (mail-pa0-f71.google.com [209.85.220.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 062FD203C5 for ; Tue, 12 Aug 2014 07:07:33 +0000 (UTC) Received: by mail-pa0-f71.google.com with SMTP id et14sf68650661pad.6 for ; Tue, 12 Aug 2014 00:07:33 -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=OWclpRmkfhGKUeFio1XAlnrJMdgaBCJLh0oeLf8qC9c=; b=eQtFqkuQPU5ogfre8HhBvnr4DosPOJJRRLAB5zm8PaGyBlFqWJKkitdyLxF7OQMj8T jdxpn7s0t0ose8uOdnXyezKUGuZVtW1En2bd2ACpMQzvK9w3dVCw70DcurtE7HxwJ6X7 TyqEDD6xeQ/SI8VsahLke1lr3VojCj9Iq3YCwkD4ARymq/IJzS9uQLRYOJrE2qRUi3S9 0Qm+vzA1W7DlZsfmFBLCP5RBJpsLCnpSXs2mjWCTn5RykQm6p5lrSTXVNmj84N3XTXQ/ h7rcb7XHg0hIAjxSbDXL9Gl51WxjCLvsy6WVu9wNQj5UmfLJYrCG3fhEc1E76M58CUhz CW4A== X-Gm-Message-State: ALoCoQnS2AqBp/KpSZy4NkzumaobtV0DDm3CILI0nfnCn3sXJhsfUNd5XSUtRq8oE6CFZbMbx+zk X-Received: by 10.66.144.102 with SMTP id sl6mr1584502pab.17.1407827253272; Tue, 12 Aug 2014 00:07:33 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.24.106 with SMTP id 97ls11752qgq.26.gmail; Tue, 12 Aug 2014 00:07:33 -0700 (PDT) X-Received: by 10.52.1.39 with SMTP id 7mr22103583vdj.17.1407827253135; Tue, 12 Aug 2014 00:07:33 -0700 (PDT) Received: from mail-vc0-f177.google.com (mail-vc0-f177.google.com [209.85.220.177]) by mx.google.com with ESMTPS id qc6si7764050vcb.85.2014.08.12.00.07.33 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 12 Aug 2014 00:07:33 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.177 as permitted sender) client-ip=209.85.220.177; Received: by mail-vc0-f177.google.com with SMTP id hy4so12588843vcb.8 for ; Tue, 12 Aug 2014 00:07:33 -0700 (PDT) X-Received: by 10.221.44.69 with SMTP id uf5mr2192777vcb.4.1407827253056; Tue, 12 Aug 2014 00:07:33 -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 tc5csp224738vcb; Tue, 12 Aug 2014 00:07:32 -0700 (PDT) X-Received: by 10.67.29.227 with SMTP id jz3mr2637881pad.62.1407827251968; Tue, 12 Aug 2014 00:07:31 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ez2si15346758pab.241.2014.08.12.00.07.31 for ; Tue, 12 Aug 2014 00:07:31 -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 S1754650AbaHLHH0 (ORCPT + 26 others); Tue, 12 Aug 2014 03:07:26 -0400 Received: from szxga03-in.huawei.com ([119.145.14.66]:65023 "EHLO szxga03-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753264AbaHLHDR (ORCPT ); Tue, 12 Aug 2014 03:03:17 -0400 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 ASY16134; Tue, 12 Aug 2014 15:03:06 +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:56 +0800 From: Yijing Wang To: Bjorn Helgaas CC: , Xinwei Hu , Wuyun , , Marc Zyngier , , Russell King , , , "Arnd Bergmann" , Thomas Gleixner , "H. Peter Anvin" , Konrad Rzeszutek Wilk , , Joerg Roedel , , , "Benjamin Herrenschmidt" , , , Sebastian Ott , "Tony Luck" , , "David S. Miller" , , Chris Metcalf , Yijing Wang Subject: [RFC PATCH 20/20] PCI/MSI: Clean up unused MSI arch functions Date: Tue, 12 Aug 2014 15:26:13 +0800 Message-ID: <1407828373-24322-21-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.0A020204.53E9BC2B.00AD,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: 0f8b2a1517148dfe051092ab20b7c295 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.220.177 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: , Now we use struct msi_chip in all platforms to configure MSI/MSI-X. We can clean up the unused arch functions. Signed-off-by: Yijing Wang --- drivers/pci/msi.c | 82 ++++++++++++++++++++-------------------------------- 1 files changed, 32 insertions(+), 50 deletions(-) diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index feba5dd..2d2d4cd 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -41,33 +41,7 @@ struct msi_chip * __weak arch_get_match_msi_chip(struct device *dev) return NULL; } -int __weak arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) -{ - int err; - struct msi_chip *chip = arch_get_match_msi_chip(&dev->dev); - - if (!chip || !chip->setup_irq) - return -EINVAL; - - err = chip->setup_irq(&dev->dev, desc); - if (err < 0) - return err; - - return 0; -} - -void __weak arch_teardown_msi_irq(unsigned int irq) -{ - struct msi_desc *entry = irq_get_msi_desc(irq); - struct msi_chip *chip = arch_get_match_msi_chip(&entry->dev->dev); - - if (!chip || !chip->teardown_irq) - return; - - chip->teardown_irq(irq); -} - -int __weak arch_msi_check_device(struct pci_dev *dev, int nvec, int type) +static int msi_check_device(struct pci_dev *dev, int nvec, int type) { struct msi_chip *chip = arch_get_match_msi_chip(&dev->dev); @@ -77,25 +51,31 @@ int __weak arch_msi_check_device(struct pci_dev *dev, int nvec, int type) return chip->check_device(&dev->dev, nvec, type); } -int __weak arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) +static int setup_msi_irqs(struct pci_dev *dev, int nvec, int type) { struct msi_desc *entry; int ret; struct msi_chip *chip; chip = arch_get_match_msi_chip(&dev->dev); - if (chip && chip->setup_irqs) + if (!chip) + return -EINVAL; + + if (chip->setup_irqs) return chip->setup_irqs(&dev->dev, nvec, type); /* * If an architecture wants to support multiple MSI, it needs to - * override arch_setup_msi_irqs() + * provide chip->setup_irqs() */ if (type == PCI_CAP_ID_MSI && nvec > 1) return 1; + if (!chip->setup_irq) + return -EINVAL; + list_for_each_entry(entry, &dev->msi_list, list) { - ret = arch_setup_msi_irq(dev, entry); + ret = chip->setup_irq(&dev->dev, entry); if (ret < 0) return ret; if (ret > 0) @@ -105,13 +85,20 @@ int __weak arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) return 0; } -/* - * We have a default implementation available as a separate non-weak - * function, as it is used by the Xen x86 PCI code - */ -void default_teardown_msi_irqs(struct pci_dev *dev) +static void teardown_msi_irqs(struct pci_dev *dev) { struct msi_desc *entry; + struct msi_chip *chip; + + chip = arch_get_match_msi_chip(&dev->dev); + if (!chip) + return; + + if (chip->teardown_irqs) + return chip->teardown_irqs(&dev->dev); + + if (!chip->teardown_irq) + return; list_for_each_entry(entry, &dev->msi_list, list) { int i, nvec; @@ -122,15 +109,10 @@ void default_teardown_msi_irqs(struct pci_dev *dev) else nvec = 1 << entry->msi_attrib.multiple; for (i = 0; i < nvec; i++) - arch_teardown_msi_irq(entry->irq + i); + chip->teardown_irq(entry->irq + i); } } -void __weak arch_teardown_msi_irqs(struct pci_dev *dev) -{ - return default_teardown_msi_irqs(dev); -} - static void default_restore_msi_irq(struct pci_dev *dev, int irq) { struct msi_desc *entry; @@ -149,9 +131,9 @@ static void default_restore_msi_irq(struct pci_dev *dev, int irq) write_msi_msg(irq, &entry->msg); } -void __weak arch_restore_msi_irqs(struct pci_dev *dev) +static void restore_msi_irqs(struct pci_dev *dev) { - struct msi_chip *chip = arch_get_msi_chip(&dev->dev); + struct msi_chip *chip = arch_get_match_msi_chip(&dev->dev); if (chip && chip->restore_irqs) return chip->restore_irqs(&dev->dev); @@ -386,7 +368,7 @@ static void free_msi_irqs(struct pci_dev *dev) BUG_ON(irq_has_action(entry->irq + i)); } - arch_teardown_msi_irqs(dev); + teardown_msi_irqs(dev); list_for_each_entry_safe(entry, tmp, &dev->msi_list, list) { if (entry->msi_attrib.is_msix) { @@ -456,7 +438,7 @@ static void __pci_restore_msi_state(struct pci_dev *dev) pci_intx_for_msi(dev, 0); msi_set_enable(dev, 0); - arch_restore_msi_irqs(dev); + restore_msi_irqs(dev); pci_read_config_word(dev, dev->msi_cap + PCI_MSI_FLAGS, &control); msi_mask_irq(entry, msi_mask(entry->msi_attrib.multi_cap), @@ -479,7 +461,7 @@ static void __pci_restore_msix_state(struct pci_dev *dev) msix_clear_and_set_ctrl(dev, 0, PCI_MSIX_FLAGS_ENABLE | PCI_MSIX_FLAGS_MASKALL); - arch_restore_msi_irqs(dev); + restore_msi_irqs(dev); list_for_each_entry(entry, &dev->msi_list, list) { msix_mask_irq(entry, entry->masked); } @@ -650,7 +632,7 @@ static int msi_capability_init(struct pci_dev *dev, int nvec) list_add_tail(&entry->list, &dev->msi_list); /* Configure MSI capability structure */ - ret = arch_setup_msi_irqs(dev, nvec, PCI_CAP_ID_MSI); + ret = setup_msi_irqs(dev, nvec, PCI_CAP_ID_MSI); if (ret) { msi_mask_irq(entry, mask, ~mask); free_msi_irqs(dev); @@ -766,7 +748,7 @@ static int msix_capability_init(struct pci_dev *dev, if (ret) return ret; - ret = arch_setup_msi_irqs(dev, nvec, PCI_CAP_ID_MSIX); + ret = setup_msi_irqs(dev, nvec, PCI_CAP_ID_MSIX); if (ret) goto out_avail; @@ -853,7 +835,7 @@ static int pci_msi_check_device(struct pci_dev *dev, int nvec, int type) if (bus->bus_flags & PCI_BUS_FLAGS_NO_MSI) return -EINVAL; - ret = arch_msi_check_device(dev, nvec, type); + ret = msi_check_device(dev, nvec, type); if (ret) return ret;