Commit ebfa7f8a authored by Mordechay Goodstein's avatar Mordechay Goodstein Committed by Luca Coelho
Browse files

iwlwifi: yoyo: add support for parsing SHARED_MEM_ALLOC version 4 



The new version adds the information for RX2C FIFO addresses.

Use the new addresses to parse the FIFO info when dumping.

Signed-off-by: default avatarMordechay Goodstein <mordechay.goodstein@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20200424182643.97cc25d96b53.I65fd0400d80f505bd6d7eed442f12db24b25bbe3@changeid
parent 382d8296

drivers/net/wireless/intel/iwlwifi/fw/api/debug.h

+8 −6
Original line number Diff line number Diff line
@@ -5,10 +5,9 @@ 
 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright (C) 2018 - 2019 Intel Corporation

 * Copyright(c) 2007 - 2014, 2018 - 2020 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -28,10 +27,9 @@ 
 *

 * BSD LICENSE

 *

 * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright (C) 2018 - 2019 Intel Corporation

 * Copyright(c) 2005 - 2014, 2018 - 2020 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -218,6 +216,8 @@ struct iwl_shared_mem_lmac_cfg { 
 * @page_buff_size: size of %page_buff_addr

 * @lmac_num: number of LMACs (1 or 2)

 * @lmac_smem: per - LMAC smem data

 * @rxfifo2_control_addr: start addr of RXF2C

 * @rxfifo2_control_size: size of RXF2C

 */

struct iwl_shared_mem_cfg {

	__le32 shared_mem_addr;
@@ -229,8 +229,10 @@ struct iwl_shared_mem_cfg { 
	__le32 page_buff_addr;

	__le32 page_buff_size;

	__le32 lmac_num;

	struct iwl_shared_mem_lmac_cfg lmac_smem[2];

} __packed; /* SHARED_MEM_ALLOC_API_S_VER_3 */

	struct iwl_shared_mem_lmac_cfg lmac_smem[3];

	__le32 rxfifo2_control_addr;

	__le32 rxfifo2_control_size;

} __packed; /* SHARED_MEM_ALLOC_API_S_VER_4 */



/**

 * struct iwl_mfuart_load_notif - mfuart image version & status

drivers/net/wireless/intel/iwlwifi/fw/dbg.c

+26 −3
Original line number Diff line number Diff line
@@ -1386,13 +1386,36 @@ static void iwl_ini_get_rxf_data(struct iwl_fw_runtime *fwrt, 
	}



	fifo_idx = ffs(fid2) - 1;

	if (fid2 && !WARN_ON_ONCE(fifo_idx != 0)) {

		data->size = fwrt->smem_cfg.rxfifo2_size;

		data->offset = RXF_DIFF_FROM_PREV;

	if (fid2 && !WARN_ON_ONCE(~BIT(fifo_idx) & fid2)) {

		u8 max_idx;



		if (iwl_fw_lookup_notif_ver(fwrt->fw, SYSTEM_GROUP,

					    SHARED_MEM_CFG_CMD, 0) <= 3)

			max_idx = 0;

		else

			max_idx = 1;



		if (WARN_ONCE(fifo_idx > max_idx,

			      "invalid umac fifo idx %d", fifo_idx))

			return;



		/* use bit 31 to distinguish between umac and lmac rxf while

		 * parsing the dump

		 */

		data->fifo_num = fifo_idx | IWL_RXF_UMAC_BIT;



		switch (fifo_idx) {

		case 0:

			data->size = fwrt->smem_cfg.rxfifo2_size;

			data->offset = iwl_umac_prph(fwrt->trans,

						     RXF_DIFF_FROM_PREV);

			break;

		case 1:

			data->size = fwrt->smem_cfg.rxfifo2_control_size;

			data->offset = iwl_umac_prph(fwrt->trans,

						     RXF2C_DIFF_FROM_PREV);

			break;

		}

		return;

	}

}

drivers/net/wireless/intel/iwlwifi/fw/runtime.h

+3 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2017 Intel Deutschland GmbH

 * Copyright (C) 2018-2019 Intel Corporation

 * Copyright (C) 2018-2020 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -27,7 +27,7 @@ 
 * BSD LICENSE

 *

 * Copyright(c) 2017 Intel Deutschland GmbH

 * Copyright (C) 2018-2019 Intel Corporation

 * Copyright (C) 2018-2020 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -86,6 +86,7 @@ struct iwl_fwrt_shared_mem_cfg { 
		u32 rxfifo1_size;

	} lmac[MAX_NUM_LMAC];

	u32 rxfifo2_size;

	u32 rxfifo2_control_size;

	u32 internal_txfifo_addr;

	u32 internal_txfifo_size[TX_FIFO_INTERNAL_MAX_NUM];

};

drivers/net/wireless/intel/iwlwifi/fw/smem.c

+10 −4
Original line number Diff line number Diff line
@@ -5,10 +5,9 @@ 
 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 - 2019 Intel Corporation

 * Copyright(c) 2012 - 2014, 2018 - 2020 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -28,10 +27,9 @@ 
 *

 * BSD LICENSE

 *

 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH

 * Copyright(c) 2018 - 2019 Intel Corporation

 * Copyright(c) 2012 - 2014, 2018 - 2020 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -71,6 +69,8 @@ static void iwl_parse_shared_mem_22000(struct iwl_fw_runtime *fwrt, 
	struct iwl_shared_mem_cfg *mem_cfg = (void *)pkt->data;

	int i, lmac;

	int lmac_num = le32_to_cpu(mem_cfg->lmac_num);

	u8 api_ver = iwl_fw_lookup_notif_ver(fwrt->fw, SYSTEM_GROUP,

					     SHARED_MEM_CFG_CMD, 0);



	if (WARN_ON(lmac_num > ARRAY_SIZE(mem_cfg->lmac_smem)))

		return;
@@ -80,6 +80,12 @@ static void iwl_parse_shared_mem_22000(struct iwl_fw_runtime *fwrt, 
		ARRAY_SIZE(mem_cfg->lmac_smem[0].txfifo_size);

	fwrt->smem_cfg.rxfifo2_size = le32_to_cpu(mem_cfg->rxfifo2_size);



	if (api_ver >= 4 &&

	    !WARN_ON_ONCE(iwl_rx_packet_payload_len(pkt) < sizeof(*mem_cfg))) {

		fwrt->smem_cfg.rxfifo2_control_size =

			le32_to_cpu(mem_cfg->rxfifo2_control_size);

	}



	for (lmac = 0; lmac < lmac_num; lmac++) {

		struct iwl_shared_mem_lmac_cfg *lmac_cfg =

			&mem_cfg->lmac_smem[lmac];

drivers/net/wireless/intel/iwlwifi/iwl-prph.h

+5 −6
Original line number Diff line number Diff line
@@ -5,10 +5,9 @@ 
 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016        Intel Deutschland GmbH

 * Copyright (C) 2018 - 2019 Intel Corporation

 * Copyright(c) 2005 - 2014, 2018 - 2020 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -28,10 +27,9 @@ 
 *

 * BSD LICENSE

 *

 * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016        Intel Deutschland GmbH

 * Copyright (C) 2018 - 2019 Intel Corporation

 * Copyright(c) 2005 - 2014, 2018 - 2020 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -326,6 +324,7 @@ 
#define RXF_SIZE_BYTE_CND_POS		(7)

#define RXF_SIZE_BYTE_CNT_MSK		(0x3ff << RXF_SIZE_BYTE_CND_POS)

#define RXF_DIFF_FROM_PREV		(0x200)

#define RXF2C_DIFF_FROM_PREV		(0x4e00)



#define RXF_LD_FENCE_OFFSET_ADDR	(0xa00c10)

#define RXF_FIFO_RD_FENCE_ADDR		(0xa00c0c)