From patchwork Tue Aug 12 07:26:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: wangyijing X-Patchwork-Id: 35232 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f69.google.com (mail-oa0-f69.google.com [209.85.219.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EB32A203C5 for ; Tue, 12 Aug 2014 07:05:20 +0000 (UTC) Received: by mail-oa0-f69.google.com with SMTP id i7sf43197695oag.0 for ; Tue, 12 Aug 2014 00:05:20 -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=gpNUQUfK3mLpNGjDwKXjc9gUccF9dGx0G24TvGzm/QM=; b=hrH1DOPaxJ6bHNlvXg0CVdwrlQr6zceaj6pIsC3Znezd/ywtMqN3w5aPrDDAxnSNBN Ru4RHFaMvBRIgDAsSebJ+uzDpW5tCd3hm9a5ImCh3OHz+9i4wR8qDzf0bu2xbe+m1kl+ PF5m347vUX+j0RJr7XUjRONlP71CSDDLIVFe+gQPy/jV0kLAwHaIZYqvfzSY+We7tWHz kXL3GCxJPj1GPCJxPds/pIO1IWOKI5E9cnm1oeOTb8kXYIPCpkY3m5T15E9kaBZqPy0/ GKm/GiUNpQ+pEsUobRBCkbWtRr6W5Lc+ArgYQ9fSTjrJIkDYW9QikxOd4flRykbffplb 8miA== X-Gm-Message-State: ALoCoQlcMundY828W2sC3Q5yyEdL4YB1MYDBat+cHzfiluAgRTXps1jVhoV44K/JZqy+aUwW6YkI X-Received: by 10.182.135.194 with SMTP id pu2mr1484684obb.35.1407827120479; Tue, 12 Aug 2014 00:05:20 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.101.210 with SMTP id u76ls4695qge.62.gmail; Tue, 12 Aug 2014 00:05:20 -0700 (PDT) X-Received: by 10.52.121.74 with SMTP id li10mr22073954vdb.19.1407827120376; Tue, 12 Aug 2014 00:05:20 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id g8si7750237vdk.33.2014.08.12.00.05.20 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 12 Aug 2014 00:05:20 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.172 as permitted sender) client-ip=209.85.220.172; Received: by mail-vc0-f172.google.com with SMTP id im17so12946791vcb.3 for ; Tue, 12 Aug 2014 00:05:20 -0700 (PDT) X-Received: by 10.220.144.10 with SMTP id x10mr2632vcu.42.1407827120279; Tue, 12 Aug 2014 00:05:20 -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 tc5csp224603vcb; Tue, 12 Aug 2014 00:05:19 -0700 (PDT) X-Received: by 10.70.34.235 with SMTP id c11mr2671151pdj.76.1407827119247; Tue, 12 Aug 2014 00:05:19 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id um10si15362040pac.155.2014.08.12.00.05.18 for ; Tue, 12 Aug 2014 00:05:19 -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 S1753346AbaHLHDY (ORCPT + 26 others); Tue, 12 Aug 2014 03:03:24 -0400 Received: from szxga02-in.huawei.com ([119.145.14.65]:51375 "EHLO szxga02-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753512AbaHLHDU (ORCPT ); Tue, 12 Aug 2014 03:03:20 -0400 Received: from 172.24.2.119 (EHLO szxeml421-hub.china.huawei.com) ([172.24.2.119]) by szxrg02-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id BYA39926; Tue, 12 Aug 2014 15:02:53 +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:40 +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 11/20] MIPS/Octeon/MSI: Use msi_chip instead of arch func to configure MSI/MSI-X Date: Tue, 12 Aug 2014 15:26:04 +0800 Message-ID: <1407828373-24322-12-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 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.172 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: , Introduce a new struct msi_chip octeon_msi_chip instead of weak arch functions to configure MSI/MSI-X. Signed-off-by: Yijing Wang --- arch/mips/pci/msi-octeon.c | 45 ++++++++++++++++++------------------------- 1 files changed, 19 insertions(+), 26 deletions(-) diff --git a/arch/mips/pci/msi-octeon.c b/arch/mips/pci/msi-octeon.c index ab0c5d1..8098066 100644 --- a/arch/mips/pci/msi-octeon.c +++ b/arch/mips/pci/msi-octeon.c @@ -57,7 +57,7 @@ static int msi_irq_size; * * Returns 0 on success. */ -int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) +int octeon_setup_msi_irq(struct device *dev, struct msi_desc *desc) { struct msi_msg msg; u16 control; @@ -73,7 +73,7 @@ int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *desc) * wants. Most devices only want 1, which will give * configured_private_bits and request_private_bits equal 0. */ - pci_read_config_word(dev, desc->msi_attrib.pos + PCI_MSI_FLAGS, + pci_read_config_word(to_pci_dev(dev), desc->msi_attrib.pos + PCI_MSI_FLAGS, &control); /* @@ -176,7 +176,7 @@ msi_irq_allocated: /* Update the number of IRQs the device has available to it */ control &= ~PCI_MSI_FLAGS_QSIZE; control |= request_private_bits << 4; - pci_write_config_word(dev, desc->msi_attrib.pos + PCI_MSI_FLAGS, + pci_write_config_word(to_pci_dev(dev), desc->msi_attrib.pos + PCI_MSI_FLAGS, control); irq_set_msi_desc(irq, desc); @@ -184,32 +184,14 @@ msi_irq_allocated: return 0; } -int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) +int octeon_check_msi_device(struct device *dev, int nvec, int type) { - struct msi_desc *entry; - int ret; - /* * MSI-X is not supported. */ if (type == PCI_CAP_ID_MSIX) return -EINVAL; - /* - * If an architecture wants to support multiple MSI, it needs to - * override arch_setup_msi_irqs() - */ - if (type == PCI_CAP_ID_MSI && nvec > 1) - return 1; - - list_for_each_entry(entry, &dev->msi_list, list) { - ret = arch_setup_msi_irq(dev, entry); - if (ret < 0) - return ret; - if (ret > 0) - return -ENOSPC; - } - return 0; } @@ -219,7 +201,7 @@ int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) * * @irq: The devices first irq number. There may be multple in sequence. */ -void arch_teardown_msi_irq(unsigned int irq) +void octeon_teardown_msi_irq(unsigned int irq) { int number_irqs; u64 bitmask; @@ -229,7 +211,7 @@ void arch_teardown_msi_irq(unsigned int irq) if ((irq < OCTEON_IRQ_MSI_BIT0) || (irq > msi_irq_size + OCTEON_IRQ_MSI_BIT0)) panic("arch_teardown_msi_irq: Attempted to teardown illegal " - "MSI interrupt (%d)", irq); + "MSI interrupt (%d)", irq); irq -= OCTEON_IRQ_MSI_BIT0; index = irq / 64; @@ -242,7 +224,7 @@ void arch_teardown_msi_irq(unsigned int irq) */ number_irqs = 0; while ((irq0 + number_irqs < 64) && - (msi_multiple_irq_bitmask[index] + (msi_multiple_irq_bitmask[index] & (1ull << (irq0 + number_irqs)))) number_irqs++; number_irqs++; @@ -252,7 +234,7 @@ void arch_teardown_msi_irq(unsigned int irq) bitmask <<= irq0; if ((msi_free_irq_bitmask[index] & bitmask) != bitmask) panic("arch_teardown_msi_irq: Attempted to teardown MSI " - "interrupt (%d) not in use", irq); + "interrupt (%d) not in use", irq); /* Checks are done, update the in use bitmask */ spin_lock(&msi_free_irq_bitmask_lock); @@ -261,6 +243,17 @@ void arch_teardown_msi_irq(unsigned int irq) spin_unlock(&msi_free_irq_bitmask_lock); } +struct msi_chip octeon_msi_chip = { + .setup_irq = octeon_setup_msi_irq, + .teardown_irq = octeon_teardown_msi_irq, + .check_device = octeon_check_msi_device, +}; + +struct msi_chip *arch_get_match_msi_chip(struct device *dev) +{ + return &octeon_msi_chip; +} + static DEFINE_RAW_SPINLOCK(octeon_irq_msi_lock); static u64 msi_rcv_reg[4];