Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-10-06 10:59:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

grlib/ambapp: Use correct member offset

Browse Source 
On 64-bit platforms, `struct ambapp_dev` is 36 bytes which get padded to 40
bytes.
In that scenario, substracting the size of the struct to get the address of the
parent struct yields incorrect results.

We instead use `RTEMS_CONTAINER_OF()` which will always give the correct parent
no matter the padding.
This commit is contained in:
Matteo Concas
2026-09-24 05:37:03 +00:00
committed by Sebastian Huber
parent 212057c72e
commit 05bab5136d
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bsps/shared/grlib/drvmgr/ambapp_bus.c
+6 -12
View File
@@ -364,14 +364,11 @@ void ambapp_bus_freq_register(
}
if ( amba_interface == DEV_AHB_MST ) {
adev = (struct ambapp_dev *) ( (uintptr_t) pnp->info.ahb_mst -
sizeof( struct ambapp_dev ) );
adev = RTEMS_CONTAINER_OF( pnp->info.ahb_mst, struct ambapp_dev, devinfo );
} else if ( amba_interface == DEV_AHB_SLV ) {
adev = (struct ambapp_dev *) ( (uintptr_t) pnp->info.ahb_slv -
sizeof( struct ambapp_dev ) );
adev = RTEMS_CONTAINER_OF( pnp->info.ahb_slv, struct ambapp_dev, devinfo );
} else if ( amba_interface == DEV_APB_SLV ) {
adev = (struct ambapp_dev *) ( (uintptr_t) pnp->info.apb_slv -
sizeof( struct ambapp_dev ) );
adev = RTEMS_CONTAINER_OF( pnp->info.apb_slv, struct ambapp_dev, devinfo );
} else {
return;
}
@@ -393,14 +390,11 @@ static int ambapp_bus_freq_get(
struct amba_dev_info *pnp = dev->businfo;
if ( options == DEV_AHB_MST ) {
adev = (struct ambapp_dev *) ( (uintptr_t) pnp->info.ahb_mst -
sizeof( struct ambapp_dev ) );
adev = RTEMS_CONTAINER_OF( pnp->info.ahb_mst, struct ambapp_dev, devinfo );
} else if ( options == DEV_AHB_SLV ) {
adev = (struct ambapp_dev *) ( (uintptr_t) pnp->info.ahb_slv -
sizeof( struct ambapp_dev ) );
adev = RTEMS_CONTAINER_OF( pnp->info.ahb_slv, struct ambapp_dev, devinfo );
} else if ( options == DEV_APB_SLV ) {
adev = (struct ambapp_dev *) ( (uintptr_t) pnp->info.apb_slv -
sizeof( struct ambapp_dev ) );
adev = RTEMS_CONTAINER_OF( pnp->info.apb_slv, struct ambapp_dev, devinfo );
} else {
*freq_hz = 0;
return -1;