Commit 51266c11 authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: support reading and storing EWRD revisions 1 and 2 



As an extension to the WRDS support for revisions 1 and 2, do the same
for the EWRD tables.  These tables have a very similar format to the
WRDS table, so most of the code is similar.

Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20210805141826.2d5494de683c.Ia024b1368873d488906a639e29454cbbdc788d03@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 2a808414

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

+50 −10
Original line number Diff line number Diff line
@@ -596,23 +596,64 @@ int iwl_sar_get_ewrd_table(struct iwl_fw_runtime *fwrt) 
	bool enabled;

	int i, n_profiles, tbl_rev, pos;

	int ret = 0;

	u8 num_chains, num_sub_bands;



	data = iwl_acpi_get_object(fwrt->dev, ACPI_EWRD_METHOD);

	if (IS_ERR(data))

		return PTR_ERR(data);



	/* start by trying to read revision 2 */

	wifi_pkg = iwl_acpi_get_wifi_pkg(fwrt->dev, data,

					 ACPI_EWRD_WIFI_DATA_SIZE, &tbl_rev);

	if (IS_ERR(wifi_pkg)) {

					 ACPI_EWRD_WIFI_DATA_SIZE_REV2,

					 &tbl_rev);

	if (!IS_ERR(wifi_pkg)) {

		if (tbl_rev != 2) {

			ret = PTR_ERR(wifi_pkg);

			goto out_free;

		}



		num_chains = ACPI_SAR_NUM_CHAINS_REV2;

		num_sub_bands = ACPI_SAR_NUM_SUB_BANDS_REV2;



		goto read_table;

	}



	/* then try revision 1 */

	wifi_pkg = iwl_acpi_get_wifi_pkg(fwrt->dev, data,

					 ACPI_EWRD_WIFI_DATA_SIZE_REV1,

					 &tbl_rev);

	if (!IS_ERR(wifi_pkg)) {

		if (tbl_rev != 1) {

			ret = PTR_ERR(wifi_pkg);

			goto out_free;

		}



		num_chains = ACPI_SAR_NUM_CHAINS_REV1;

		num_sub_bands = ACPI_SAR_NUM_SUB_BANDS_REV1;



		goto read_table;

	}



	/* then finally revision 0 */

	wifi_pkg = iwl_acpi_get_wifi_pkg(fwrt->dev, data,

					 ACPI_EWRD_WIFI_DATA_SIZE_REV0,

					 &tbl_rev);

	if (!IS_ERR(wifi_pkg)) {

		if (tbl_rev != 0) {

		ret = -EINVAL;

			ret = PTR_ERR(wifi_pkg);

			goto out_free;

		}



		num_chains = ACPI_SAR_NUM_CHAINS_REV0;

		num_sub_bands = ACPI_SAR_NUM_SUB_BANDS_REV0;



		goto read_table;

	}



	ret = PTR_ERR(wifi_pkg);

	goto out_free;



read_table:

	if (wifi_pkg->package.elements[1].type != ACPI_TYPE_INTEGER ||

	    wifi_pkg->package.elements[2].type != ACPI_TYPE_INTEGER) {

		ret = -EINVAL;
@@ -642,13 +683,12 @@ int iwl_sar_get_ewrd_table(struct iwl_fw_runtime *fwrt) 
		 */

		ret = iwl_sar_set_profile(&wifi_pkg->package.elements[pos],

					  &fwrt->sar_profiles[i + 1], enabled,

					  ACPI_SAR_NUM_CHAINS_REV0,

					  ACPI_SAR_NUM_SUB_BANDS_REV0);

					  num_chains, num_sub_bands);

		if (ret < 0)

			break;



		/* go to the next table */

		pos += ACPI_SAR_NUM_CHAINS_REV0 * ACPI_SAR_NUM_SUB_BANDS_REV0;

		pos += num_chains * num_sub_bands;

	}



out_free:

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

+7 −1
Original line number Diff line number Diff line
@@ -45,9 +45,15 @@ 
					 ACPI_SAR_NUM_SUB_BANDS_REV1 + 2)

#define ACPI_WRDS_WIFI_DATA_SIZE_REV2	(ACPI_SAR_NUM_CHAINS_REV2 * \

					 ACPI_SAR_NUM_SUB_BANDS_REV2 + 2)

#define ACPI_EWRD_WIFI_DATA_SIZE	((ACPI_SAR_PROFILE_NUM - 1) * \

#define ACPI_EWRD_WIFI_DATA_SIZE_REV0	((ACPI_SAR_PROFILE_NUM - 1) * \

					 ACPI_SAR_NUM_CHAINS_REV0 * \

					 ACPI_SAR_NUM_SUB_BANDS_REV0 + 3)

#define ACPI_EWRD_WIFI_DATA_SIZE_REV1	((ACPI_SAR_PROFILE_NUM - 1) * \

					 ACPI_SAR_NUM_CHAINS_REV1 * \

					 ACPI_SAR_NUM_SUB_BANDS_REV1 + 3)

#define ACPI_EWRD_WIFI_DATA_SIZE_REV2	((ACPI_SAR_PROFILE_NUM - 1) * \

					 ACPI_SAR_NUM_CHAINS_REV2 * \

					 ACPI_SAR_NUM_SUB_BANDS_REV2 + 3)

#define ACPI_WGDS_WIFI_DATA_SIZE	19

#define ACPI_WRDD_WIFI_DATA_SIZE	2

#define ACPI_SPLC_WIFI_DATA_SIZE	2