~canonical-kernel/ubuntu/+source/linux-amd-embedded/+git/resolute:master-next

Last commit made on 2026-09-23
Get this branch:
git clone -b master-next https://git.launchpad.net/~canonical-kernel/ubuntu/+source/linux-amd-embedded/+git/resolute
Members of Canonical Kernel can upload to this branch. Log in for directions.

Branch merges

Branch information

Recent commits

6df029e... by Krystian Kaniewski

UBUNTU: Ubuntu-amd-embedded-7.0.0-1001.1

Signed-off-by: Krystian Kaniewski <email address hidden>

367b25a... by Krystian Kaniewski

UBUNTU: [Config] amd-embedded: Enable Xilinx FPGA support on arm64

BugLink: https://bugs.launchpad.net/bugs/2167453

Build the Xilinx FPGA framework, bridges, regions, ZynqMP and Versal
managers, AFI, PR decoupler, configfs overlays and manager debugfs into
the arm64 kernel.

Signed-off-by: Krystian Kaniewski <email address hidden>

9fb4fc0... by Nava kishore Manne <email address hidden>

UBUNTU: SAUCE: fpga: zynq: Add AFI config driver

BugLink: https://bugs.launchpad.net/bugs/2167453

Add Zynq AXI FIFO interface(AFI) config driver. This is useful for the
configuration of the PS-PL interface on Zynq platform.

State: not-upstreamable
Reason: The existing AFI interface handling is done using an FPGA subsystem
but the maintainer suggested to use an interconnect subsystem.
[michals: v6.12 update
fpga: zynq-afi: Resolve kernel-doc warning in AFI struct description
]

Signed-off-by: Nava kishore Manne <email address hidden>
Tested-by: Appana Durga Kedareswara rao <email address hidden>
Signed-off-by: Radhey Shyam Pandey <email address hidden>
Link: https://github.com/Xilinx/linux-xlnx/commit/1dc4da50a7832fc1433093bdcd4f8c447b822cae
(cherry picked from commit 1dc4da50a7832fc1433093bdcd4f8c447b822cae https://github.com/Xilinx/linux-xlnx)
Signed-off-by: Krystian Kaniewski <email address hidden>

dcc1b54... by Shubhrajyoti Datta <email address hidden>

UBUNTU: SAUCE: fpga: Add xilinx AFI config driver

BugLink: https://bugs.launchpad.net/bugs/2167453

Add zynqmp AXI FIFO interface(AFI) config driver. This is useful for the
configuration of the PS-PL interface on Zynq US+ MPSoC platform.

Link: https://lore.kernel<email address hidden>/
State: not-upstreamable
Reason: The existing AFI interface handling is done using an FPGA subsystem
but the maintainer suggested to use an interconnect subsystem.
[michals:
v6.12 update
fpga: Fix the reset handling
]

Signed-off-by: Shubhrajyoti Datta <email address hidden>
Signed-off-by: Nava kishore Manne <email address hidden>
Signed-off-by: Radhey Shyam Pandey <email address hidden>
Link: https://github.com/Xilinx/linux-xlnx/commit/216f8c7f8bc98c0beb7e521bcd15670f61f5af70
(cherry picked from commit 216f8c7f8bc98c0beb7e521bcd15670f61f5af70 https://github.com/Xilinx/linux-xlnx)
Signed-off-by: Krystian Kaniewski <email address hidden>

6daf44e... by Michal Simek <email address hidden>

UBUNTU: SAUCE: drivers: firmware: xilinx: Add AFI ioctl support

BugLink: https://bugs.launchpad.net/bugs/2167453

Adds afi ioctl to support dynamic PS-PL bus width settings.

Signed-off-by: Michal Simek <email address hidden>
Signed-off-by: Rajan Vaja <email address hidden>
Signed-off-by: Radhey Shyam Pandey <email address hidden>
Link: https://github.com/Xilinx/linux-xlnx/commit/8149e58ce6856f42428c6c7ce4519797aef5a8cd
(backported from commit 8149e58ce6856f42428c6c7ce4519797aef5a8cd https://github.com/Xilinx/linux-xlnx)
[kkaniewski: Keep the implementation in Resolute zynqmp.c.]
Signed-off-by: Krystian Kaniewski <email address hidden>

dd15539... by Nava kishore Manne

UBUNTU: SAUCE: fpga: zynqmp: Make word align the configuration data

BugLink: https://bugs.launchpad.net/bugs/2167453

To avoid the unwanted copies at firmware(PMUFW) this patch provides
a fix to align PL configuration data if the data is not word-aligned.
It improves the PL configuration timings to process unaligned bit
files.

To align the configuration data this patch adds a few padding bytes and
these additional padding bytes will not create any functional impact on
the PL configuration.

Link: https://<email address hidden>/
State: not-upstreamable
Reason: Framework refactoring is needed to address
  multiple-copies/alignment
issues.

Signed-off-by: Nava kishore Manne <email address hidden>
Link: https://github.com/Xilinx/linux-xlnx/commit/54e200eb84b0bbeb5bc642284dd18f9f96477e80
(cherry picked from commit 54e200eb84b0bbeb5bc642284dd18f9f96477e80 https://github.com/Xilinx/linux-xlnx)
Signed-off-by: Krystian Kaniewski <email address hidden>

381ff93... by Nava kishore Manne <email address hidden>

UBUNTU: SAUCE: fpga: zynqmp: Add feature-list validation check

BugLink: https://bugs.launchpad.net/bugs/2167453

Adds feature-list validation checks. These checks will avoid
unwanted fpga relevant firmware requests for unsupported
pmufw/xilfpga features.

State: pending

Signed-off-by: Nava kishore Manne <email address hidden>
Link: https://github.com/Xilinx/linux-xlnx/commit/9f0422a4f74752d544ecc8eb6fdcdd49c0a03dba
(cherry picked from commit 9f0422a4f74752d544ecc8eb6fdcdd49c0a03dba https://github.com/Xilinx/linux-xlnx)
Signed-off-by: Krystian Kaniewski <email address hidden>

5d75b3e... by Nava kishore Manne <email address hidden>

UBUNTU: SAUCE: fpga: mgr: Update the state to provide the exact error code

BugLink: https://bugs.launchpad.net/bugs/2167453

Up on fpga configuration failure, the existing sysfs state interface
is just providing the generic error message rather than providing the
exact error code. This patch extends sysfs state interface to provide
the exact error received from the lower layer along with the existing
generic error message.

Link: https://<email address hidden>/
State: not-upstreamable

Signed-off-by: Nava kishore Manne <email address hidden>
Link: https://github.com/Xilinx/linux-xlnx/commit/a42b8185eff00a989f19ce09b36d52264467d8c7
(cherry picked from commit a42b8185eff00a989f19ce09b36d52264467d8c7 https://github.com/Xilinx/linux-xlnx)
Signed-off-by: Krystian Kaniewski <email address hidden>

25f32ec... by Aravind Thokala <email address hidden>

UBUNTU: SAUCE: fpga: versal: Check family code for PDI address word swap

BugLink: https://bugs.launchpad.net/bugs/2167453

Handle the word swap in the FPGA driver itself before calling
zynqmp_pm_load_pdi(), and only for the Versal Gen 2

Use zynqmp_pm_get_family_info() to get family code and directly
compare the family code against PM_VERSAL2_FAMILY_CODE to determine
if word swapping is needed.

This simplifies the logic by removing the indirect platform data lookup and
makes the Versal Gen 2 specific requirement more explicit.

Message-ID: <email address hidden>
State: pending

Signed-off-by: Aravind Thokala <email address hidden>
Acked-by: Senthil Nathan Thangaraj <email address hidden>
Link: https://github.com/Xilinx/linux-xlnx/commit/d0eab30dcee307e2324716d97f16af26c6305096
(cherry picked from commit d0eab30dcee307e2324716d97f16af26c6305096 https://github.com/Xilinx/linux-xlnx)
Signed-off-by: Krystian Kaniewski <email address hidden>

a4e1de8... by Senthil Nathan Thangaraj <email address hidden>

UBUNTU: SAUCE: drivers: firmware: xilinx: Add support for Versal Gen 2

BugLink: https://bugs.launchpad.net/bugs/2167453

Select the extended feature check and firmware transport through platform
match data. Reuse the existing extended argument packer instead of
duplicating it in the basic path. TF-A remains basic; older platforms
retain explicit extended QUERY_DATA access.

Based-on: 85d825263667ce37759836f7f78db23dcae16c99
Link: https://github.com/Xilinx/linux-xlnx/commit/85d825263667ce37759836f7f78db23dcae16c99

Signed-off-by: Senthil Nathan Thangaraj <email address hidden>
Signed-off-by: Michal Simek <email address hidden>
(backported from commit 85d825263667ce37759836f7f78db23dcae16c99 https://github.com/Xilinx/linux-xlnx)
[kkaniewski: Keep the implementation in Resolute zynqmp.c and retain the
 public zynqmp_pm_invoke_fw_fn function. Handle variable arguments in the
 wrappers. Cast the feature API ID to u64 before shifting by 32. The vendor
 expression shifts a u32. Preserve the existing TF-A feature checks. This
 adds firmware transport support, not full platform support.]
Signed-off-by: Krystian Kaniewski <email address hidden>