Larry Finger <Larry.Finger@xxxxxxxxxxxx> writes:
> From: Ping-Ke Shih <pkshih@xxxxxxxxxxx>
>
> 8822be checks H2CQ by int_d, so we extend to four ISR.
> Also, irq_mask is extended to four.
>
> Signed-off-by: Ping-Ke Shih <pkshih@xxxxxxxxxxx>
> Signed-off-by: Larry Finger <Larry.Finger@xxxxxxxxxxxx>
> Cc: Yan-Hsuan Chuang <yhchuang@xxxxxxxxxxx>
> Cc: Birming Chiu <birming@xxxxxxxxxxx>
> Cc: Shaofu <shaofu@xxxxxxxxxxx>
> Cc: Steven Ting <steventing@xxxxxxxxxxx>
[...]
> @@ -936,7 +937,7 @@ static irqreturn_t _rtl_pci_interrupt(int irq, void *dev_id)
> rtlpriv->cfg->ops->disable_interrupt(hw);
>
> /*read ISR: 4/8bytes */
> - rtlpriv->cfg->ops->interrupt_recognized(hw, &inta, &intb);
> + rtlpriv->cfg->ops->interrupt_recognized(hw, &inta, &intb, &intc, &intd);
>
> /*Shared IRQ or HW disappeared */
> if (!inta || inta == 0xffff)
> diff --git a/drivers/net/wireless/realtek/rtlwifi/pci.h b/drivers/net/wireless/realtek/rtlwifi/pci.h
> index ce33fe7bc7c4..e7d070e8da2d 100644
> --- a/drivers/net/wireless/realtek/rtlwifi/pci.h
> +++ b/drivers/net/wireless/realtek/rtlwifi/pci.h
> @@ -211,7 +211,7 @@ struct rtl_pci {
>
> /*irq */
> u8 irq_alloc;
> - u32 irq_mask[2];
> + u32 irq_mask[4]; /* 0-1: normal, 2: unused, 3: h2c */
> u32 sys_irq_mask;
>
> /*Bcn control register setting */
> diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c
> index 2c671364c521..e30a18e64ff5 100644
> --- a/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c
> +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8188ee/hw.c
> @@ -1472,7 +1472,8 @@ void rtl88ee_card_disable(struct ieee80211_hw *hw)
> }
>
> void rtl88ee_interrupt_recognized(struct ieee80211_hw *hw,
> - u32 *p_inta, u32 *p_intb)
> + u32 *p_inta, u32 *p_intb,
> + u32 *p_intc, u32 *p_intd)
> {
In the future you might want to convert this to a struct which is a lot
easier to handle. But no need to resend because of this.
--
Kalle Valo
