Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753080AbaJQBFP (ORCPT ); Thu, 16 Oct 2014 21:05:15 -0400 Received: from szxga01-in.huawei.com ([119.145.14.64]:60200 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751322AbaJQBFL (ORCPT ); Thu, 16 Oct 2014 21:05:11 -0400 Message-ID: <54406B06.4020401@huawei.com> Date: Fri, 17 Oct 2014 09:04:06 +0800 From: Yijing Wang User-Agent: Mozilla/5.0 (Windows NT 6.1; rv:24.0) Gecko/20100101 Thunderbird/24.0.1 MIME-Version: 1.0 To: Sebastian Ott CC: Bjorn Helgaas , , , Xinwei Hu , Wuyun , , Russell King , , , , , Arnd Bergmann , Thomas Gleixner , "Konrad Rzeszutek Wilk" , , Joerg Roedel , , , Benjamin Herrenschmidt , , , Tony Luck , , "David S. Miller" , , Chris Metcalf , "Ralf Baechle" , Lucas Stach , "David Vrabel" , Sergei Shtylyov , Michael Ellerman , Thierry Reding , Thomas Petazzoni , Liviu Dudau Subject: Re: [PATCH v3 22/27] s390/MSI: Use MSI chip framework to configure MSI/MSI-X irq References: <1413342435-7876-1-git-send-email-wangyijing@huawei.com> <1413342435-7876-23-git-send-email-wangyijing@huawei.com> In-Reply-To: Content-Type: text/plain; charset="ISO-8859-1" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.177.27.212] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2014/10/16 20:13, Sebastian Ott wrote: > On Wed, 15 Oct 2014, Yijing Wang wrote: >> Use MSI chip 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 >> --- >> Hi Sebastian, >> I dropped the Acked-by , because this version has a >> lot changes compared to last. So, I guess you may want to check it again. > > I did and I agree with that one too. Thanks very much! Thanks! Yijing. > > Regards, > Sebastian > >> --- >> arch/s390/include/asm/pci.h | 9 +++++++++ >> arch/s390/pci/pci.c | 12 ++++++++++-- >> 2 files changed, 19 insertions(+), 2 deletions(-) >> >> diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h >> index c030900..4d41f08 100644 >> --- a/arch/s390/include/asm/pci.h >> +++ b/arch/s390/include/asm/pci.h >> @@ -88,6 +88,8 @@ struct zpci_dev { >> u32 uid; /* user defined id */ >> u8 util_str[CLP_UTIL_STR_LEN]; /* utility string */ >> >> + struct msi_chip *msi_chip; >> + >> /* IRQ stuff */ >> u64 msi_addr; /* MSI address */ >> struct airq_iv *aibv; /* adapter interrupt bit vector */ >> @@ -121,6 +123,13 @@ struct zpci_dev { >> struct dentry *debugfs_perf; >> }; >> >> +static inline struct msi_chip *pci_msi_chip(struct pci_bus *bus) >> +{ >> + struct zpci_dev *zpci = bus->sysdata; >> + >> + return zpci->msi_chip; >> +} >> + >> static inline bool zdev_enabled(struct zpci_dev *zdev) >> { >> return (zdev->fh & (1UL << 31)) ? true : false; >> diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c >> index 552b990..bf6732f 100644 >> --- a/arch/s390/pci/pci.c >> +++ b/arch/s390/pci/pci.c >> @@ -358,7 +358,8 @@ static void zpci_irq_handler(struct airq_struct *airq) >> } >> } >> >> -int arch_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type) >> +static int zpci_setup_msi_irqs(struct msi_chip *chip, >> + struct pci_dev *pdev, int nvec, int type) >> { >> struct zpci_dev *zdev = get_zdev(pdev); >> unsigned int hwirq, msi_vecs; >> @@ -434,7 +435,8 @@ out: >> return rc; >> } >> >> -void arch_teardown_msi_irqs(struct pci_dev *pdev) >> +static void zpci_teardown_msi_irqs(struct msi_chip *chip, >> + struct pci_dev *pdev) >> { >> struct zpci_dev *zdev = get_zdev(pdev); >> struct msi_desc *msi; >> @@ -464,6 +466,11 @@ void arch_teardown_msi_irqs(struct pci_dev *pdev) >> airq_iv_free_bit(zpci_aisb_iv, zdev->aisb); >> } >> >> +static struct msi_chip zpci_msi_chip = { >> + .setup_irqs = zpci_setup_msi_irqs, >> + .teardown_irqs = zpci_teardown_msi_irqs, >> +}; >> + >> static void zpci_map_resources(struct zpci_dev *zdev) >> { >> struct pci_dev *pdev = zdev->pdev; >> @@ -749,6 +756,7 @@ static int zpci_scan_bus(struct zpci_dev *zdev) >> if (ret) >> return ret; >> >> + zdev->msi_chip = &zpci_msi_chip; >> zdev->bus = pci_scan_root_bus(NULL, ZPCI_BUS_NR, &pci_root_ops, >> zdev, &resources); >> if (!zdev->bus) { >> -- >> 1.7.1 >> >> > > > . > -- Thanks! Yijing -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/