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 <wangyijing@xxxxxxxxxx>
>> ---
>> 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-pci" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
