Skip to content

Commit

Permalink
iwlwifi: acpi: generalize iwl_mvm_sar_find_wifi_pkg()
Browse files Browse the repository at this point in the history 
Move this function to acpi.c, renaming it to iwl_acpi_get_wifi_pkg(),
because it can also be used with other methods (i.e. SPLC and WRDD).

Signed-off-by: Luca Coelho <[email protected]>
  • Loading branch information
@lucacoelho
lucacoelho committed Oct 6, 2017
1 parent e7a3b8d commit 2fa388c
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 54 deletions.
52 changes: 52 additions & 0 deletions drivers/net/wireless/intel/iwlwifi/fw/acpi.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,55 @@ void *iwl_acpi_get_object(struct device *dev, acpi_string method)
return buf.pointer;
}
IWL_EXPORT_SYMBOL(iwl_acpi_get_object);

union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev,
union acpi_object *data,
int data_size)
{
int i;
union acpi_object *wifi_pkg;

/*
* We need at least one entry in the wifi package that
* describes the domain, and one more entry, otherwise there's
* no point in reading it.
*/
if (WARN_ON_ONCE(data_size < 2))
return ERR_PTR(-EINVAL);

/*
* We need at least two packages, one for the revision and one
* for the data itself. Also check that the revision is valid
* (i.e. it is an integer set to 0).
*/
if (data->type != ACPI_TYPE_PACKAGE ||
data->package.count < 2 ||
data->package.elements[0].type != ACPI_TYPE_INTEGER ||
data->package.elements[0].integer.value != 0) {
IWL_DEBUG_DEV_RADIO(dev, "Unsupported packages structure\n");
return ERR_PTR(-EINVAL);
}

/* loop through all the packages to find the one for WiFi */
for (i = 1; i < data->package.count; i++) {
union acpi_object *domain;

wifi_pkg = &data->package.elements[i];

/* skip entries that are not a package with the right size */
if (wifi_pkg->type != ACPI_TYPE_PACKAGE ||
wifi_pkg->package.count != data_size)
continue;

domain = &wifi_pkg->package.elements[0];
if (domain->type == ACPI_TYPE_INTEGER &&
domain->integer.value == ACPI_WIFI_DOMAIN)
goto found;
}

return ERR_PTR(-ENOENT);

found:
return wifi_pkg;
}
IWL_EXPORT_SYMBOL(iwl_acpi_get_wifi_pkg);
10 changes: 10 additions & 0 deletions drivers/net/wireless/intel/iwlwifi/fw/acpi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,9 @@
#ifdef CONFIG_ACPI

void *iwl_acpi_get_object(struct device *dev, acpi_string method);
union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev,
union acpi_object *data,
int data_size);

#else /* CONFIG_ACPI */

Expand All @@ -99,5 +102,12 @@ static inline void *iwl_acpi_get_object(struct device *dev, acpi_string method)
return ERR_PTR(-ENOENT);
}

static inline union acpi_object *iwl_acpi_get_wifi_pkg(struct device *dev,
union acpi_object *data,
int data_size)
{
return ERR_PTR(-ENOENT);
}

#endif /* CONFIG_ACPI */
#endif /* __iwl_fw_acpi__ */
60 changes: 6 additions & 54 deletions drivers/net/wireless/intel/iwlwifi/mvm/fw.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -599,54 +599,6 @@ static int iwl_mvm_sar_set_profile(struct iwl_mvm *mvm,
return 0;
}

static union acpi_object *iwl_mvm_sar_find_wifi_pkg(struct iwl_mvm *mvm,
union acpi_object *data,
int data_size)
{
union acpi_object *wifi_pkg = NULL;
int i;

/*
* We need at least two packages, one for the revision and one
* for the data itself. Also check that the revision is valid
* (i.e. it is an integer set to 0).
*/
if (data->type != ACPI_TYPE_PACKAGE ||
data->package.count < 2 ||
data->package.elements[0].type != ACPI_TYPE_INTEGER ||
data->package.elements[0].integer.value != 0) {
IWL_DEBUG_RADIO(mvm, "Unsupported packages structure\n");
return ERR_PTR(-EINVAL);
}

/* loop through all the packages to find the one for WiFi */
for (i = 1; i < data->package.count; i++) {
union acpi_object *domain;

wifi_pkg = &data->package.elements[i];

/* Skip anything that is not a package with the right
* amount of elements (i.e. domain_type,
* enabled/disabled plus the actual data size.
*/
if (wifi_pkg->type != ACPI_TYPE_PACKAGE ||
wifi_pkg->package.count != data_size)
continue;

domain = &wifi_pkg->package.elements[0];
if (domain->type == ACPI_TYPE_INTEGER &&
domain->integer.value == ACPI_WIFI_DOMAIN)
break;

wifi_pkg = NULL;
}

if (!wifi_pkg)
return ERR_PTR(-ENOENT);

return wifi_pkg;
}

static int iwl_mvm_sar_get_wrds_table(struct iwl_mvm *mvm)
{
union acpi_object *wifi_pkg, *table, *data;
Expand All @@ -657,8 +609,8 @@ static int iwl_mvm_sar_get_wrds_table(struct iwl_mvm *mvm)
if (IS_ERR(data))
return PTR_ERR(data);

wifi_pkg = iwl_mvm_sar_find_wifi_pkg(mvm, data,
ACPI_WRDS_WIFI_DATA_SIZE);
wifi_pkg = iwl_acpi_get_wifi_pkg(mvm->dev, data,
ACPI_WRDS_WIFI_DATA_SIZE);
if (IS_ERR(wifi_pkg)) {
ret = PTR_ERR(wifi_pkg);
goto out_free;
Expand Down Expand Up @@ -694,8 +646,8 @@ static int iwl_mvm_sar_get_ewrd_table(struct iwl_mvm *mvm)
if (IS_ERR(data))
return PTR_ERR(data);

wifi_pkg = iwl_mvm_sar_find_wifi_pkg(mvm, data,
ACPI_EWRD_WIFI_DATA_SIZE);
wifi_pkg = iwl_acpi_get_wifi_pkg(mvm->dev, data,
ACPI_EWRD_WIFI_DATA_SIZE);
if (IS_ERR(wifi_pkg)) {
ret = PTR_ERR(wifi_pkg);
goto out_free;
Expand Down Expand Up @@ -750,8 +702,8 @@ static int iwl_mvm_sar_get_wgds_table(struct iwl_mvm *mvm)
if (IS_ERR(data))
return PTR_ERR(data);

wifi_pkg = iwl_mvm_sar_find_wifi_pkg(mvm, data,
ACPI_WGDS_WIFI_DATA_SIZE);
wifi_pkg = iwl_acpi_get_wifi_pkg(mvm->dev, data,
ACPI_WGDS_WIFI_DATA_SIZE);
if (IS_ERR(wifi_pkg)) {
ret = PTR_ERR(wifi_pkg);
goto out_free;
Expand Down

0 comments on commit 2fa388c

Please sign in to comment.