Skip to content

Merged PR 14700321: Protect AziHsm from loading unless manticore is present#46

Merged
maheeraeron merged 1 commit intomicrosoft:mainfrom
maheeraeron:user/maheeraeron/uefi-update
Feb 6, 2026
Merged

Merged PR 14700321: Protect AziHsm from loading unless manticore is present#46
maheeraeron merged 1 commit intomicrosoft:mainfrom
maheeraeron:user/maheeraeron/uefi-update

Conversation

@maheeraeron
Copy link
Collaborator

This PR aims to do a couple things:

  1. Adds a new bit to the UefiConfigBlob for enablement of the AziHsm device -> Configures PcdAziHsmEnabled
  2. Prevents the AziHsmDxe driver from loading unless a TPM is present, via [Depex] on a TPM protocol guid existing
  3. DriverEntry in AziHsmDxe will do nothing unless the PcdAziHsmEnabled is true

…resent

This PR aims to do a couple things:
1. Adds a new bit to the UefiConfigBlob for enablement of the AziHsm device -> Configures `PcdAziHsmEnabled`
2. Prevents the AziHsmDxe driver from loading unless a TPM is present, via [Depex] on a TPM protocol guid existing
3. DriverEntry in AziHsmDxe will do _nothing_ unless the `PcdAziHsmEnabled` is true

----
#### AI description  (iteration 3)
#### PR Classification
This pull request implements a feature gating mechanism to prevent the AziHsm driver from loading when not explicitly enabled, addressing a release-blocking TPM interaction issue.

#### PR Summary
The changes add a new configuration flag (PcdAziHsmEnabled) that controls whether the AziHsm driver is loaded, along with corresponding debugging and configuration updates across multiple package files. This ensures the driver only interacts with TPM when intended.
- `AziHsmDxe.c`: Introduced a check on PcdAziHsmEnabled to bypass driver loading and log a debug message.
- `AziHsmDxe.inf`, `MsvmPkgX64.dsc`, `MsvmPkg.dec`, and `MsvmPkgAARCH64.dsc`: Added and configured the new PcdAziHsmEnabled token with a default value of FALSE.
- `BiosInterface.h` and `PlatformPei/Config.c`: Extended UEFI configuration flags and debug output to include the AziHsmEnabled flag.
<!-- GitOpsUserAgent=GitOps.Apps.Server.pullrequestcopilot -->

Related work items: #60970838
@maheeraeron maheeraeron requested a review from mebersol February 6, 2026 22:52
@maheeraeron maheeraeron merged commit e2299ff into microsoft:main Feb 6, 2026
5 checks passed
@maheeraeron maheeraeron deleted the user/maheeraeron/uefi-update branch February 6, 2026 23:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants