Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Platform/ARM/Drivers/FtpmSmm/FtpmSmm.c
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,6 @@ FtpmPseudoCrbInit (
if (Locality == 0) {
/*
* default locality is 0, always assigned unless disabled.
* this is for SPM_MM using with ARM_SMC method.
*/
CrbReg->LocalityState |= PTP_CRB_LOCALITY_STATE_LOCALITY_ASSIGNED;
}
Expand Down
19 changes: 9 additions & 10 deletions Platform/ARM/Drivers/FwuSmm/FwuSmm.c
Original file line number Diff line number Diff line change
Expand Up @@ -1356,17 +1356,16 @@ FwuEventHandler (
return EFI_INVALID_PARAMETER;
}

if (MmHandlerContext->CommProtocol == CommProtocolFfa) {
FfaMsgInfo = &MmHandlerContext->CtxData.FfaMsgInfo;
if (MmHandlerContext->CommProtocol != CommProtocolFfa) {
return EFI_UNSUPPORTED;
}

if ((FfaMsgInfo->ServiceType == ServiceTypeMmCommunication) ||
(FfaMsgInfo->DirectMsgVersion != DirectMsgV2))
{
// via mm communication protocol (FF-A).
return EFI_UNSUPPORTED;
}
} else {
// via mm communication protocol (SPM_MM).
FfaMsgInfo = &MmHandlerContext->CtxData.FfaMsgInfo;

if ((FfaMsgInfo->ServiceType == ServiceTypeMmCommunication) ||
(FfaMsgInfo->DirectMsgVersion != DirectMsgV2))
{
// via mm communication protocol (FF-A).
return EFI_UNSUPPORTED;
}

Expand Down
17 changes: 0 additions & 17 deletions Platform/ARM/Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -353,23 +353,8 @@ The Standalone MM binary is generated at the following location:

TF-A supports the following ABIs to communicate with Standalone MM:

- SPM_MM
- FF-A (>= v1.2)

#### Building TF-A with SPM_MM as the communication ABI
TF-A should be built with the following additional build flags:
```
BL32={StandaloneMm Binary} SPM_MM=1 CTX_INCLUDE_FPREGS=1 TRANSFER_LIST=1 HOB_LIST=1
```

e.g.
```
cd tf-a
make all PLAT=fvp CROSS_COMPILE={cross_compile_prefix} DEBUG=1 V=1 CSS_NON_SECURE_UART=1 EXTRA_EL2_INIT=1 \
EL3_EXCEPTION_HANDLING=1 ENABLE_SME2_FOR_NS=0 ENABLE_SME_FOR_NS=0 ENABLE_SVE_FOR_NS=0 CTX_INCLUDE_AARCH32_REGS=0 \
BL32={StandaloneMm Binary} SPM_MM=1 CTX_INCLUDE_FPREGS=1 TRANSFER_LIST=1 HOB_LIST=1
```

#### Building TF-A with FF-A as the communication ABI
TF-A should be built with the following additional build flags:
```
Expand All @@ -393,8 +378,6 @@ The FIP image should be generated with the following additional option with FF-A
--tos-fw-config $TF_A_DIR/build/fvp/<debug|release>/fdts/fvp_stmm_manifest.dtb"
```

SPM_MM doesn't need to add --tos-fw-config option.

e.g.
```
cd tf-a
Expand Down
Loading