bianbu-repo-mirror/bianbu-linux-6.6
1
0
Fork 0
mirror of https://gitee.com/bianbu-linux/linux-6.6 synced 2025-04-24 14:07:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

powerpc/pseries: Use correct data types from pseries_hp_errorlog struct

Browse source 
[ Upstream commit b76e0d4215b6b622127ebcceaa7f603313ceaec4 ]

_be32 type is defined for some elements in pseries_hp_errorlog
struct but also used them u32 after be32_to_cpu() conversion.

Example: In handle_dlpar_errorlog()
hp_elog->_drc_u.drc_index = be32_to_cpu(hp_elog->_drc_u.drc_index);

And later assigned to u32 type
dlpar_cpu() - u32 drc_index = hp_elog->_drc_u.drc_index;

This incorrect usage is giving the following warnings and the
patch resolve these warnings with the correct assignment.

arch/powerpc/platforms/pseries/dlpar.c:398:53: sparse: sparse:
incorrect type in argument 1 (different base types) @@
expected unsigned int [usertype] drc_index @@
got restricted __be32 [usertype] drc_index @@
...
arch/powerpc/platforms/pseries/dlpar.c:418:43: sparse: sparse:
incorrect type in assignment (different base types) @@
expected restricted __be32 [usertype] drc_count @@
got unsigned int [usertype] @@

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202408182142.wuIKqYae-lkp@intel.com/
Closes: https://lore.kernel.org/oe-kbuild-all/202408182302.o7QRO45S-lkp@intel.com/
Signed-off-by: Haren Myneni <haren@linux.ibm.com>

v3:
- Fix warnings from using incorrect data types in pseries_hp_errorlog
  struct
v2:
- Remove pr_info() and TODO comments
- Update more information in the commit logs

Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://msgid.link/20240822025028.938332-1-haren@linux.ibm.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Haren Myneni 2024-08-21 19:50:26 -07:00 • committed by Greg Kroah-Hartman
parent fe2c86e192
commit e16a6d1a33
4 changed files with 10 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

17
arch/powerpc/platforms/pseries/dlpar.c
View file

@ -334,23 +334,6 @@ int handle_dlpar_errorlog(struct pseries_hp_errorlog *hp_elog)
{ {
int rc; int rc;
/* pseries error logs are in BE format, convert to cpu type */
switch (hp_elog->id_type) {
case PSERIES_HP_ELOG_ID_DRC_COUNT:
hp_elog->_drc_u.drc_count =
be32_to_cpu(hp_elog->_drc_u.drc_count);
break;
case PSERIES_HP_ELOG_ID_DRC_INDEX:
hp_elog->_drc_u.drc_index =
be32_to_cpu(hp_elog->_drc_u.drc_index);
break;
case PSERIES_HP_ELOG_ID_DRC_IC:
hp_elog->_drc_u.ic.count =
be32_to_cpu(hp_elog->_drc_u.ic.count);
hp_elog->_drc_u.ic.index =
be32_to_cpu(hp_elog->_drc_u.ic.index);
}
switch (hp_elog->resource) { switch (hp_elog->resource) {
case PSERIES_HP_ELOG_RESOURCE_MEM: case PSERIES_HP_ELOG_RESOURCE_MEM:
rc = dlpar_memory(hp_elog); rc = dlpar_memory(hp_elog);

2
arch/powerpc/platforms/pseries/hotplug-cpu.c
View file

@ -757,7 +757,7 @@ int dlpar_cpu(struct pseries_hp_errorlog *hp_elog)
u32 drc_index; u32 drc_index;
int rc; int rc;
drc_index = hp_elog->_drc_u.drc_index; drc_index = be32_to_cpu(hp_elog->_drc_u.drc_index);
lock_device_hotplug(); lock_device_hotplug();

16
arch/powerpc/platforms/pseries/hotplug-memory.c
View file

@ -811,16 +811,16 @@ int dlpar_memory(struct pseries_hp_errorlog *hp_elog)
case PSERIES_HP_ELOG_ACTION_ADD: case PSERIES_HP_ELOG_ACTION_ADD:
switch (hp_elog->id_type) { switch (hp_elog->id_type) {
case PSERIES_HP_ELOG_ID_DRC_COUNT: case PSERIES_HP_ELOG_ID_DRC_COUNT:
count = hp_elog->_drc_u.drc_count; count = be32_to_cpu(hp_elog->_drc_u.drc_count);
rc = dlpar_memory_add_by_count(count); rc = dlpar_memory_add_by_count(count);
break; break;
case PSERIES_HP_ELOG_ID_DRC_INDEX: case PSERIES_HP_ELOG_ID_DRC_INDEX:
drc_index = hp_elog->_drc_u.drc_index; drc_index = be32_to_cpu(hp_elog->_drc_u.drc_index);
rc = dlpar_memory_add_by_index(drc_index); rc = dlpar_memory_add_by_index(drc_index);
break; break;
case PSERIES_HP_ELOG_ID_DRC_IC: case PSERIES_HP_ELOG_ID_DRC_IC:
count = hp_elog->_drc_u.ic.count; count = be32_to_cpu(hp_elog->_drc_u.ic.count);
drc_index = hp_elog->_drc_u.ic.index; drc_index = be32_to_cpu(hp_elog->_drc_u.ic.index);
rc = dlpar_memory_add_by_ic(count, drc_index); rc = dlpar_memory_add_by_ic(count, drc_index);
break; break;
default: default:
@ -832,16 +832,16 @@ int dlpar_memory(struct pseries_hp_errorlog *hp_elog)
case PSERIES_HP_ELOG_ACTION_REMOVE: case PSERIES_HP_ELOG_ACTION_REMOVE:
switch (hp_elog->id_type) { switch (hp_elog->id_type) {
case PSERIES_HP_ELOG_ID_DRC_COUNT: case PSERIES_HP_ELOG_ID_DRC_COUNT:
count = hp_elog->_drc_u.drc_count; count = be32_to_cpu(hp_elog->_drc_u.drc_count);
rc = dlpar_memory_remove_by_count(count); rc = dlpar_memory_remove_by_count(count);
break; break;
case PSERIES_HP_ELOG_ID_DRC_INDEX: case PSERIES_HP_ELOG_ID_DRC_INDEX:
drc_index = hp_elog->_drc_u.drc_index; drc_index = be32_to_cpu(hp_elog->_drc_u.drc_index);
rc = dlpar_memory_remove_by_index(drc_index); rc = dlpar_memory_remove_by_index(drc_index);
break; break;
case PSERIES_HP_ELOG_ID_DRC_IC: case PSERIES_HP_ELOG_ID_DRC_IC:
count = hp_elog->_drc_u.ic.count; count = be32_to_cpu(hp_elog->_drc_u.ic.count);
drc_index = hp_elog->_drc_u.ic.index; drc_index = be32_to_cpu(hp_elog->_drc_u.ic.index);
rc = dlpar_memory_remove_by_ic(count, drc_index); rc = dlpar_memory_remove_by_ic(count, drc_index);
break; break;
default: default:

2
arch/powerpc/platforms/pseries/pmem.c
View file

@ -121,7 +121,7 @@ int dlpar_hp_pmem(struct pseries_hp_errorlog *hp_elog)
return -EINVAL; return -EINVAL;
} }
drc_index = hp_elog->_drc_u.drc_index; drc_index = be32_to_cpu(hp_elog->_drc_u.drc_index);
lock_device_hotplug(); lock_device_hotplug();