From patchwork Tue Mar 25 02:48:52 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Lee X-Patchwork-Id: 3885101 Return-Path: X-Original-To: patchwork-linux-wireless@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 6A5DE9F334 for ; Tue, 25 Mar 2014 02:49:08 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 81D6420270 for ; Tue, 25 Mar 2014 02:49:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 51CB620179 for ; Tue, 25 Mar 2014 02:49:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751726AbaCYCtC (ORCPT ); Mon, 24 Mar 2014 22:49:02 -0400 Received: from mail-pd0-f172.google.com ([209.85.192.172]:35577 "EHLO mail-pd0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751076AbaCYCtA (ORCPT ); Mon, 24 Mar 2014 22:49:00 -0400 Received: by mail-pd0-f172.google.com with SMTP id p10so6149179pdj.31 for ; Mon, 24 Mar 2014 19:49:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=5TU9ieS7s0sw4q8X4lJxGSh1H2UJhsU9BXBgd3iudZc=; b=Om+4evVj9B1PyNXCY8QybUrJtitOh8yMK0Mx59LK2XvVtugESDm4HbTfif+PUMJp4j FOLSz0hf70LH8UFTnUkikunAn2CWDKLKUf+nlZigB5wCBF8QurNOEiHnIsvfhEgjLDA6 EuKI57X6CxMsHHJqJyzpRFTdXDSB9dU/nJ/kdfxC1AU+G8BfwXLF7hamSdoVt1Bn6XIg LNkgeY+kdSbfYTUu0Sd/54Tw/XWdPOWD4xDkMRiUVuSrCOxMGbwYIGfP8c1PHo4bkcvv 8XIG1vsSYZUz3dCyY/wp0HVO3oYxmWtJNNz0k1FWkZM1xneoMafSrJ6h60n1+bk/flfS UP8Q== X-Gm-Message-State: ALoCoQmmsFvsgifo8Vtah7ejvxqsNK54RYFLATwvX1oZl9VJ13KCWdY/Yz6CWpUiDk887Wc9dpVF X-Received: by 10.68.218.3 with SMTP id pc3mr76204933pbc.71.1395715740522; Mon, 24 Mar 2014 19:49:00 -0700 (PDT) Received: from localhost ([116.213.97.190]) by mx.google.com with ESMTPSA id yk4sm37798920pbc.16.2014.03.24.19.48.57 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 24 Mar 2014 19:48:59 -0700 (PDT) From: Adam Lee To: linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org, Larry Finger , stable@vger.kernel.org, "John W. Linville" , Chaoming Li Subject: [PATCH v2] rtlwifi: add MSI interrupts support Date: Tue, 25 Mar 2014 10:48:52 +0800 Message-Id: <1395715732-9545-1-git-send-email-adam.lee@canonical.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1395660884-15042-1-git-send-email-adam.lee@canonical.com> References: <1395660884-15042-1-git-send-email-adam.lee@canonical.com> Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Spam-Status: No, score=-7.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add MSI interrupts support, enable it when msi_support flag is true, also could fallback to pin-based interrupts mode if MSI mode fails. Signed-off-by: Adam Lee Cc: [3.10+] --- drivers/net/wireless/rtlwifi/pci.c | 65 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 63 insertions(+), 2 deletions(-) diff --git a/drivers/net/wireless/rtlwifi/pci.c b/drivers/net/wireless/rtlwifi/pci.c index f26f4ff..155d010 100644 --- a/drivers/net/wireless/rtlwifi/pci.c +++ b/drivers/net/wireless/rtlwifi/pci.c @@ -1853,6 +1853,65 @@ static bool _rtl_pci_find_adapter(struct pci_dev *pdev, return true; } +static int rtl_pci_intr_mode_msi(struct ieee80211_hw *hw) +{ + struct rtl_priv *rtlpriv = rtl_priv(hw); + struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw); + struct rtl_pci *rtlpci = rtl_pcidev(pcipriv); + int ret; + + ret = pci_enable_msi(rtlpci->pdev); + if (ret < 0) + return ret; + + ret = request_irq(rtlpci->pdev->irq, &_rtl_pci_interrupt, + IRQF_SHARED, KBUILD_MODNAME, hw); + if (ret < 0) { + pci_disable_msi(rtlpci->pdev); + return ret; + } + + rtlpci->using_msi = true; + + RT_TRACE(rtlpriv, COMP_INIT|COMP_INTR, DBG_DMESG, + "MSI Interrupt Mode!\n"); + return 0; +} + +static int rtl_pci_intr_mode_legacy(struct ieee80211_hw *hw) +{ + struct rtl_priv *rtlpriv = rtl_priv(hw); + struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw); + struct rtl_pci *rtlpci = rtl_pcidev(pcipriv); + int ret; + + ret = request_irq(rtlpci->pdev->irq, &_rtl_pci_interrupt, + IRQF_SHARED, KBUILD_MODNAME, hw); + if (ret < 0) + return ret; + + rtlpci->using_msi = false; + RT_TRACE(rtlpriv, COMP_INIT|COMP_INTR, DBG_DMESG, + "Pin-based Interrupt Mode!\n"); + return 0; +} + +static int rtl_pci_intr_mode_decide(struct ieee80211_hw *hw) +{ + struct rtl_pci_priv *pcipriv = rtl_pcipriv(hw); + struct rtl_pci *rtlpci = rtl_pcidev(pcipriv); + int ret; + + if (rtlpci->msi_support) { + ret = rtl_pci_intr_mode_msi(hw); + if (ret < 0) + ret = rtl_pci_intr_mode_legacy(hw); + } else { + ret = rtl_pci_intr_mode_legacy(hw); + } + return ret; +} + int rtl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id) { @@ -1995,8 +2054,7 @@ int rtl_pci_probe(struct pci_dev *pdev, } rtlpci = rtl_pcidev(pcipriv); - err = request_irq(rtlpci->pdev->irq, &_rtl_pci_interrupt, - IRQF_SHARED, KBUILD_MODNAME, hw); + err = rtl_pci_intr_mode_decide(hw); if (err) { RT_TRACE(rtlpriv, COMP_INIT, DBG_DMESG, "%s: failed to register IRQ handler\n", @@ -2064,6 +2122,9 @@ void rtl_pci_disconnect(struct pci_dev *pdev) rtlpci->irq_alloc = 0; } + if (rtlpci->using_msi) + pci_disable_msi(rtlpci->pdev); + list_del(&rtlpriv->list); if (rtlpriv->io.pci_mem_start != 0) { pci_iounmap(pdev, (void __iomem *)rtlpriv->io.pci_mem_start);