Commit 07376867 authored by Tyrel Datwyler's avatar Tyrel Datwyler Committed by Michael Ellerman

PCI: rpaphp: Annotate and correctly byte swap DRC properties

The device tree is in big endian format and any properties directly
retrieved using OF helpers that don't explicitly byte swap should
be annotated. In particular there are several places where we grab
the opaque property value for the old ibm,drc-* properties and the
ibm,my-drc-index property.

Fix this for better static checking by annotating values we know to
explicitly big endian, and byte swap where appropriate.
Signed-off-by: default avatarTyrel Datwyler <tyreld@linux.ibm.com>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/1573449697-5448-9-git-send-email-tyreld@linux.ibm.com
parent efeda8fa
...@@ -154,11 +154,11 @@ static enum pci_bus_speed get_max_bus_speed(struct slot *slot) ...@@ -154,11 +154,11 @@ static enum pci_bus_speed get_max_bus_speed(struct slot *slot)
return speed; return speed;
} }
static int get_children_props(struct device_node *dn, const int **drc_indexes, static int get_children_props(struct device_node *dn, const __be32 **drc_indexes,
const int **drc_names, const int **drc_types, const __be32 **drc_names, const __be32 **drc_types,
const int **drc_power_domains) const __be32 **drc_power_domains)
{ {
const int *indexes, *names, *types, *domains; const __be32 *indexes, *names, *types, *domains;
indexes = of_get_property(dn, "ibm,drc-indexes", NULL); indexes = of_get_property(dn, "ibm,drc-indexes", NULL);
names = of_get_property(dn, "ibm,drc-names", NULL); names = of_get_property(dn, "ibm,drc-names", NULL);
...@@ -194,8 +194,8 @@ static int rpaphp_check_drc_props_v1(struct device_node *dn, char *drc_name, ...@@ -194,8 +194,8 @@ static int rpaphp_check_drc_props_v1(struct device_node *dn, char *drc_name,
char *drc_type, unsigned int my_index) char *drc_type, unsigned int my_index)
{ {
char *name_tmp, *type_tmp; char *name_tmp, *type_tmp;
const int *indexes, *names; const __be32 *indexes, *names;
const int *types, *domains; const __be32 *types, *domains;
int i, rc; int i, rc;
rc = get_children_props(dn->parent, &indexes, &names, &types, &domains); rc = get_children_props(dn->parent, &indexes, &names, &types, &domains);
...@@ -208,7 +208,7 @@ static int rpaphp_check_drc_props_v1(struct device_node *dn, char *drc_name, ...@@ -208,7 +208,7 @@ static int rpaphp_check_drc_props_v1(struct device_node *dn, char *drc_name,
/* Iterate through parent properties, looking for my-drc-index */ /* Iterate through parent properties, looking for my-drc-index */
for (i = 0; i < be32_to_cpu(indexes[0]); i++) { for (i = 0; i < be32_to_cpu(indexes[0]); i++) {
if ((unsigned int) indexes[i + 1] == my_index) if (be32_to_cpu(indexes[i + 1]) == my_index)
break; break;
name_tmp += (strlen(name_tmp) + 1); name_tmp += (strlen(name_tmp) + 1);
...@@ -267,7 +267,7 @@ static int rpaphp_check_drc_props_v2(struct device_node *dn, char *drc_name, ...@@ -267,7 +267,7 @@ static int rpaphp_check_drc_props_v2(struct device_node *dn, char *drc_name,
int rpaphp_check_drc_props(struct device_node *dn, char *drc_name, int rpaphp_check_drc_props(struct device_node *dn, char *drc_name,
char *drc_type) char *drc_type)
{ {
const unsigned int *my_index; const __be32 *my_index;
my_index = of_get_property(dn, "ibm,my-drc-index", NULL); my_index = of_get_property(dn, "ibm,my-drc-index", NULL);
if (!my_index) { if (!my_index) {
...@@ -277,10 +277,10 @@ int rpaphp_check_drc_props(struct device_node *dn, char *drc_name, ...@@ -277,10 +277,10 @@ int rpaphp_check_drc_props(struct device_node *dn, char *drc_name,
if (of_find_property(dn->parent, "ibm,drc-info", NULL)) if (of_find_property(dn->parent, "ibm,drc-info", NULL))
return rpaphp_check_drc_props_v2(dn, drc_name, drc_type, return rpaphp_check_drc_props_v2(dn, drc_name, drc_type,
*my_index); be32_to_cpu(*my_index));
else else
return rpaphp_check_drc_props_v1(dn, drc_name, drc_type, return rpaphp_check_drc_props_v1(dn, drc_name, drc_type,
*my_index); be32_to_cpu(*my_index));
} }
EXPORT_SYMBOL_GPL(rpaphp_check_drc_props); EXPORT_SYMBOL_GPL(rpaphp_check_drc_props);
...@@ -311,10 +311,11 @@ static int is_php_type(char *drc_type) ...@@ -311,10 +311,11 @@ static int is_php_type(char *drc_type)
* for built-in pci slots (even when the built-in slots are * for built-in pci slots (even when the built-in slots are
* dlparable.) * dlparable.)
*/ */
static int is_php_dn(struct device_node *dn, const int **indexes, static int is_php_dn(struct device_node *dn, const __be32 **indexes,
const int **names, const int **types, const int **power_domains) const __be32 **names, const __be32 **types,
const __be32 **power_domains)
{ {
const int *drc_types; const __be32 *drc_types;
int rc; int rc;
rc = get_children_props(dn, indexes, names, &drc_types, power_domains); rc = get_children_props(dn, indexes, names, &drc_types, power_domains);
...@@ -374,7 +375,7 @@ static int rpaphp_drc_add_slot(struct device_node *dn) ...@@ -374,7 +375,7 @@ static int rpaphp_drc_add_slot(struct device_node *dn)
struct slot *slot; struct slot *slot;
int retval = 0; int retval = 0;
int i; int i;
const int *indexes, *names, *types, *power_domains; const __be32 *indexes, *names, *types, *power_domains;
char *name, *type; char *name, *type;
/* If this is not a hotplug slot, return without doing anything. */ /* If this is not a hotplug slot, return without doing anything. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment