Commit c5b42c67 authored by Luca Coelho's avatar Luca Coelho
Browse files

iwlwifi: acpi: fill in WGDS table with defaults 



The tables we store are the larger of all the revisions, so we need to
fill in the values that we don't get from ACPI when using older
revisions.

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


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

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

+29 −13
Original line number Diff line number Diff line
@@ -745,9 +745,18 @@ int iwl_sar_get_wgds_table(struct iwl_fw_runtime *fwrt) 
read_table:

	fwrt->geo_rev = tbl_rev;

	for (i = 0; i < ACPI_NUM_GEO_PROFILES; i++) {

		for (j = 0; j < num_bands; j++) {

		for (j = 0; j < ACPI_GEO_NUM_BANDS_REV2; j++) {

			union acpi_object *entry;



			/*

			 * num_bands is either 2 or 3, if it's only 2 then

			 * fill the third band (6 GHz) with the values from

			 * 5 GHz (second band)

			 */

			if (j >= num_bands) {

				fwrt->geo_profiles[i].bands[j].max =

					fwrt->geo_profiles[i].bands[1].max;

			} else {

				entry = &wifi_pkg->package.elements[idx++];

				if (entry->type != ACPI_TYPE_INTEGER ||

				    entry->integer.value > U8_MAX) {
@@ -757,8 +766,14 @@ int iwl_sar_get_wgds_table(struct iwl_fw_runtime *fwrt) 


				fwrt->geo_profiles[i].bands[j].max =

					entry->integer.value;

			}



			for (k = 0; k < ACPI_GEO_NUM_CHAINS; k++) {

				/* same here as above */

				if (j >= num_bands) {

					fwrt->geo_profiles[i].bands[j].chains[k] =

						fwrt->geo_profiles[i].bands[1].chains[k];

				} else {

					entry = &wifi_pkg->package.elements[idx++];

					if (entry->type != ACPI_TYPE_INTEGER ||

					    entry->integer.value > U8_MAX) {
@@ -771,6 +786,7 @@ int iwl_sar_get_wgds_table(struct iwl_fw_runtime *fwrt) 
				}

			}

		}

	}



	ret = 0;

out_free: