From: Henrik Austad <henrik@austad.us>
To: linux-rt-users@vger.kernel.org
Cc: linux-wireless@vger.kernel.org,
Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Subject: [PATCH 07/10] iwlwifi: pcie: return inta from iwl_pcie_int_cause_{non_}ict
Date: Thu, 19 Dec 2013 00:26:02 +0100 [thread overview]
Message-ID: <1387409165-28319-8-git-send-email-henrik@austad.us> (raw)
In-Reply-To: <1387409165-28319-1-git-send-email-henrik@austad.us>
From: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
These functions are meant to return an interrupt cause and
not an irqreturn_t.
The only drawback is that we will return IRQ_NONE instead
of IRQ_HANDLED when error occurs - but that shouldn't be
an issue.
Change-Id: I2de5c0d39fafb2a00429c314a2a5f0336347233d
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
---
drivers/net/wireless/iwlwifi/pcie/rx.c | 33 ++++++++++++--------------------
1 file changed, 12 insertions(+), 21 deletions(-)
diff --git a/drivers/net/wireless/iwlwifi/pcie/rx.c b/drivers/net/wireless/iwlwifi/pcie/rx.c
index aea6202..d395442 100644
--- a/drivers/net/wireless/iwlwifi/pcie/rx.c
+++ b/drivers/net/wireless/iwlwifi/pcie/rx.c
@@ -810,13 +810,11 @@ static void iwl_pcie_irq_handle_error(struct iwl_trans *trans)
local_bh_enable();
}
-static irqreturn_t iwl_pcie_int_cause_non_ict(struct iwl_trans *trans)
+static u32 iwl_pcie_int_cause_non_ict(struct iwl_trans *trans)
{
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
u32 inta;
- irqreturn_t ret = IRQ_NONE;
-
lockdep_assert_held(&trans_pcie->irq_lock);
trace_iwlwifi_dev_irq(trans->dev);
@@ -844,7 +842,7 @@ static irqreturn_t iwl_pcie_int_cause_non_ict(struct iwl_trans *trans)
/* Hardware disappeared. It might have already raised
* an interrupt */
IWL_WARN(trans, "HARDWARE GONE?? INTA == 0x%08x\n", inta);
- return IRQ_HANDLED;
+ return trans_pcie->inta;
}
if (iwl_have_debug_level(IWL_DL_ISR))
@@ -856,9 +854,7 @@ static irqreturn_t iwl_pcie_int_cause_non_ict(struct iwl_trans *trans)
trans_pcie->inta |= inta;
/* the thread will service interrupts and re-enable them */
if (likely(inta))
- return IRQ_WAKE_THREAD;
-
- ret = IRQ_HANDLED;
+ return trans_pcie->inta;
none:
/* re-enable interrupts here since we don't have anything to service. */
@@ -867,7 +863,7 @@ none:
!trans_pcie->inta)
iwl_enable_interrupts(trans);
- return ret;
+ return trans_pcie->inta;
}
/* a device (PCI-E) page is 4096 bytes long */
@@ -883,10 +879,9 @@ none:
* the interrupt we need to service, driver will set the entries back to 0 and
* set index.
*/
-static irqreturn_t iwl_pcie_int_cause_ict(struct iwl_trans *trans)
+static u32 iwl_pcie_int_cause_ict(struct iwl_trans *trans)
{
struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
- irqreturn_t ret;
u32 inta;
u32 val = 0;
u32 read;
@@ -946,9 +941,7 @@ static irqreturn_t iwl_pcie_int_cause_ict(struct iwl_trans *trans)
/* iwl_pcie_tasklet() will service interrupts and re-enable them */
if (likely(inta))
- return IRQ_WAKE_THREAD;
-
- ret = IRQ_HANDLED;
+ return trans_pcie->inta;
none:
/* re-enable interrupts here since we don't have anything to service.
@@ -958,7 +951,7 @@ static irqreturn_t iwl_pcie_int_cause_ict(struct iwl_trans *trans)
!trans_pcie->inta)
iwl_enable_interrupts(trans);
- return ret;
+ return trans_pcie->inta;
}
irqreturn_t iwl_pcie_irq_handler(int irq, void *dev_id)
@@ -969,7 +962,6 @@ irqreturn_t iwl_pcie_irq_handler(int irq, void *dev_id)
u32 inta = 0;
u32 handled = 0;
unsigned long flags;
- irqreturn_t ret;
u32 i;
lock_map_acquire(&trans->sync_cmd_lockdep_map);
@@ -980,13 +972,13 @@ irqreturn_t iwl_pcie_irq_handler(int irq, void *dev_id)
* use legacy interrupt.
*/
if (likely(trans_pcie->use_ict))
- ret = iwl_pcie_int_cause_ict(trans);
+ inta = iwl_pcie_int_cause_ict(trans);
else
- ret = iwl_pcie_int_cause_non_ict(trans);
+ inta = iwl_pcie_int_cause_non_ict(trans);
- if (ret != IRQ_WAKE_THREAD) {
+ if (!inta) {
spin_unlock_irqrestore(&trans_pcie->irq_lock, flags);
- return ret;
+ return IRQ_NONE;
}
/* Ack/clear/reset pending uCode interrupts.
@@ -1000,8 +992,7 @@ irqreturn_t iwl_pcie_irq_handler(int irq, void *dev_id)
* hardware bugs here by ACKing all the possible interrupts so that
* interrupt coalescing can still be achieved.
*/
- iwl_write32(trans, CSR_INT,
- trans_pcie->inta | ~trans_pcie->inta_mask);
+ iwl_write32(trans, CSR_INT, inta | ~trans_pcie->inta_mask);
inta = trans_pcie->inta;
--
1.7.10.4
next prev parent reply other threads:[~2013-12-18 23:37 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-18 23:25 [PATCH 00/10] update of make iwlwifi RT friendly Henrik Austad
2013-12-18 23:25 ` [PATCH 01/10] iwlwifi: pcie: clean up ICT allocation code Henrik Austad
2013-12-18 23:25 ` [PATCH 02/10] iwlwifi: pcie: track interrupt mask in SW Henrik Austad
2013-12-18 23:25 ` [PATCH 03/10] iwlwifi: pcie: re-organize the PCIe ISR code Henrik Austad
2013-12-18 23:25 ` [PATCH 04/10] iwlwifi: pcie: move the ICT / non-ICT handling functions Henrik Austad
2013-12-18 23:26 ` [PATCH 05/10] iwlwifi: pcie: read the interrupt cause from the handler Henrik Austad
2013-12-18 23:26 ` [PATCH 06/10] iwlwifi: pcie: determine the interrupt type in " Henrik Austad
2013-12-18 23:26 ` Henrik Austad [this message]
2013-12-18 23:26 ` [PATCH 08/10] iwlwifi: pcie: no need to save inta in trans_pcie Henrik Austad
2013-12-18 23:26 ` [PATCH 09/10] iwlwifi: pcie: move interrupt prints to the common handler Henrik Austad
2013-12-18 23:26 ` [PATCH 10/10] iwlwifi: pcie: stop using _irqsave Henrik Austad
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1387409165-28319-8-git-send-email-henrik@austad.us \
--to=henrik@austad.us \
--cc=emmanuel.grumbach@intel.com \
--cc=linux-rt-users@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).