wifi: iwlwifi: cfg: remove DCCM offsets from new devices

This is only used with old-style debug dump, which isn't
supported on newer devices, so remove the data.

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Link: https://patch.msgid.link/20250508121306.1277801-14-miriam.rachel.korenblit@intel.com
Signed-off-by: Miri Korenblit <miriam.rachel.korenblit@intel.com>

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
index 3ac9a8ec89155e18930daa3366cf6ab917e12763..273625e84676753ca3a9a7e66f1695127dcac468 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/22000.c
@@ -19,10 +19,6 @@
 #define IWL_22000_NVM_VERSION          0x0a1d
 
 /* Memory offsets and lengths */
-#define IWL_22000_DCCM_OFFSET          0x800000 /* LMAC1 */
-#define IWL_22000_DCCM_LEN             0x10000 /* LMAC1 */
-#define IWL_22000_DCCM2_OFFSET         0x880000
-#define IWL_22000_DCCM2_LEN            0x8000
 #define IWL_22000_SMEM_OFFSET          0x400000
 #define IWL_22000_SMEM_LEN             0xD0000
 
@@ -64,10 +60,6 @@ static const struct iwl_family_base_params iwl_22000_base = {
        .ucode_api_min = IWL_22000_UCODE_API_MIN,                       \
        .led_mode = IWL_LED_RF_STATE,                                   \
        .non_shared_ant = ANT_B,                                        \
-       .dccm_offset = IWL_22000_DCCM_OFFSET,                           \
-       .dccm_len = IWL_22000_DCCM_LEN,                                 \
-       .dccm2_offset = IWL_22000_DCCM2_OFFSET,                         \
-       .dccm2_len = IWL_22000_DCCM2_LEN,                               \
        .smem_offset = IWL_22000_SMEM_OFFSET,                           \
        .smem_len = IWL_22000_SMEM_LEN,                                 \
        .features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,           \

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/ax210.c b/drivers/net/wireless/intel/iwlwifi/cfg/ax210.c
index e52dea6b468a76ddc8c78ae323e5dbe89fe5314a..82b127ffb537b37618b7fbd02c9c8b3d39958f37 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/ax210.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/ax210.c
@@ -19,10 +19,6 @@
 #define IWL_AX210_NVM_VERSION          0x0a1d
 
 /* Memory offsets and lengths */
-#define IWL_AX210_DCCM_OFFSET          0x800000 /* LMAC1 */
-#define IWL_AX210_DCCM_LEN             0x10000 /* LMAC1 */
-#define IWL_AX210_DCCM2_OFFSET         0x880000
-#define IWL_AX210_DCCM2_LEN            0x8000
 #define IWL_AX210_SMEM_OFFSET          0x400000
 #define IWL_AX210_SMEM_LEN             0xD0000
 
@@ -62,10 +58,6 @@ static const struct iwl_family_base_params iwl_ax210_base = {
        .ucode_api_min = IWL_AX210_UCODE_API_MIN,                       \
        .led_mode = IWL_LED_RF_STATE,                                   \
        .non_shared_ant = ANT_B,                                        \
-       .dccm_offset = IWL_AX210_DCCM_OFFSET,                           \
-       .dccm_len = IWL_AX210_DCCM_LEN,                                 \
-       .dccm2_offset = IWL_AX210_DCCM2_OFFSET,                         \
-       .dccm2_len = IWL_AX210_DCCM2_LEN,                               \
        .smem_offset = IWL_AX210_SMEM_OFFSET,                           \
        .smem_len = IWL_AX210_SMEM_LEN,                                 \
        .features = IWL_TX_CSUM_NETIF_FLAGS | NETIF_F_RXCSUM,           \

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/bz.c b/drivers/net/wireless/intel/iwlwifi/cfg/bz.c
index 8567c5ed92d7b79b582b4720b5fa0a63765a46b1..8d6a042c9c64e951422b5605f13c927bf7d90215 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/bz.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/bz.c
@@ -19,10 +19,6 @@
 #define IWL_BZ_NVM_VERSION             0x0a1d
 
 /* Memory offsets and lengths */
-#define IWL_BZ_DCCM_OFFSET             0x800000 /* LMAC1 */
-#define IWL_BZ_DCCM_LEN                        0x10000 /* LMAC1 */
-#define IWL_BZ_DCCM2_OFFSET            0x880000
-#define IWL_BZ_DCCM2_LEN               0x8000
 #define IWL_BZ_SMEM_OFFSET             0x400000
 #define IWL_BZ_SMEM_LEN                        0xD0000
 
@@ -59,10 +55,6 @@ static const struct iwl_family_base_params iwl_bz_base = {
        .ucode_api_min = IWL_BZ_UCODE_API_MIN,                  \
        .led_mode = IWL_LED_RF_STATE,                                   \
        .non_shared_ant = ANT_B,                                        \
-       .dccm_offset = IWL_BZ_DCCM_OFFSET,                              \
-       .dccm_len = IWL_BZ_DCCM_LEN,                                    \
-       .dccm2_offset = IWL_BZ_DCCM2_OFFSET,                            \
-       .dccm2_len = IWL_BZ_DCCM2_LEN,                          \
        .smem_offset = IWL_BZ_SMEM_OFFSET,                              \
        .smem_len = IWL_BZ_SMEM_LEN,                                    \
        .apmg_not_supported = true,                                     \

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/dr.c b/drivers/net/wireless/intel/iwlwifi/cfg/dr.c
index 0a0a9b49d8ff2411748cf26e50279f3e774473b7..2d571ffe958814a66f0e0f498943734bd12d6839 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/dr.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/dr.c
@@ -18,10 +18,6 @@
 #define IWL_DR_NVM_VERSION             0x0a1d
 
 /* Memory offsets and lengths */
-#define IWL_DR_DCCM_OFFSET             0x800000 /* LMAC1 */
-#define IWL_DR_DCCM_LEN                        0x10000 /* LMAC1 */
-#define IWL_DR_DCCM2_OFFSET            0x880000
-#define IWL_DR_DCCM2_LEN               0x8000
 #define IWL_DR_SMEM_OFFSET             0x400000
 #define IWL_DR_SMEM_LEN                        0xD0000
 
@@ -52,10 +48,6 @@ static const struct iwl_family_base_params iwl_dr_base = {
        .ucode_api_min = IWL_DR_UCODE_API_MIN,                  \
        .led_mode = IWL_LED_RF_STATE,                                   \
        .non_shared_ant = ANT_B,                                        \
-       .dccm_offset = IWL_DR_DCCM_OFFSET,                              \
-       .dccm_len = IWL_DR_DCCM_LEN,                                    \
-       .dccm2_offset = IWL_DR_DCCM2_OFFSET,                            \
-       .dccm2_len = IWL_DR_DCCM2_LEN,                          \
        .smem_offset = IWL_DR_SMEM_OFFSET,                              \
        .smem_len = IWL_DR_SMEM_LEN,                                    \
        .apmg_not_supported = true,                                     \

diff --git a/drivers/net/wireless/intel/iwlwifi/cfg/sc.c b/drivers/net/wireless/intel/iwlwifi/cfg/sc.c
index 928b1514d33f2dc90b758b0762c9b7702930ad34..cdd859b9335696ae44513b02888e16376069b863 100644 (file)
--- a/drivers/net/wireless/intel/iwlwifi/cfg/sc.c
+++ b/drivers/net/wireless/intel/iwlwifi/cfg/sc.c
@@ -19,10 +19,6 @@
 #define IWL_SC_NVM_VERSION             0x0a1d
 
 /* Memory offsets and lengths */
-#define IWL_SC_DCCM_OFFSET             0x800000 /* LMAC1 */
-#define IWL_SC_DCCM_LEN                        0x10000 /* LMAC1 */
-#define IWL_SC_DCCM2_OFFSET            0x880000
-#define IWL_SC_DCCM2_LEN               0x8000
 #define IWL_SC_SMEM_OFFSET             0x400000
 #define IWL_SC_SMEM_LEN                        0xD0000
 
@@ -59,10 +55,6 @@ static const struct iwl_family_base_params iwl_sc_base = {
        .ucode_api_min = IWL_SC_UCODE_API_MIN,                          \
        .led_mode = IWL_LED_RF_STATE,                                   \
        .non_shared_ant = ANT_B,                                        \
-       .dccm_offset = IWL_SC_DCCM_OFFSET,                              \
-       .dccm_len = IWL_SC_DCCM_LEN,                                    \
-       .dccm2_offset = IWL_SC_DCCM2_OFFSET,                            \
-       .dccm2_len = IWL_SC_DCCM2_LEN,                                  \
        .smem_offset = IWL_SC_SMEM_OFFSET,                              \
        .smem_len = IWL_SC_SMEM_LEN,                                    \
        .apmg_not_supported = true,                                     \