ath9k: Add support for more WOW patterns

Newer chips like WB222, WB335 support more than
8 user-configurable patterns. This patch adds
support for it by setting up the correct HW
registers.

Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ath/ath9k/ar9003_wow.c b/drivers/net/wireless/ath/ath9k/ar9003_wow.c
index d2a4f6f..4b53d0b 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ar9003_wow.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_wow.c
@@ -100,9 +100,11 @@ int ath9k_hw_wow_apply_pattern(struct ath_hw *ah, u8 *user_pattern,
        if (pattern_count >= ah->wow.max_patterns)
                return -ENOSPC;
 
-       REG_SET_BIT(ah, AR_WOW_PATTERN, BIT(pattern_count));
+       if (pattern_count < MAX_NUM_PATTERN_LEGACY)
+               REG_SET_BIT(ah, AR_WOW_PATTERN, BIT(pattern_count));
+       else
+               REG_SET_BIT(ah, AR_MAC_PCU_WOW4, BIT(pattern_count - 8));
 
-       /* set the registers for pattern */
        for (i = 0; i < MAX_PATTERN_SIZE; i += 4) {
                memcpy(&pattern_val, user_pattern, 4);
                REG_WRITE(ah, (AR_WOW_TB_PATTERN(pattern_count) + i),
@@ -110,47 +112,39 @@ int ath9k_hw_wow_apply_pattern(struct ath_hw *ah, u8 *user_pattern,
                user_pattern += 4;
        }
 
-       /* set the registers for mask */
        for (i = 0; i < MAX_PATTERN_MASK_SIZE; i += 4) {
                memcpy(&mask_val, user_mask, 4);
                REG_WRITE(ah, (AR_WOW_TB_MASK(pattern_count) + i), mask_val);
                user_mask += 4;
        }
 
-       /* set the pattern length to be matched
-        *
-        * AR_WOW_LENGTH1_REG1
-        * bit 31:24 pattern 0 length
-        * bit 23:16 pattern 1 length
-        * bit 15:8 pattern 2 length
-        * bit 7:0 pattern 3 length
-        *
-        * AR_WOW_LENGTH1_REG2
-        * bit 31:24 pattern 4 length
-        * bit 23:16 pattern 5 length
-        * bit 15:8 pattern 6 length
-        * bit 7:0 pattern 7 length
-        *
-        * the below logic writes out the new
-        * pattern length for the corresponding
-        * pattern_count, while masking out the
-        * other fields
-        */
-
-       ah->wow.wow_event_mask |= BIT(pattern_count + AR_WOW_PAT_FOUND_SHIFT);
+       if (pattern_count < MAX_NUM_PATTERN_LEGACY)
+               ah->wow.wow_event_mask |=
+                       BIT(pattern_count + AR_WOW_PAT_FOUND_SHIFT);
+       else
+               ah->wow.wow_event_mask2 |=
+                       BIT((pattern_count - 8) + AR_WOW_PAT_FOUND_SHIFT);
 
        if (pattern_count < 4) {
-               /* Pattern 0-3 uses AR_WOW_LENGTH1 register */
                set = (pattern_len & AR_WOW_LENGTH_MAX) <<
                       AR_WOW_LEN1_SHIFT(pattern_count);
                clr = AR_WOW_LENGTH1_MASK(pattern_count);
                REG_RMW(ah, AR_WOW_LENGTH1, set, clr);
-       } else {
-               /* Pattern 4-7 uses AR_WOW_LENGTH2 register */
+       } else if (pattern_count < 8) {
                set = (pattern_len & AR_WOW_LENGTH_MAX) <<
                       AR_WOW_LEN2_SHIFT(pattern_count);
                clr = AR_WOW_LENGTH2_MASK(pattern_count);
                REG_RMW(ah, AR_WOW_LENGTH2, set, clr);
+       } else if (pattern_count < 12) {
+               set = (pattern_len & AR_WOW_LENGTH_MAX) <<
+                      AR_WOW_LEN3_SHIFT(pattern_count);
+               clr = AR_WOW_LENGTH3_MASK(pattern_count);
+               REG_RMW(ah, AR_WOW_LENGTH3, set, clr);
+       } else if (pattern_count < MAX_NUM_PATTERN) {
+               set = (pattern_len & AR_WOW_LENGTH_MAX) <<
+                      AR_WOW_LEN4_SHIFT(pattern_count);
+               clr = AR_WOW_LENGTH4_MASK(pattern_count);
+               REG_RMW(ah, AR_WOW_LENGTH4, set, clr);
        }
 
        return 0;

diff --cc drivers/net/wireless/ath/ath9k/hw.h
Simple merge

diff --cc drivers/net/wireless/ath/ath9k/reg_wow.h
Simple merge