* [PATCH net-next v3 0/6] pds_core: Add PLDM firmware update and host backed memory support
@ 2026-06-08 22:32 Nikhil P. Rao
2026-06-08 22:32 ` [PATCH v3 1/6] pds_core: add support for quiet devcmd failures Nikhil P. Rao
` (5 more replies)
0 siblings, 6 replies; 8+ messages in thread
From: Nikhil P. Rao @ 2026-06-08 22:32 UTC (permalink / raw)
To: netdev
Cc: Brett Creeley, Andrew Lunn, David S . Miller, Eric Dumazet,
Jakub Kicinski, Paolo Abeni, linux-kernel, Eric Joyner,
Nikhil P. Rao
This series adds PLDM-based firmware update support to the pds_core
driver. PLDM (Platform Level Data Model) is a DMTF standard for firmware
management that provides a vendor-neutral interface for firmware updates.
The implementation uses the kernel's pldmfw library for package parsing
and component matching. Users can update entire firmware packages or
individual components via devlink flash. Component information is
displayed via devlink info, showing firmware versions and update status
for each component.
The series also adds host backed memory support, allowing firmware to
request memory pages from the host for its operations.
Changes since v2:
- Use driver-defined component names instead of passing through firmware
names (Jakub Kicinski). Added component_type enum that firmware populates,
driver maps to stable names like fw.mainfw, fw.goldfw, fw.bootloader.
Added documentation of firmware version names to pds_core.rst.
- Fixed bugs identified by sashiko:
Patch 2 (identity version 2):
- Fix comment using wrong macro names (IDENTIFY vs IDENTITY)
Patch 3 (PLDM firmware update):
- DMA-after-free on EAGAIN/ETIMEDOUT: when a command times out or
returns busy, firmware may still be accessing the DMA buffer; defer
freeing until a subsequent command succeeds
- Use dev_warn_once for incompatible firmware version (ver==0)
- Clear component cache after flash to show updated versions
Patch 4 (component info):
- Fix min_t(u8) truncation of max_fw_slots (u16) to min_t(u16)
- Fix F_FIXED early return skipping F_RUNNING flag check
- Don't fail devlink info if component query fails; use dev_warn_once
and continue to report generic fields (fw, asic.id, serial_number)
Patch 5 (host backed memory):
- Switch from adminq to devcmd; fixes both workqueue self-deadlock
during recovery (adminq completion runs on same wq as health_thread)
and health_work re-queued after cancel (adminq timeout re-queues work)
- Remove MEM_DEL from teardown path; fixes both MEM_DEL sent twice
for same tag and num_host_mem_reqs ambiguous semantics (now only
tracks pages to free). pci_clear_master guarantees DMA quiescence.
- Fix PDSC_HOST_MEM_MAX_CONTIG to 4MB constant (was arch-dependent)
- Not fixed: pdsc_host_mem_add() failure ignored; partial host memory
is acceptable and firmware handles fewer regions than requested
Patch 6 (debugfs):
- Move pdsc_debugfs_del_host_mem() before pdsc_host_mem_free() to
fix use-after-free race with debugfs readers
- Use %u for unsigned types and %pad for dma_addr_t
- Remove "file exists" check (now dead code since teardown removes file)
Note: The following fix was submitted separately via net:
- DMA in flight during teardown (call pci_clear_master before freeing
host memory):
https://lore.kernel.org/all/20260604213637.3844317-1-nikhil.rao@amd.com/
Changes since v1:
- Removed redefinition of __counted_by kernel primitive (Jakub Kicinski)
- Fixed kdoc warnings in pds_core_if.h
- Fixed checkpatch warnings
- Fixed bugs identified by sashiko:
Patch 2 (identity version 2):
- Zero data region before firmware commands
- Suppress expected error message during identify probe
Patch 3 (PLDM firmware update):
- Memory leak in pdsc_send_component_image() error path
- Memory leak in pdsc_flash_component() error path
- Missing devcmd_lock in pdsc_devcmd_finalize_update()
- Fixed dma_mapping_error() return value handling (returns boolean, not error code)
- Skip logic for components with index > 255
Patch 4 (component info):
- Added generic fw version display for all identity versions
- Handle components with both RUNNING and STARTUP flags
Patch 5 (host backed memory):
- Race between pdsc_remove and health thread (use-after-free)
- Set missing index field in MEM_QUERY command
- Host memory allocation size and zeroing
- Don't free host memory on MEM_ADD timeout (firmware may still be using it)
Patch 6 (debugfs):
- Fix dentry reference leak in debugfs_lookup (missing dput)
- Improvements:
- Cache component info to avoid repeated firmware queries (patch 4)
Note: The following fix for an existing bug was submitted separately
via net:
- Timeout error overwritten with stale status:
https://lore.kernel.org/netdev/20260515212907.998028-1-nikhil.rao@amd.com/
Link to v2: https://patch.msgid.link/20260516-upstream_v2_clean-v2-0-7e0d66bf4020@amd.com
Signed-off-by: Nikhil P. Rao <nikhil.rao@amd.com>
Brett Creeley (4):
pds_core: add support for quiet devcmd failures
pds_core: add support for identity version 2
pds_core: add PLDM firmware update support via devlink flash
pds_core: add PLDM component info display
Vamsi Atluri (2):
pds_core: add host backed memory support for firmware
pds_core: add debugfs support for host backed memory
.../device_drivers/ethernet/amd/pds_core.rst | 88 ++
drivers/net/ethernet/amd/Kconfig | 1 +
drivers/net/ethernet/amd/pds_core/core.c | 163 ++++
drivers/net/ethernet/amd/pds_core/core.h | 51 +-
drivers/net/ethernet/amd/pds_core/debugfs.c | 45 +
drivers/net/ethernet/amd/pds_core/dev.c | 136 +++-
drivers/net/ethernet/amd/pds_core/devlink.c | 107 ++-
drivers/net/ethernet/amd/pds_core/fw.c | 767 +++++++++++++++++-
drivers/net/ethernet/amd/pds_core/main.c | 11 +-
include/linux/pds/pds_core_if.h | 470 +++++++++++
10 files changed, 1819 insertions(+), 20 deletions(-)
base-commit: 903db046d5579bef0ea699eae4b279dd6455fc9f
--
2.43.0
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH v3 1/6] pds_core: add support for quiet devcmd failures 2026-06-08 22:32 [PATCH net-next v3 0/6] pds_core: Add PLDM firmware update and host backed memory support Nikhil P. Rao @ 2026-06-08 22:32 ` Nikhil P. Rao 2026-06-08 22:32 ` [PATCH v3 2/6] pds_core: add support for identity version 2 Nikhil P. Rao ` (4 subsequent siblings) 5 siblings, 0 replies; 8+ messages in thread From: Nikhil P. Rao @ 2026-06-08 22:32 UTC (permalink / raw) To: netdev Cc: Brett Creeley, Andrew Lunn, David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, linux-kernel, Eric Joyner From: Brett Creeley <brett.creeley@amd.com> Currently there aren't any use-cases that require special handling on whether or not to print devcmd failures. Specifically non-generic failures, i.e. not supported failures. Add support to allow these messages to be suppressed. This will be used when adding support to negotiate PDS_CORE_IDENTITY_VERSION_2. Signed-off-by: Brett Creeley <brett.creeley@amd.com> --- drivers/net/ethernet/amd/pds_core/dev.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/amd/pds_core/dev.c b/drivers/net/ethernet/amd/pds_core/dev.c index bded6b33289c..dd9989cfe6b3 100644 --- a/drivers/net/ethernet/amd/pds_core/dev.c +++ b/drivers/net/ethernet/amd/pds_core/dev.c @@ -126,7 +126,8 @@ static const char *pdsc_devcmd_str(int opcode) } } -static int pdsc_devcmd_wait(struct pdsc *pdsc, u8 opcode, int max_seconds) +static int __pdsc_devcmd_wait(struct pdsc *pdsc, u8 opcode, int max_seconds, + const bool do_msg) { struct device *dev = pdsc->dev; unsigned long start_time; @@ -179,7 +180,7 @@ static int pdsc_devcmd_wait(struct pdsc *pdsc, u8 opcode, int max_seconds) status = pdsc_devcmd_status(pdsc); err = pdsc_err_to_errno(status); - if (err && err != -EAGAIN) + if (do_msg && err && err != -EAGAIN) dev_err(dev, "DEVCMD %d %s failed, status=%d err %d %pe\n", opcode, pdsc_devcmd_str(opcode), status, err, ERR_PTR(err)); @@ -187,8 +188,9 @@ static int pdsc_devcmd_wait(struct pdsc *pdsc, u8 opcode, int max_seconds) return err; } -int pdsc_devcmd_locked(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, - union pds_core_dev_comp *comp, int max_seconds) +static int __pdsc_devcmd_locked(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, + union pds_core_dev_comp *comp, int max_seconds, + const bool do_msg) { int err; @@ -197,7 +199,7 @@ int pdsc_devcmd_locked(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, memcpy_toio(&pdsc->cmd_regs->cmd, cmd, sizeof(*cmd)); pdsc_devcmd_dbell(pdsc); - err = pdsc_devcmd_wait(pdsc, cmd->opcode, max_seconds); + err = __pdsc_devcmd_wait(pdsc, cmd->opcode, max_seconds, do_msg); if ((err == -ENXIO || err == -ETIMEDOUT) && pdsc->wq) queue_work(pdsc->wq, &pdsc->health_work); @@ -207,6 +209,12 @@ int pdsc_devcmd_locked(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, return err; } +int pdsc_devcmd_locked(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, + union pds_core_dev_comp *comp, int max_seconds) +{ + return __pdsc_devcmd_locked(pdsc, cmd, comp, max_seconds, true); +} + int pdsc_devcmd(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, union pds_core_dev_comp *comp, int max_seconds) { -- 2.43.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v3 2/6] pds_core: add support for identity version 2 2026-06-08 22:32 [PATCH net-next v3 0/6] pds_core: Add PLDM firmware update and host backed memory support Nikhil P. Rao 2026-06-08 22:32 ` [PATCH v3 1/6] pds_core: add support for quiet devcmd failures Nikhil P. Rao @ 2026-06-08 22:32 ` Nikhil P. Rao 2026-06-08 22:32 ` [PATCH v3 3/6] pds_core: add PLDM firmware update support via devlink flash Nikhil P. Rao ` (3 subsequent siblings) 5 siblings, 0 replies; 8+ messages in thread From: Nikhil P. Rao @ 2026-06-08 22:32 UTC (permalink / raw) To: netdev Cc: Brett Creeley, Andrew Lunn, David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, linux-kernel, Eric Joyner From: Brett Creeley <brett.creeley@amd.com> Add a new capabilities field in struct pds_core_dev_identity, which requires bumping the identity version to 2, i.e. PDS_CORE_IDENTITY_VERSION_2. If version 2 negotiation fails, then quietly fall back to version 1. If version 1 negotiation fails, then driver load will fail. Another patch in the series will make use of the capabilities field. Signed-off-by: Brett Creeley <brett.creeley@amd.com> --- drivers/net/ethernet/amd/pds_core/dev.c | 39 ++++++++++++++++++++----- include/linux/pds/pds_core_if.h | 4 +++ 2 files changed, 36 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/amd/pds_core/dev.c b/drivers/net/ethernet/amd/pds_core/dev.c index dd9989cfe6b3..5c0ca3d0b000 100644 --- a/drivers/net/ethernet/amd/pds_core/dev.c +++ b/drivers/net/ethernet/amd/pds_core/dev.c @@ -250,15 +250,17 @@ int pdsc_devcmd_reset(struct pdsc *pdsc) return pdsc_devcmd(pdsc, &cmd, &comp, pdsc->devcmd_timeout); } -static int pdsc_devcmd_identify_locked(struct pdsc *pdsc) +static int pdsc_devcmd_identify_locked(struct pdsc *pdsc, u8 drv_ident_ver, + bool do_msg) { union pds_core_dev_comp comp = {}; union pds_core_dev_cmd cmd = { .identify.opcode = PDS_CORE_CMD_IDENTIFY, - .identify.ver = PDS_CORE_IDENTITY_VERSION_1, + .identify.ver = drv_ident_ver, }; - return pdsc_devcmd_locked(pdsc, &cmd, &comp, pdsc->devcmd_timeout); + return __pdsc_devcmd_locked(pdsc, &cmd, &comp, pdsc->devcmd_timeout, + do_msg); } static void pdsc_init_devinfo(struct pdsc *pdsc) @@ -281,8 +283,9 @@ static void pdsc_init_devinfo(struct pdsc *pdsc) dev_dbg(pdsc->dev, "fw_version %s\n", pdsc->dev_info.fw_version); } -static int pdsc_identify(struct pdsc *pdsc) +static int pdsc_identify_ver(struct pdsc *pdsc, u8 drv_ident_ver) { + bool do_msg = drv_ident_ver == PDS_CORE_IDENTITY_VERSION_1; struct pds_core_drv_identity drv = {}; size_t sz; int err; @@ -305,17 +308,24 @@ static int pdsc_identify(struct pdsc *pdsc) sz = min_t(size_t, sizeof(drv), sizeof(pdsc->cmd_regs->data)); memcpy_toio(&pdsc->cmd_regs->data, &drv, sz); - err = pdsc_devcmd_identify_locked(pdsc); + err = pdsc_devcmd_identify_locked(pdsc, drv_ident_ver, do_msg); if (!err) { sz = min_t(size_t, sizeof(pdsc->dev_ident), sizeof(pdsc->cmd_regs->data)); memcpy_fromio(&pdsc->dev_ident, &pdsc->cmd_regs->data, sz); + + /* V1 firmware doesn't set capabilities, so the field may + * contain garbage from the outgoing driver identity. + */ + if (pdsc->dev_ident.version < PDS_CORE_IDENTITY_VERSION_2) + pdsc->dev_ident.capabilities = 0; } mutex_unlock(&pdsc->devcmd_lock); if (err) { - dev_err(pdsc->dev, "Cannot identify device: %pe\n", - ERR_PTR(err)); + if (do_msg) + dev_err(pdsc->dev, "Cannot identify device: %pe\n", + ERR_PTR(err)); return err; } @@ -334,6 +344,21 @@ static int pdsc_identify(struct pdsc *pdsc) return 0; } +static int pdsc_identify(struct pdsc *pdsc) +{ + int err; + + /* Older firmware rejects anything but PDS_CORE_IDENTITY_VERSION_1 + * instead of returning the max supported identity version, so retry if + * firmware doesn't support PDS_CORE_IDENTITY_VERSION_2 + */ + err = pdsc_identify_ver(pdsc, PDS_CORE_IDENTITY_VERSION_2); + if (err) + err = pdsc_identify_ver(pdsc, PDS_CORE_IDENTITY_VERSION_1); + + return err; +} + void pdsc_dev_uninit(struct pdsc *pdsc) { if (pdsc->intr_info) { diff --git a/include/linux/pds/pds_core_if.h b/include/linux/pds/pds_core_if.h index 17a87c1a55d7..619186f26b5b 100644 --- a/include/linux/pds/pds_core_if.h +++ b/include/linux/pds/pds_core_if.h @@ -119,6 +119,8 @@ struct pds_core_drv_identity { * value in usecs to device units using: * device units = usecs * mult / div * @vif_types: How many of each VIF device type is supported + * @capabilities: Device capabilities + * only supported on version >= PDS_CORE_IDENTITY_VERSION_2 */ struct pds_core_dev_identity { u8 version; @@ -131,9 +133,11 @@ struct pds_core_dev_identity { __le32 intr_coal_mult; __le32 intr_coal_div; __le16 vif_types[PDS_DEV_TYPE_MAX]; + __le64 capabilities; }; #define PDS_CORE_IDENTITY_VERSION_1 1 +#define PDS_CORE_IDENTITY_VERSION_2 2 /** * struct pds_core_dev_identify_cmd - Driver/device identify command -- 2.43.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v3 3/6] pds_core: add PLDM firmware update support via devlink flash 2026-06-08 22:32 [PATCH net-next v3 0/6] pds_core: Add PLDM firmware update and host backed memory support Nikhil P. Rao 2026-06-08 22:32 ` [PATCH v3 1/6] pds_core: add support for quiet devcmd failures Nikhil P. Rao 2026-06-08 22:32 ` [PATCH v3 2/6] pds_core: add support for identity version 2 Nikhil P. Rao @ 2026-06-08 22:32 ` Nikhil P. Rao 2026-06-08 22:53 ` Jacob Keller 2026-06-08 22:32 ` [PATCH v3 4/6] pds_core: add PLDM component info display Nikhil P. Rao ` (2 subsequent siblings) 5 siblings, 1 reply; 8+ messages in thread From: Nikhil P. Rao @ 2026-06-08 22:32 UTC (permalink / raw) To: netdev Cc: Brett Creeley, Andrew Lunn, David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, linux-kernel, Eric Joyner, Nikhil P . Rao From: Brett Creeley <brett.creeley@amd.com> Implement PLDM FW Update in the pds_core driver using the upstream pldmfw API. This allows updating an entire PLDM FW package at once or updating specific firmware components by name. Flash the entire image: devlink dev flash pci/0000:b5:00.0 file firmware.pldmfw Flash a specific component from the PLDM FW package: devlink dev flash pci/0000:b5:00.0 \ file firmware.pldmfw component fw.cpld Per-component update uses driver-defined component names (fw.mainfw, fw.cpld, etc.). Not all components support per-component update - devlink will reject the request if the specified component cannot be updated. Assisted-by: Claude:claude-opus-4.6 Signed-off-by: Brett Creeley <brett.creeley@amd.com> Signed-off-by: Nikhil P. Rao <nikhil.rao@amd.com> --- .../device_drivers/ethernet/amd/pds_core.rst | 88 ++ drivers/net/ethernet/amd/Kconfig | 1 + drivers/net/ethernet/amd/pds_core/core.h | 30 +- drivers/net/ethernet/amd/pds_core/dev.c | 79 ++ drivers/net/ethernet/amd/pds_core/devlink.c | 2 +- drivers/net/ethernet/amd/pds_core/fw.c | 767 +++++++++++++++++- drivers/net/ethernet/amd/pds_core/main.c | 7 + include/linux/pds/pds_core_if.h | 402 +++++++++ 8 files changed, 1371 insertions(+), 5 deletions(-) diff --git a/Documentation/networking/device_drivers/ethernet/amd/pds_core.rst b/Documentation/networking/device_drivers/ethernet/amd/pds_core.rst index 9e8a16c44102..71f0222589bb 100644 --- a/Documentation/networking/device_drivers/ethernet/amd/pds_core.rst +++ b/Documentation/networking/device_drivers/ethernet/amd/pds_core.rst @@ -102,6 +102,94 @@ currently in use, and that bank will used for the next boot:: # devlink dev flash pci/0000:b5:00.0 \ file pensando/dsc_fw_1.63.0-22.tar +Firmware Management (PLDM) +========================== + +Firmware that supports PLDM can be updated using the devlink flash command +with a PLDM firmware package. The entire package can be updated at once:: + + # devlink dev flash pci/0000:b5:00.0 file firmware.pldmfw + +Individual components can also be updated by specifying the component name:: + + # devlink dev flash pci/0000:b5:00.0 \ + file firmware.pldmfw component fw.cpld + +Per-component update uses driver-defined component names (fw.mainfw, +fw.cpld, etc.). Not all components support per-component update - +devlink will reject the request if the specified component cannot +be updated. + +Info versions (PLDM) +==================== + +Firmware that supports PLDM reports component versions using driver-defined +names. The driver reports the following component versions: + +.. list-table:: devlink info versions for PLDM-capable firmware + :widths: 5 5 90 + + * - Name + - Type + - Description + * - ``fw`` + - running + - Version of firmware running on the device + * - ``fw.mainfw`` + - running, stored + - Main firmware + * - ``fw.mainfw.gold`` + - stored + - Gold (recovery) firmware + * - ``fw.bootloader`` + - running, stored + - Boot loader + * - ``fw.cpld`` + - running, stored + - CPLD + * - ``fw.secure`` + - running, stored + - Secure boot firmware + * - ``fw.fpga`` + - running, stored + - FPGA configuration + * - ``fw.suc.mainfw`` + - running, stored + - System Unit Controller main firmware + * - ``fw.suc.bootloader`` + - running, stored + - System Unit Controller bootloader + * - ``fw.uboot`` + - running, stored + - U-Boot bootloader + * - ``asic.id`` + - fixed + - The ASIC type for this device + * - ``asic.rev`` + - fixed + - The revision of the ASIC for this device + +Example output:: + + $ devlink dev info pci/0000:00:05.0 + pci/0000:00:05.0: + driver pds_core + serial_number FLM18420073 + versions: + fixed: + asic.id 0x0 + asic.rev 0x0 + running: + fw.bootloader 1.2.3 + fw.mainfw 1.3.0 + fw.cpld 3.18 + fw 1.3.0 + stored: + fw.bootloader 1.2.3 + fw.mainfw.gold 1.2.0 + fw.mainfw 1.3.0 + fw.cpld 3.18 + Health Reporters ================ diff --git a/drivers/net/ethernet/amd/Kconfig b/drivers/net/ethernet/amd/Kconfig index e35991141a1a..743e3d4b6b94 100644 --- a/drivers/net/ethernet/amd/Kconfig +++ b/drivers/net/ethernet/amd/Kconfig @@ -171,6 +171,7 @@ config PDS_CORE depends on 64BIT && PCI select AUXILIARY_BUS select NET_DEVLINK + select PLDMFW help This enables the support for the AMD/Pensando Core device family of adapters. More specific information on this driver can be diff --git a/drivers/net/ethernet/amd/pds_core/core.h b/drivers/net/ethernet/amd/pds_core/core.h index b7fe9ad73349..c686f0bbbaeb 100644 --- a/drivers/net/ethernet/amd/pds_core/core.h +++ b/drivers/net/ethernet/amd/pds_core/core.h @@ -23,6 +23,14 @@ #define PDSC_SETUP_RECOVERY false #define PDSC_SETUP_INIT true +struct pdsc_deferred_dma { + struct list_head list; + dma_addr_t dma_addr; + void *va; + size_t size; + enum dma_data_direction dir; +}; + struct pdsc_dev_bar { void __iomem *vaddr; phys_addr_t bus_addr; @@ -185,6 +193,8 @@ struct pdsc { struct mutex devcmd_lock; /* lock for dev_cmd operations */ struct mutex config_lock; /* lock for configuration operations */ spinlock_t adminq_lock; /* lock for adminq operations */ + struct list_head deferred_dma_list; + spinlock_t deferred_dma_lock; /* lock for deferred DMA list */ refcount_t adminq_refcnt; struct pds_core_dev_info_regs __iomem *info_regs; struct pds_core_dev_cmd_regs __iomem *cmd_regs; @@ -199,6 +209,8 @@ struct pdsc { u64 last_eid; struct pdsc_viftype *viftype_status; struct work_struct pci_reset_work; + + struct pds_core_component_list_info fw_components; }; /** enum pds_core_dbell_bits - bitwise composition of dbell values. @@ -281,8 +293,16 @@ bool pdsc_is_fw_running(struct pdsc *pdsc); bool pdsc_is_fw_good(struct pdsc *pdsc); int pdsc_devcmd(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, union pds_core_dev_comp *comp, int max_seconds); +int pdsc_devcmd_with_data(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, + const void *data, size_t data_len, + union pds_core_dev_comp *comp, int max_seconds); +int pdsc_devcmd_with_data_nomsg(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, + const void *data, size_t data_len, + union pds_core_dev_comp *comp, int max_seconds); int pdsc_devcmd_locked(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, union pds_core_dev_comp *comp, int max_seconds); +int pdsc_devcmd_locked_nomsg(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, + union pds_core_dev_comp *comp, int max_seconds); int pdsc_devcmd_init(struct pdsc *pdsc); int pdsc_devcmd_reset(struct pdsc *pdsc); int pdsc_dev_init(struct pdsc *pdsc); @@ -315,11 +335,19 @@ void pdsc_process_adminq(struct pdsc_qcq *qcq); void pdsc_work_thread(struct work_struct *work); irqreturn_t pdsc_adminq_isr(int irq, void *data); -int pdsc_firmware_update(struct pdsc *pdsc, const struct firmware *fw, +int pdsc_firmware_update(struct pdsc *pdsc, + struct devlink_flash_update_params *params, struct netlink_ext_ack *extack); +int pdsc_get_component_info(struct pdsc *pdsc); +const char *pdsc_fw_type_to_name(u8 type); void pdsc_fw_down(struct pdsc *pdsc); void pdsc_fw_up(struct pdsc *pdsc); void pdsc_pci_reset_thread(struct work_struct *work); +void pdsc_deferred_dma_add(struct pdsc *pdsc, struct pdsc_deferred_dma *entry, + dma_addr_t dma_addr, void *va, size_t size, + enum dma_data_direction dir); +void pdsc_deferred_dma_free(struct pdsc *pdsc); + #endif /* _PDSC_H_ */ diff --git a/drivers/net/ethernet/amd/pds_core/dev.c b/drivers/net/ethernet/amd/pds_core/dev.c index 5c0ca3d0b000..6082b28915db 100644 --- a/drivers/net/ethernet/amd/pds_core/dev.c +++ b/drivers/net/ethernet/amd/pds_core/dev.c @@ -206,15 +206,53 @@ static int __pdsc_devcmd_locked(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, else memcpy_fromio(comp, &pdsc->cmd_regs->comp, sizeof(*comp)); + if (err != -ETIMEDOUT && err != -EAGAIN) + pdsc_deferred_dma_free(pdsc); + return err; } +void pdsc_deferred_dma_add(struct pdsc *pdsc, struct pdsc_deferred_dma *entry, + dma_addr_t dma_addr, void *va, size_t size, + enum dma_data_direction dir) +{ + entry->dma_addr = dma_addr; + entry->va = va; + entry->size = size; + entry->dir = dir; + + spin_lock(&pdsc->deferred_dma_lock); + list_add_tail(&entry->list, &pdsc->deferred_dma_list); + spin_unlock(&pdsc->deferred_dma_lock); +} + +void pdsc_deferred_dma_free(struct pdsc *pdsc) +{ + struct pdsc_deferred_dma *entry, *tmp; + + spin_lock(&pdsc->deferred_dma_lock); + list_for_each_entry_safe(entry, tmp, &pdsc->deferred_dma_list, list) { + dma_unmap_single(pdsc->dev, entry->dma_addr, + entry->size, entry->dir); + kfree(entry->va); + list_del(&entry->list); + kfree(entry); + } + spin_unlock(&pdsc->deferred_dma_lock); +} + int pdsc_devcmd_locked(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, union pds_core_dev_comp *comp, int max_seconds) { return __pdsc_devcmd_locked(pdsc, cmd, comp, max_seconds, true); } +int pdsc_devcmd_locked_nomsg(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, + union pds_core_dev_comp *comp, int max_seconds) +{ + return __pdsc_devcmd_locked(pdsc, cmd, comp, max_seconds, false); +} + int pdsc_devcmd(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, union pds_core_dev_comp *comp, int max_seconds) { @@ -227,6 +265,47 @@ int pdsc_devcmd(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, return err; } +static int __pdsc_devcmd_with_data(struct pdsc *pdsc, + union pds_core_dev_cmd *cmd, + const void *data, size_t data_len, + union pds_core_dev_comp *comp, + int max_seconds, bool do_msg) +{ + int err; + + mutex_lock(&pdsc->devcmd_lock); + if (!pdsc->cmd_regs) { + err = -ENXIO; + goto unlock; + } + if (data_len > sizeof(pdsc->cmd_regs->data)) { + err = -ENOSPC; + goto unlock; + } + memcpy_toio(&pdsc->cmd_regs->data, data, data_len); + err = __pdsc_devcmd_locked(pdsc, cmd, comp, max_seconds, do_msg); +unlock: + mutex_unlock(&pdsc->devcmd_lock); + + return err; +} + +int pdsc_devcmd_with_data(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, + const void *data, size_t data_len, + union pds_core_dev_comp *comp, int max_seconds) +{ + return __pdsc_devcmd_with_data(pdsc, cmd, data, data_len, + comp, max_seconds, true); +} + +int pdsc_devcmd_with_data_nomsg(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, + const void *data, size_t data_len, + union pds_core_dev_comp *comp, int max_seconds) +{ + return __pdsc_devcmd_with_data(pdsc, cmd, data, data_len, + comp, max_seconds, false); +} + int pdsc_devcmd_init(struct pdsc *pdsc) { union pds_core_dev_comp comp = {}; diff --git a/drivers/net/ethernet/amd/pds_core/devlink.c b/drivers/net/ethernet/amd/pds_core/devlink.c index 2ea97e1c5939..3b763ee1715e 100644 --- a/drivers/net/ethernet/amd/pds_core/devlink.c +++ b/drivers/net/ethernet/amd/pds_core/devlink.c @@ -90,7 +90,7 @@ int pdsc_dl_flash_update(struct devlink *dl, { struct pdsc *pdsc = devlink_priv(dl); - return pdsc_firmware_update(pdsc, params->fw, extack); + return pdsc_firmware_update(pdsc, params, extack); } static char *fw_slotnames[] = { diff --git a/drivers/net/ethernet/amd/pds_core/fw.c b/drivers/net/ethernet/amd/pds_core/fw.c index fa626719e68d..0ef34869fdc0 100644 --- a/drivers/net/ethernet/amd/pds_core/fw.c +++ b/drivers/net/ethernet/amd/pds_core/fw.c @@ -1,6 +1,9 @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright(c) 2023 Advanced Micro Devices, Inc */ +#include <linux/pldmfw.h> +#include <linux/vmalloc.h> + #include "core.h" /* The worst case wait for the install activity is about 25 minutes when @@ -14,6 +17,46 @@ /* Number of periodic log updates during fw file download */ #define PDSC_FW_INTERVAL_FRACTION 32 +#define PDSC_FW_COMPONENT_PREFIX "fw." +#define PDSC_FW_COMPONENT_FULL_NAME_BUFLEN \ + (sizeof(PDSC_FW_COMPONENT_PREFIX) + PDS_CORE_FW_COMPONENT_NAME_BUFLEN) + +/* Driver-defined component type to name mapping */ +static const char * const pdsc_fw_type_names[] = { + [PDS_CORE_FW_TYPE_MAIN] = "mainfw", + [PDS_CORE_FW_TYPE_BOOT] = "bootloader", + [PDS_CORE_FW_TYPE_CPLD] = "cpld", + [PDS_CORE_FW_TYPE_SECURE] = "secure", + [PDS_CORE_FW_TYPE_FPGA] = "fpga", + [PDS_CORE_FW_TYPE_SUC_MAIN] = "suc.mainfw", + [PDS_CORE_FW_TYPE_SUC_BOOT] = "suc.bootloader", + [PDS_CORE_FW_TYPE_UBOOT] = "uboot", +}; + +const char *pdsc_fw_type_to_name(u8 type) +{ + if (type < ARRAY_SIZE(pdsc_fw_type_names) && pdsc_fw_type_names[type]) + return pdsc_fw_type_names[type]; + return NULL; +} + +static u8 pdsc_name_to_fw_type(const char *name) +{ + size_t prefix_len; + int i; + + prefix_len = str_has_prefix(name, PDSC_FW_COMPONENT_PREFIX); + if (prefix_len) + name += prefix_len; + + for (i = 1; i < ARRAY_SIZE(pdsc_fw_type_names); i++) { + if (pdsc_fw_type_names[i] && + !strcmp(name, pdsc_fw_type_names[i])) + return i; + } + return 0; +} + static int pdsc_devcmd_fw_download_locked(struct pdsc *pdsc, u64 addr, u32 offset, u32 length) { @@ -23,7 +66,7 @@ static int pdsc_devcmd_fw_download_locked(struct pdsc *pdsc, u64 addr, .fw_download.addr = cpu_to_le64(addr), .fw_download.length = cpu_to_le32(length), }; - union pds_core_dev_comp comp; + union pds_core_dev_comp comp = {}; return pdsc_devcmd_locked(pdsc, &cmd, &comp, pdsc->devcmd_timeout); } @@ -95,8 +138,9 @@ static int pdsc_fw_status_long_wait(struct pdsc *pdsc, return err; } -int pdsc_firmware_update(struct pdsc *pdsc, const struct firmware *fw, - struct netlink_ext_ack *extack) +static int pdsc_legacy_firmware_update(struct pdsc *pdsc, + const struct firmware *fw, + struct netlink_ext_ack *extack) { u32 buf_sz, copy_sz, offset; struct devlink *dl; @@ -195,3 +239,720 @@ int pdsc_firmware_update(struct pdsc *pdsc, const struct firmware *fw, NULL, 0, 0); return err; } + +struct pdsc_component_priv { + u16 component_id; + bool skip; + struct list_head list_entry; +}; + +struct pds_core_fwu_priv { + struct pldmfw context; + struct devlink_flash_update_params *params; + struct netlink_ext_ack *extack; + struct pdsc *pdsc; + struct list_head components; +}; + +static void pdsc_free_fwu_priv(struct pds_core_fwu_priv *priv) +{ + struct pdsc_component_priv *component_priv, *tmp; + + list_for_each_entry_safe(component_priv, tmp, &priv->components, + list_entry) { + list_del(&component_priv->list_entry); + kfree(component_priv); + } +} + +static int pdsc_devcmd_match_record_desc(struct pdsc *pdsc, u16 desc_type, + u16 desc_size, const u8 *desc_data, + u8 *match) +{ + union pds_core_dev_cmd cmd = { + .match_record_desc.opcode = PDS_CORE_CMD_MATCH_RECORD_DESC, + .match_record_desc.ver = 1, + .match_record_desc.type = cpu_to_le16(desc_type), + .match_record_desc.size = cpu_to_le16(desc_size), + }; + union pds_core_dev_comp comp = {}; + int err; + + err = pdsc_devcmd_with_data(pdsc, &cmd, desc_data, desc_size, + &comp, pdsc->devcmd_timeout); + *match = comp.match_record_desc.match; + + return err; +} + +static bool pdsc_match_record_descs(struct pldmfw *context, + struct pldmfw_record *record) +{ + struct pds_core_fwu_priv *priv = + container_of(context, struct pds_core_fwu_priv, context); + struct pdsc *pdsc = priv->pdsc; + struct pldmfw_desc_tlv *desc; + + if (!pldmfw_op_pci_match_record(context, record)) + return false; + + list_for_each_entry(desc, &record->descs, entry) { + u8 match; + int err; + + switch (desc->type) { + /* skip types checked in pldmfw_op_pci_match_record */ + case PLDM_DESC_ID_PCI_VENDOR_ID: + case PLDM_DESC_ID_PCI_DEVICE_ID: + case PLDM_DESC_ID_PCI_SUBVENDOR_ID: + case PLDM_DESC_ID_PCI_SUBDEV_ID: + continue; + } + + if (!desc->size) + return false; + + err = pdsc_devcmd_match_record_desc(pdsc, desc->type, + desc->size, desc->data, + &match); + if (err) { + dev_err(pdsc->dev, + "match_record_desc failed type: 0x%04x size: %u, err %d\n", + desc->type, desc->size, err); + return false; + } + /* all record descriptors must match */ + if (!match) + return false; + } + + return true; +} + +static int pdsc_devcmd_send_package_data(struct pdsc *pdsc, u64 addr, + u16 length, u16 offset, u16 total_len) +{ + union pds_core_dev_cmd cmd = { + .send_pkg_data.opcode = PDS_CORE_CMD_SEND_PKG_DATA, + .send_pkg_data.ver = 1, + .send_pkg_data.data_pa = cpu_to_le64(addr), + .send_pkg_data.data_len = cpu_to_le16(length), + .send_pkg_data.offset = cpu_to_le16(offset), + .send_pkg_data.total_len = cpu_to_le16(total_len), + }; + union pds_core_dev_comp comp = {}; + + return pdsc_devcmd(pdsc, &cmd, &comp, pdsc->devcmd_timeout); +} + +static int pdsc_send_package_data(struct pldmfw *context, const u8 *data, + u16 length) +{ + struct pds_core_fwu_priv *priv = + container_of(context, struct pds_core_fwu_priv, context); + struct pdsc_deferred_dma *deferred; + struct device *dev = context->dev; + struct pdsc *pdsc = priv->pdsc; + dma_addr_t dma_addr; + u8 *package_data; + u32 offset; + int err; + + if (!length) + return 0; + + deferred = kmalloc_obj(*deferred, GFP_KERNEL); + if (!deferred) + return -ENOMEM; + + package_data = kmemdup(data, length, GFP_KERNEL); + if (!package_data) { + kfree(deferred); + return -ENOMEM; + } + + dma_addr = dma_map_single(dev, package_data, length, DMA_TO_DEVICE); + if (dma_mapping_error(dev, dma_addr)) { + dev_err(dev, "Failed to dma_map package_data length 0x%x\n", + length); + kfree(package_data); + kfree(deferred); + return -ENOMEM; + } + + for (offset = 0; offset < length; offset += PDS_PAGE_SIZE) { + u32 copy_sz; + + copy_sz = min_t(unsigned int, PDS_PAGE_SIZE, length - offset); + err = pdsc_devcmd_send_package_data(pdsc, dma_addr + offset, + copy_sz, offset, length); + if (err) { + dev_err(dev, + "send_package_data failed off 0x%x len 0x%x: %pe\n", + offset, copy_sz, ERR_PTR(err)); + break; + } + } + + if (err == -ETIMEDOUT || err == -EAGAIN) { + pdsc_deferred_dma_add(pdsc, deferred, dma_addr, + package_data, length, DMA_TO_DEVICE); + return err; + } + + kfree(deferred); + dma_unmap_single(dev, dma_addr, length, DMA_TO_DEVICE); + kfree(package_data); + return err; +} + +static bool pdsc_component_type_exists(struct pdsc *pdsc, u8 type) +{ + int i; + + for (i = 0; i < pdsc->fw_components.num_components; i++) { + if (pdsc->fw_components.info[i].component_type == type) + return true; + } + return false; +} + +static u8 pdsc_get_component_type_by_id(struct pdsc *pdsc, u16 component_id) +{ + int i; + + for (i = 0; i < pdsc->fw_components.num_components; i++) { + struct pds_core_fw_component_info *info = + &pdsc->fw_components.info[i]; + + if (info->identifier == component_id) + return info->component_type; + } + return 0; +} + +static bool pdsc_component_id_matches_type(struct pdsc *pdsc, + u8 component_id, u8 type) +{ + int i; + + for (i = 0; i < pdsc->fw_components.num_components; i++) { + struct pds_core_fw_component_info *info = + &pdsc->fw_components.info[i]; + + if (info->identifier == component_id && + info->component_type == type) + return true; + } + return false; +} + +static bool pdsc_skip_component(struct pds_core_fwu_priv *priv, + u16 component_id) +{ + struct pdsc_component_priv *component_priv; + + list_for_each_entry(component_priv, &priv->components, list_entry) { + if (component_priv->component_id == component_id) + return component_priv->skip; + } + + return false; +} + +static int pdsc_send_component_table(struct pldmfw *context, + struct pldmfw_component *component, + u8 transfer_flag) +{ + struct pds_core_fwu_priv *priv = + container_of(context, struct pds_core_fwu_priv, context); + struct pds_core_component_tbl *component_tbl; + struct pdsc_component_priv *component_priv; + struct device *dev = context->dev; + union pds_core_dev_comp comp = {}; + union pds_core_dev_cmd cmd = {}; + struct pdsc *pdsc = priv->pdsc; + bool skip_component = false; + u8 requested_type = 0; + u16 buf_sz, tbl_sz; + int err = 0; + + dev_dbg(dev, + "component name %s classification %u id %u activation_method %u ver_len %d ver_str %.*s index %u size %u transfer_flag 0x%02x\n", + priv->params->component, component->classification, + component->identifier, component->activation_method, + component->version_len, component->version_len, + component->version_string, component->index, + component->component_size, transfer_flag); + + component_priv = kzalloc_obj(*component_priv, GFP_KERNEL); + if (!component_priv) + return -ENOMEM; + + if (priv->params->component) { + requested_type = pdsc_name_to_fw_type(priv->params->component); + if (component->identifier > U8_MAX || + !pdsc_component_id_matches_type(pdsc, + component->identifier, + requested_type)) { + skip_component = true; + goto add_component_priv; + } + } + + buf_sz = sizeof(pdsc->cmd_regs->data); + tbl_sz = struct_size(component_tbl, version_str, + component->version_len); + if (tbl_sz > buf_sz) { + dev_err(dev, "component_tbl size %d too big, max size: %d\n", + tbl_sz, buf_sz); + err = -ENOSPC; + goto free_component_priv; + } + component_tbl = kzalloc(tbl_sz, GFP_KERNEL); + if (!component_tbl) { + err = -ENOMEM; + goto free_component_priv; + } + + component_tbl->comparison_stamp = + cpu_to_le32(component->comparison_stamp); + component_tbl->classification = cpu_to_le16(component->classification); + component_tbl->identifier = cpu_to_le16(component->identifier); + component_tbl->transfer_flag = transfer_flag; + component_tbl->version_str_type = component->version_type; + component_tbl->version_str_len = component->version_len; + memcpy(component_tbl->version_str, component->version_string, + component->version_len); + + cmd.send_component_tbl.opcode = PDS_CORE_CMD_SEND_COMPONENT_TBL; + cmd.send_component_tbl.ver = 1; + cmd.send_component_tbl.slot_id = PDS_CORE_FW_SLOT_INVALID; + + err = pdsc_devcmd_with_data(pdsc, &cmd, component_tbl, tbl_sz, + &comp, pdsc->devcmd_timeout); + kfree(component_tbl); + if (err) { + dev_err(dev, "Failed sending component table: %pe\n", + ERR_PTR(err)); + goto free_component_priv; + } + + if (comp.send_component_tbl.response == 1 && + comp.send_component_tbl.response_code == + PDS_CORE_COMPONENT_PREREQS_NOT_MET) + skip_component = true; + +add_component_priv: + component_priv->skip = skip_component; + component_priv->component_id = component->identifier; + list_add(&component_priv->list_entry, &priv->components); + + return 0; + +free_component_priv: + kfree(component_priv); + return err; +} + +int pdsc_get_component_info(struct pdsc *pdsc) +{ + union pds_core_dev_cmd cmd = { + .get_component_info.opcode = PDS_CORE_CMD_GET_COMPONENT_INFO, + .get_component_info.ver = 1, + }; + struct pds_core_component_list_info *list_info; + struct pdsc_deferred_dma *deferred; + union pds_core_dev_comp comp = {}; + dma_addr_t dma_addr; + u8 num_components; + int err, i; + + deferred = kmalloc_obj(*deferred); + if (!deferred) + return -ENOMEM; + + list_info = kzalloc(PDS_PAGE_SIZE, GFP_KERNEL); + if (!list_info) { + kfree(deferred); + return -ENOMEM; + } + + dma_addr = dma_map_single(pdsc->dev, list_info, PDS_PAGE_SIZE, + DMA_FROM_DEVICE); + if (dma_mapping_error(pdsc->dev, dma_addr)) { + dev_err(pdsc->dev, + "Failed to dma_map component_list_info length %d\n", + PDS_PAGE_SIZE); + kfree(list_info); + kfree(deferred); + return -ENOMEM; + } + + cmd.get_component_info.data_len = cpu_to_le16(PDS_PAGE_SIZE); + cmd.get_component_info.data_pa = cpu_to_le64(dma_addr); + + err = pdsc_devcmd(pdsc, &cmd, &comp, pdsc->devcmd_timeout * 2); + if (err == -ETIMEDOUT || err == -EAGAIN) { + pdsc_deferred_dma_add(pdsc, deferred, dma_addr, list_info, + PDS_PAGE_SIZE, DMA_FROM_DEVICE); + return err; + } + + kfree(deferred); + dma_unmap_single(pdsc->dev, dma_addr, PDS_PAGE_SIZE, DMA_FROM_DEVICE); + if (err) + goto out; + + if (comp.get_component_info.ver == 0) { + /* Don't support backward compatibility as version 0 has + * alignment issues, so give a hint to users to update + * their firmware + */ + dev_warn_once(pdsc->dev, + "Incompatible get_component_info version %u reported by firmware\n", + comp.get_component_info.ver); + err = 0; + goto out; + } + + num_components = list_info->num_components; + if (num_components > PDS_CORE_FW_COMPONENT_LIST_LEN) { + err = -ENOMEM; + goto out; + } + + pdsc->fw_components.num_components = num_components; + for (i = 0; i < num_components; i++) { + struct pds_core_fw_component_info *info = + &pdsc->fw_components.info[i]; + + memcpy(info, &list_info->info[i], sizeof(*info)); + info->version[PDS_CORE_FW_COMPONENT_VER_BUFLEN - 1] = 0; + info->name[PDS_CORE_FW_COMPONENT_NAME_BUFLEN - 1] = 0; + } + +out: + kfree(list_info); + return err; +} + +static int pdsc_devcmd_send_component(struct pdsc *pdsc, + struct pds_core_flash_component *info, + u16 info_sz, dma_addr_t addr, u32 length, + u32 offset, u16 slot_id, + union pds_core_dev_comp *comp) +{ + union pds_core_dev_cmd cmd = { + .send_component.opcode = PDS_CORE_CMD_SEND_COMPONENT, + .send_component.ver = 1, + .send_component.operation = PDS_CORE_SEND_COMPONENT_START, + .send_component.data_pa = cpu_to_le64(addr), + .send_component.data_len = cpu_to_le32(length), + .send_component.offset = cpu_to_le32(offset), + .send_component.slot_id = slot_id, + }; + unsigned long timeout = 300 * HZ; + unsigned long start_time; + unsigned long end_time; + int err; + + start_time = jiffies; + end_time = start_time + timeout; + do { + /* prevent noisy/benign devcmd failures */ + err = pdsc_devcmd_with_data_nomsg(pdsc, &cmd, info, info_sz, + comp, 60); + if (err != -EAGAIN) + break; + + /* if required, subsequent commands check status of + * PDS_CORE_CMD_SEND_COMPONENT command, which returns + * EAGAIN while the command is still running, + * else we get the final command status. + */ + cmd.send_component.operation = PDS_CORE_SEND_COMPONENT_STATUS; + msleep(20); + } while (time_before(jiffies, end_time)); + + if (err == -EAGAIN || err == -ETIMEDOUT) + dev_err(pdsc->dev, "PDS_CORE_CMD_SEND_COMPONENT timed out\n"); + + return err; +} + +static int pdsc_flash_component_chunk(struct pdsc *pdsc, struct device *dev, + struct pds_core_flash_component *info, + u16 info_sz, const u8 *data, u16 copy_sz, + u32 offset, u8 slot_id, + union pds_core_dev_comp *comp) +{ + struct pdsc_deferred_dma *deferred; + dma_addr_t dma_addr; + u8 *component_data; + int err; + + deferred = kmalloc_obj(*deferred, GFP_KERNEL); + if (!deferred) + return -ENOMEM; + + component_data = kmemdup(data, copy_sz, GFP_KERNEL); + if (!component_data) { + kfree(deferred); + return -ENOMEM; + } + + dma_addr = dma_map_single(dev, component_data, copy_sz, DMA_TO_DEVICE); + if (dma_mapping_error(dev, dma_addr)) { + dev_err(dev, + "Failed to dma_map component_data at offset 0x%x copy_sz 0x%x\n", + offset, copy_sz); + kfree(component_data); + kfree(deferred); + return -ENOMEM; + } + + err = pdsc_devcmd_send_component(pdsc, info, info_sz, dma_addr, + copy_sz, offset, slot_id, comp); + if (err == -ETIMEDOUT || err == -EAGAIN) { + pdsc_deferred_dma_add(pdsc, deferred, dma_addr, + component_data, copy_sz, DMA_TO_DEVICE); + return err; + } + + kfree(deferred); + dma_unmap_single(dev, dma_addr, copy_sz, DMA_TO_DEVICE); + kfree(component_data); + + return err; +} + +static int pdsc_flash_component(struct pldmfw *context, + struct pldmfw_component *component) +{ + char component_name_buf[sizeof(PDSC_FW_COMPONENT_PREFIX) + 16]; + struct pds_core_fwu_priv *priv = + container_of(context, struct pds_core_fwu_priv, context); + struct pds_core_flash_component *component_info; + const char *component_name = NULL; + struct device *dev = context->dev; + struct pdsc *pdsc = priv->pdsc; + u16 buf_sz, info_sz; + struct devlink *dl; + u8 component_type; + u32 total_len; + u32 offset; + int err; + + if (pdsc_skip_component(priv, component->identifier)) + return 0; + + component_type = pdsc_get_component_type_by_id(pdsc, + component->identifier); + if (component_type) { + const char *type_name = pdsc_fw_type_to_name(component_type); + + if (type_name) { + snprintf(component_name_buf, sizeof(component_name_buf), + "%s%s", PDSC_FW_COMPONENT_PREFIX, type_name); + component_name = component_name_buf; + } + } + + total_len = component->component_size; + dev_dbg(dev, + "component name %s class %u id %u act_meth %u ver_str %.*s index %u size %u\n", + component_name ?: "(unknown)", component->classification, + component->identifier, component->activation_method, + component->version_len, component->version_string, + component->index, component->component_size); + + buf_sz = sizeof(pdsc->cmd_regs->data); + info_sz = struct_size(component_info, version_str, + component->version_len); + if (info_sz > buf_sz) { + dev_err(dev, "component_info size %d too big, max size: %d\n", + info_sz, buf_sz); + return -ENOSPC; + } + component_info = vzalloc(info_sz); + if (!component_info) + return -ENOMEM; + + component_info->comparison_stamp = + cpu_to_le32(component->comparison_stamp); + component_info->image_size = cpu_to_le32(total_len); + component_info->classification = cpu_to_le16(component->classification); + component_info->identifier = cpu_to_le16(component->identifier); + component_info->options = cpu_to_le16(component->options); + component_info->version_str_type = component->version_type; + component_info->version_str_len = component->version_len; + memcpy(component_info->version_str, component->version_string, + component->version_len); + + dl = priv_to_devlink(pdsc); + + offset = 0; + while (offset < total_len) { + union pds_core_dev_comp comp = {}; + u16 copy_sz; + + copy_sz = min_t(unsigned int, PDS_PAGE_SIZE, + total_len - offset); + + err = pdsc_flash_component_chunk(pdsc, dev, component_info, + info_sz, + component->component_data + + offset, copy_sz, offset, + PDS_CORE_FW_SLOT_INVALID, + &comp); + if (err && + comp.send_component.compat_response && + (comp.send_component.compat_response_code == + PDS_CORE_COMPONENT_STAMP_IDENTICAL || + comp.send_component.compat_response_code == + PDS_CORE_COMPONENT_STAMP_LOWER)) { + err = 0; + devlink_flash_update_status_notify(dl, "Skipped", + component_name, + 0, 0); + goto skip_component; + } + + if (err) { + dev_err(dev, + "send_component failed offset 0x%x len 0x%x: %pe\n", + offset, copy_sz, ERR_PTR(err)); + goto err_out; + } + + offset += copy_sz; + devlink_flash_update_status_notify(dl, + "Erasing/Flashing", + component_name, offset, + total_len); + } + + vfree(component_info); + return 0; + +err_out: + devlink_flash_update_status_notify(dl, + "Erasing/Flashing Component Failed", + component_name, 0, 0); +skip_component: + vfree(component_info); + return err; +} + +static int pdsc_devcmd_finalize_update(struct pdsc *pdsc) +{ + union pds_core_dev_cmd cmd = { + .finalize_update.opcode = PDS_CORE_CMD_FINALIZE_UPDATE, + .finalize_update.ver = 1, + }; + union pds_core_dev_comp comp = {}; + + return pdsc_devcmd(pdsc, &cmd, &comp, pdsc->devcmd_timeout); +} + +static int pdsc_finalize_update(struct pldmfw *context) +{ + struct pds_core_fwu_priv *priv = + container_of(context, struct pds_core_fwu_priv, context); + const char *component_name = priv->params->component; + unsigned long start_time, end_time; + struct device *dev = context->dev; + struct pdsc *pdsc = priv->pdsc; + struct devlink *dl; + int err; + + dl = priv_to_devlink(pdsc); + + start_time = jiffies; + end_time = start_time + (PDSC_FW_INSTALL_TIMEOUT * HZ); + do { + err = pdsc_devcmd_finalize_update(pdsc); + if (!err || err != -EAGAIN) + break; + + dev_dbg(dev, "retrying finalize_update: %pe\n", ERR_PTR(err)); + msleep(20); + } while (time_before(jiffies, end_time) && err == -EAGAIN); + + if (err) { + devlink_flash_update_status_notify(dl, "Finalize Update Failed", + component_name, 0, 0); + dev_err(dev, "finalize_update failed: %pe\n", ERR_PTR(err)); + return err; + } + + devlink_flash_update_status_notify(dl, "Finalized Update", + component_name, 0, 0); + return 0; +} + +static const struct pldmfw_ops pdsc_pldmfw_ops = { + .match_record = pdsc_match_record_descs, + .send_package_data = pdsc_send_package_data, + .send_component_table = pdsc_send_component_table, + .flash_component = pdsc_flash_component, + .finalize_update = pdsc_finalize_update +}; + +static int pdsc_pldm_firmware_update(struct pdsc *pdsc, + struct devlink_flash_update_params *params, + struct netlink_ext_ack *extack, + const struct firmware *fw) +{ + struct pds_core_fwu_priv priv = {}; + int err; + + if (!pdsc->fw_components.num_components) { + err = pdsc_get_component_info(pdsc); + if (err) { + dev_err(pdsc->dev, + "Failed to get component info: %pe\n", + ERR_PTR(err)); + return err; + } + } + + if (params->component) { + u8 type = pdsc_name_to_fw_type(params->component); + + if (!type || !pdsc_component_type_exists(pdsc, type)) + return -ENOENT; + } + + INIT_LIST_HEAD(&priv.components); + priv.context.ops = &pdsc_pldmfw_ops; + priv.context.dev = pdsc->dev; + priv.params = params; + priv.pdsc = pdsc; + + err = pldmfw_flash_image(&priv.context, fw); + pdsc_free_fwu_priv(&priv); + + return err; +} + +int pdsc_firmware_update(struct pdsc *pdsc, + struct devlink_flash_update_params *params, + struct netlink_ext_ack *extack) +{ + int err; + + if (pdsc->dev_ident.version >= PDS_CORE_IDENTITY_VERSION_2 && + pdsc->dev_ident.capabilities & + cpu_to_le64(PDS_CORE_DEV_CAP_PLDM_FW_UPDATE)) + err = pdsc_pldm_firmware_update(pdsc, params, extack, + params->fw); + else + err = pdsc_legacy_firmware_update(pdsc, params->fw, extack); + + /* Invalidate cached component info so next info_get refreshes */ + pdsc->fw_components.num_components = 0; + + return err; +} diff --git a/drivers/net/ethernet/amd/pds_core/main.c b/drivers/net/ethernet/amd/pds_core/main.c index 22db78343eb0..02ff5e51f617 100644 --- a/drivers/net/ethernet/amd/pds_core/main.c +++ b/drivers/net/ethernet/amd/pds_core/main.c @@ -246,6 +246,8 @@ static int pdsc_init_pf(struct pdsc *pdsc) mutex_init(&pdsc->devcmd_lock); mutex_init(&pdsc->config_lock); spin_lock_init(&pdsc->adminq_lock); + INIT_LIST_HEAD(&pdsc->deferred_dma_list); + spin_lock_init(&pdsc->deferred_dma_lock); mutex_lock(&pdsc->config_lock); set_bit(PDSC_S_FW_DEAD, &pdsc->state); @@ -311,6 +313,7 @@ static int pdsc_init_pf(struct pdsc *pdsc) destroy_workqueue(pdsc->wq); mutex_destroy(&pdsc->config_lock); mutex_destroy(&pdsc->devcmd_lock); + pdsc_deferred_dma_free(pdsc); pci_free_irq_vectors(pdsc->pdev); pdsc_unmap_bars(pdsc); err_out_release_regions: @@ -452,6 +455,8 @@ static void pdsc_remove(struct pci_dev *pdev) } pci_disable_device(pdev); + if (!pdev->is_virtfn) + pdsc_deferred_dma_free(pdsc); ida_free(&pdsc_ida, pdsc->uid); pdsc_debugfs_del_dev(pdsc); @@ -499,6 +504,8 @@ static void pdsc_reset_prepare(struct pci_dev *pdev) pci_release_regions(pdev); if (pci_is_enabled(pdev)) pci_disable_device(pdev); + if (!pdev->is_virtfn) + pdsc_deferred_dma_free(pdsc); } static void pdsc_reset_done(struct pci_dev *pdev) diff --git a/include/linux/pds/pds_core_if.h b/include/linux/pds/pds_core_if.h index 619186f26b5b..cc1f180aee55 100644 --- a/include/linux/pds/pds_core_if.h +++ b/include/linux/pds/pds_core_if.h @@ -40,6 +40,13 @@ enum pds_core_cmd_opcode { PDS_CORE_CMD_FW_DOWNLOAD = 4, PDS_CORE_CMD_FW_CONTROL = 5, + PDS_CORE_CMD_GET_COMPONENT_INFO = 6, + PDS_CORE_CMD_SEND_PKG_DATA = 7, + PDS_CORE_CMD_SEND_COMPONENT_TBL = 8, + PDS_CORE_CMD_SEND_COMPONENT = 9, + PDS_CORE_CMD_FINALIZE_UPDATE = 10, + PDS_CORE_CMD_MATCH_RECORD_DESC = 11, + /* SR/IOV commands */ PDS_CORE_CMD_VF_GETATTR = 60, PDS_CORE_CMD_VF_SETATTR = 61, @@ -100,6 +107,14 @@ struct pds_core_drv_identity { char driver_ver_str[32]; }; +/** + * enum pds_core_dev_capability - Device capabilities + * @PDS_CORE_DEV_CAP_PLDM_FW_UPDATE: Device only supports FW update via PLDM + */ +enum pds_core_dev_capability { + PDS_CORE_DEV_CAP_PLDM_FW_UPDATE = BIT(0), +}; + #define PDS_DEV_TYPE_MAX 16 /** * struct pds_core_dev_identity - Device identity information @@ -119,6 +134,9 @@ struct pds_core_drv_identity { * value in usecs to device units using: * device units = usecs * mult / div * @vif_types: How many of each VIF device type is supported + * @max_fw_slots: Maximum number of fw slots/components + * only supported on version >= PDS_CORE_IDENTITY_VERSION_2 + * @rsvd2: Word boundary padding * @capabilities: Device capabilities * only supported on version >= PDS_CORE_IDENTITY_VERSION_2 */ @@ -133,6 +151,8 @@ struct pds_core_dev_identity { __le32 intr_coal_mult; __le32 intr_coal_div; __le16 vif_types[PDS_DEV_TYPE_MAX]; + __le16 max_fw_slots; + u8 rsvd2[6]; __le64 capabilities; }; @@ -279,11 +299,20 @@ enum pds_core_fw_control_oper { PDS_CORE_FW_GET_LIST = 7, }; +/** + * enum pds_core_fw_slot - Firmware slot identifiers + * @PDS_CORE_FW_SLOT_INVALID: Let firmware select slot based on package metadata + * @PDS_CORE_FW_SLOT_A: Primary firmware slot A + * @PDS_CORE_FW_SLOT_B: Primary firmware slot B + * @PDS_CORE_FW_SLOT_GOLD: Gold/recovery firmware slot + * @PDS_CORE_FW_SLOT_MAX: Sentinel value indicating no slot resolved + */ enum pds_core_fw_slot { PDS_CORE_FW_SLOT_INVALID = 0, PDS_CORE_FW_SLOT_A = 1, PDS_CORE_FW_SLOT_B = 2, PDS_CORE_FW_SLOT_GOLD = 3, + PDS_CORE_FW_SLOT_MAX = 0xff, }; /** @@ -450,6 +479,365 @@ struct pds_core_vf_ctrl_comp { u8 status; }; +/** + * struct pds_core_send_pkg_data_cmd - Send package data command + * @opcode: Opcode PDS_CORE_CMD_SEND_PKG_DATA + * @ver: Driver's max support version of this command + * @total_len: Total length of the package data + * @offset: Offset in the package data, non-zero if multiple commands are + * needed for sending the package data + * @data_len: Length of data stored at data_pa + * @data_pa: Data physical address for DMA to device + * + * The package data may be too large to store in a single buffer, so multiple + * PDS_CORE_CMD_SEND_PKG_DATA devcmds may be needed. + */ +struct pds_core_send_pkg_data_cmd { + u8 opcode; + u8 ver; + __le16 total_len; + __le16 offset; + __le16 data_len; + __le64 data_pa; +}; + +/** + * struct pds_core_send_pkg_data_comp - Send package data completion + * @status: Status of the command (enum pds_core_status_code) + * @ver: Device's max supported version of this command + * @rsvd: Word boundary padding + */ +struct pds_core_send_pkg_data_comp { + u8 status; + u8 ver; + u8 rsvd[2]; +}; + +/** + * struct pds_core_component_tbl - Component table details + * @comparison_stamp: Comparison stamp used for component version checks + * @classification: Vendor specific classification info + * @identifier: Component's ID + * @transfer_flag: Part of the component table this request represents + * @version_str_type: The types of strings used + * @version_str_len: Length of @version_str + * @version_str: Component version information + */ +struct pds_core_component_tbl { + __le32 comparison_stamp; + __le16 classification; + __le16 identifier; + u8 transfer_flag; + u8 version_str_type; + u8 version_str_len; + u8 version_str[]; +}; + +/** + * struct pds_core_send_component_tbl_cmd - Send component table command + * @opcode: Opcode PDS_CORE_CMD_SEND_COMPONENT_TBL + * @ver: Driver's max support version of this command + * @slot_id: enum pds_core_fw_slot + * @rsvd: Word boundary padding + * + * Expects to find component table info (struct pds_core_component_tbl) + * in cmd_regs->data. Driver should keep the devcmd interface locked + * while preparing the component table info. + */ +struct pds_core_send_component_tbl_cmd { + u8 opcode; + u8 ver; + u8 slot_id; + u8 rsvd; +}; + +enum pds_core_component_resp_code { + PDS_CORE_COMPONENT_VALID = 0x0, + PDS_CORE_COMPONENT_STAMP_IDENTICAL = 0x1, + PDS_CORE_COMPONENT_STAMP_LOWER = 0x2, + PDS_CORE_COMPONENT_STAMP_OR_VERSION_INVALID = 0x3, + PDS_CORE_COMPONENT_CONFLICT = 0x4, + PDS_CORE_COMPONENT_PREREQS_NOT_MET = 0x5, + PDS_CORE_COMPONENT_NOT_SUPPORTED = 0x6, + PDS_CORE_COMPONENT_FW_TYPE_INVALID = 0xd0, +}; + +/** + * struct pds_core_send_component_tbl_comp - Send component table completion + * @status: Status of the command (enum pds_core_status_code) + * @ver: Device's max supported version of this command + * @completion_code: Component completion code + * @response: Component response + * @response_code: Component response code + * @slot_id: Actual slot_id of the component (enum pds_core_fw_slot) + * @rsvd: Word boundary padding + */ +struct pds_core_send_component_tbl_comp { + u8 status; + u8 ver; + u8 completion_code; + u8 response; + u8 response_code; + u8 slot_id; + u8 rsvd[2]; +}; + +/** + * enum pds_core_send_component_op - PDS_CORE_CMD_SEND_COMPONENT operation + * @PDS_CORE_SEND_COMPONENT_START: Initial operation to start transfer + * @PDS_CORE_SEND_COMPONENT_STATUS: Subsequent calls to check on status + * PDS_CORE_CMD_SEND_COMPONENT + */ +enum pds_core_send_component_op { + PDS_CORE_SEND_COMPONENT_START = 0, + PDS_CORE_SEND_COMPONENT_STATUS = 1, +}; + +#define PDS_CORE_FW_COMPONENT_ID_INVALID 0xFFFF +/** + * struct pds_core_flash_component - Component details + * @comparison_stamp: Comparison stamp used for component version checks + * @image_size: Component image size + * @classification: Vendor specific classification info + * @identifier: Component's ID + * @options: Component options + * @rsvd: Word boundary padding + * @version_str_type: The types of strings used + * @version_str_len: Length of @version_str + * @version_str: Component version information + */ +struct pds_core_flash_component { + __le32 comparison_stamp; + __le32 image_size; + __le16 classification; + __le16 identifier; + __le16 options; + u8 rsvd[3]; + u8 version_str_type; + u8 version_str_len; + u8 version_str[]; +}; + +/** + * struct pds_core_send_component_cmd - Send component command + * @opcode: Opcode PDS_CORE_CMD_SEND_COMPONENT + * @ver: Driver's max supported version of this command + * @slot_id: enum pds_core_fw_slot + * @operation: enum pds_core_send_component_op + * @offset: Offset into the component, non-zero if multiple commands + * are needed for a single component + * @data_len: Length of this part of the component stored at @data_pa + * @rsvd: Word boundary padding + * @data_pa: DMA address of the component + * + * A component may be too large to store in a single buffer, so multiple + * PDS_CORE_CMD_SEND_COMPONENT devcmds may be needed. + * + * Expects to find flash component info (struct pds_core_flash_component) + * in cmd_regs->data. Driver should keep the devcmd interface locked + * while preparing and sending the flash component info. + */ +struct pds_core_send_component_cmd { + u8 opcode; + u8 ver; + u8 slot_id; + u8 operation; + __le32 offset; + __le32 data_len; + u8 rsvd[4]; + __le64 data_pa; +}; + +/** + * struct pds_core_send_component_comp - Send component completion + * @status: Status of the command (enum pds_core_status_code) + * @ver: Device's max supported version of this command + * @completion_code: Completion code + * @compat_response: Compatibility response (0 = Component can be updated) + * @compat_response_code: Compatibility response code + * @rsvd: Word boundary padding + */ +struct pds_core_send_component_comp { + u8 status; + u8 ver; + u8 completion_code; + u8 compat_response; + u8 compat_response_code; + u8 rsvd[3]; +}; + +/** + * enum pds_core_fw_component_type - Firmware component type + * @PDS_CORE_FW_TYPE_UNKNOWN: Unknown component type + * @PDS_CORE_FW_TYPE_MAIN: Main firmware + * @PDS_CORE_FW_TYPE_BOOT: Boot loader + * @PDS_CORE_FW_TYPE_CPLD: CPLD firmware + * @PDS_CORE_FW_TYPE_SECURE: Secure firmware + * @PDS_CORE_FW_TYPE_FPGA: FPGA configuration + * @PDS_CORE_FW_TYPE_SUC_MAIN: System Unit Controller firmware + * @PDS_CORE_FW_TYPE_SUC_BOOT: System Unit Controller bootloader + * @PDS_CORE_FW_TYPE_UBOOT: U-Boot bootloader + * + * Gold/recovery variants are identified by slot_id == PDS_CORE_FW_SLOT_GOLD + * and reported with a ".gold" suffix (e.g., fw.mainfw.gold). + */ +enum pds_core_fw_component_type { + PDS_CORE_FW_TYPE_UNKNOWN = 0, + PDS_CORE_FW_TYPE_MAIN = 1, + PDS_CORE_FW_TYPE_BOOT = 2, + PDS_CORE_FW_TYPE_CPLD = 3, + PDS_CORE_FW_TYPE_SECURE = 4, + PDS_CORE_FW_TYPE_FPGA = 5, + PDS_CORE_FW_TYPE_SUC_MAIN = 6, + PDS_CORE_FW_TYPE_SUC_BOOT = 7, + PDS_CORE_FW_TYPE_UBOOT = 8, +}; + +/** + * enum pds_core_component_info_flags - Component info flags + * @PDS_CORE_FW_COMPONENT_INFO_F_RUNNING: Component is currently running + * @PDS_CORE_FW_COMPONENT_INFO_F_STARTUP: Component version on next FW boot + * @PDS_CORE_FW_COMPONENT_INFO_F_FIXED: Component is fixed and cannot be updated + * @PDS_CORE_FW_COMPONENT_INFO_F_UPDATE_BY_NAME: Component can be updated + * by name + */ +enum pds_core_component_info_flags { + PDS_CORE_FW_COMPONENT_INFO_F_RUNNING = BIT(0), + PDS_CORE_FW_COMPONENT_INFO_F_STARTUP = BIT(1), + PDS_CORE_FW_COMPONENT_INFO_F_FIXED = BIT(2), + PDS_CORE_FW_COMPONENT_INFO_F_UPDATE_BY_NAME = BIT(3), +}; + +/** + * struct pds_core_fw_component_info - GET_COMPONENT_INFO entry + * @name: Component's name + * @component_type: enum pds_core_fw_component_type + * @rsvd: Word boundary padding + * @flags: enum pds_core_component_info_flags + * @identifier: Component's identifier + * @slot_id: Component's slot identifier + * @version: Component's version + */ +struct pds_core_fw_component_info { +#define PDS_CORE_FW_COMPONENT_NAME_BUFLEN 24 + char name[PDS_CORE_FW_COMPONENT_NAME_BUFLEN]; + u8 component_type; + u8 rsvd[3]; + __le16 flags; + u8 identifier; + u8 slot_id; +#define PDS_CORE_FW_COMPONENT_VER_BUFLEN 32 + char version[PDS_CORE_FW_COMPONENT_VER_BUFLEN]; +}; + +#define PDS_CORE_FW_COMPONENT_LIST_LEN ((PDS_PAGE_SIZE - 8) / \ + sizeof(struct pds_core_fw_component_info)) + +/** + * struct pds_core_component_list_info - GET_COMPONENT_INFO completion data + * @num_components: Number of valid components + * @rsvd: Word boundary padding + * @info: List of valid components + */ +struct pds_core_component_list_info { + u8 num_components; + u8 rsvd[7]; + struct pds_core_fw_component_info info[PDS_CORE_FW_COMPONENT_LIST_LEN]; +}; + +/** + * struct pds_core_get_component_info_cmd - GET_COMPONENT_INFO command + * @opcode: PDS_CORE_CMD_GET_COMPONENT_INFO + * @ver: Driver's max supported version of this command + * @data_len: Length of data at data_pa + * @rsvd: Word boundary padding + * @data_pa: DMA address of data + * + * FW populates struct pds_core_component_list_info pointed to by @data_pa + */ +struct pds_core_get_component_info_cmd { + u8 opcode; + u8 ver; + __le16 data_len; + u8 rsvd[4]; + __le64 data_pa; +}; + +/** + * struct pds_core_get_component_info_comp - GET_COMPONENT_INFO completion + * @status: enum pds_core_status_code + * @ver: Device's max supported version of this command + * @rsvd: Word boundary padding + */ +struct pds_core_get_component_info_comp { + u8 status; + u8 ver; + u8 rsvd[2]; +}; + +/** + * struct pds_core_finalize_update_cmd - FINALIZE_UPDATE command + * @opcode: PDS_CORE_CMD_FINALIZE_UPDATE + * @ver: Driver's max support version of this command + * @rsvd: Word boundary padding + * + * Driver sends at the end of updating all components to finalize the update + */ +struct pds_core_finalize_update_cmd { + u8 opcode; + u8 ver; + u8 rsvd[2]; +}; + +/** + * struct pds_core_finalize_update_comp - FINALIZE_UPDATE completion + * @status: enum pds_core_status_code + * @ver: Device's max supported version of this command + * @rsvd: Word boundary padding + */ +struct pds_core_finalize_update_comp { + u8 status; + u8 ver; + u8 rsvd[2]; +}; + +/** + * struct pds_core_match_record_desc_cmd - MATCH_RECORD_DESC command + * @opcode: PDS_CORE_CMD_MATCH_RECORD_DESC + * @ver: Driver's max supported version of this command + * @type: PLDM Descriptor Identifier Type + * @size: Length of the Descriptor Identifier Value + * @rsvd: Word boundary padding + * + * Expects to find the Descriptor Identifier Data in cmd_regs->data. Driver + * should keep the devcmd interface locked while preparing and sending this + * command. + */ +struct pds_core_match_record_desc_cmd { + u8 opcode; + u8 ver; + __le16 type; + __le16 size; + u8 rsvd[2]; +}; + +/** + * struct pds_core_match_record_desc_comp - MATCH_RECORD_DESC completion + * @status: enum pds_core_status_code + * @ver: Device's max supported version of this command + * @match: Whether or not the Record Descriptor matches the device + * @rsvd: Word boundary padding + * + * When status is PDS_RC_SUCCESS, then @match is valid, otherwise it's + * undefined. + */ +struct pds_core_match_record_desc_comp { + u8 status; + u8 ver; + u8 match; + u8 rsvd; +}; + /* * union pds_core_dev_cmd - Overlay of core device command structures */ @@ -466,6 +854,13 @@ union pds_core_dev_cmd { struct pds_core_vf_setattr_cmd vf_setattr; struct pds_core_vf_getattr_cmd vf_getattr; struct pds_core_vf_ctrl_cmd vf_ctrl; + + struct pds_core_get_component_info_cmd get_component_info; + struct pds_core_send_pkg_data_cmd send_pkg_data; + struct pds_core_send_component_tbl_cmd send_component_tbl; + struct pds_core_send_component_cmd send_component; + struct pds_core_finalize_update_cmd finalize_update; + struct pds_core_match_record_desc_cmd match_record_desc; }; /* @@ -484,6 +879,13 @@ union pds_core_dev_comp { struct pds_core_vf_setattr_comp vf_setattr; struct pds_core_vf_getattr_comp vf_getattr; struct pds_core_vf_ctrl_comp vf_ctrl; + + struct pds_core_get_component_info_comp get_component_info; + struct pds_core_send_pkg_data_comp send_pkg_data; + struct pds_core_send_component_tbl_comp send_component_tbl; + struct pds_core_send_component_comp send_component; + struct pds_core_finalize_update_comp finalize_update; + struct pds_core_match_record_desc_comp match_record_desc; }; /** -- 2.43.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v3 3/6] pds_core: add PLDM firmware update support via devlink flash 2026-06-08 22:32 ` [PATCH v3 3/6] pds_core: add PLDM firmware update support via devlink flash Nikhil P. Rao @ 2026-06-08 22:53 ` Jacob Keller 0 siblings, 0 replies; 8+ messages in thread From: Jacob Keller @ 2026-06-08 22:53 UTC (permalink / raw) To: Nikhil P. Rao, netdev Cc: Brett Creeley, Andrew Lunn, David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, linux-kernel, Eric Joyner On 6/8/2026 3:32 PM, Nikhil P. Rao wrote: > From: Brett Creeley <brett.creeley@amd.com> > > Implement PLDM FW Update in the pds_core driver using the upstream > pldmfw API. This allows updating an entire PLDM FW package at once > or updating specific firmware components by name. > > Flash the entire image: > devlink dev flash pci/0000:b5:00.0 file firmware.pldmfw > > Flash a specific component from the PLDM FW package: > devlink dev flash pci/0000:b5:00.0 \ > file firmware.pldmfw component fw.cpld > > Per-component update uses driver-defined component names (fw.mainfw, > fw.cpld, etc.). Not all components support per-component update - > devlink will reject the request if the specified component cannot > be updated. > pldmfw usage looks good to me. I'm pleased to see this being useful beyond just Intel drivers! And quite glad that it seems robust enough to not require additional changes. Reviewed-by: Jacob Keller <jacob.e.keller@intel.com> > Assisted-by: Claude:claude-opus-4.6 > Signed-off-by: Brett Creeley <brett.creeley@amd.com> > Signed-off-by: Nikhil P. Rao <nikhil.rao@amd.com> > --- > .../device_drivers/ethernet/amd/pds_core.rst | 88 ++ > drivers/net/ethernet/amd/Kconfig | 1 + > drivers/net/ethernet/amd/pds_core/core.h | 30 +- > drivers/net/ethernet/amd/pds_core/dev.c | 79 ++ > drivers/net/ethernet/amd/pds_core/devlink.c | 2 +- > drivers/net/ethernet/amd/pds_core/fw.c | 767 +++++++++++++++++- > drivers/net/ethernet/amd/pds_core/main.c | 7 + > include/linux/pds/pds_core_if.h | 402 +++++++++ > 8 files changed, 1371 insertions(+), 5 deletions(-) > > diff --git a/Documentation/networking/device_drivers/ethernet/amd/pds_core.rst b/Documentation/networking/device_drivers/ethernet/amd/pds_core.rst > index 9e8a16c44102..71f0222589bb 100644 > --- a/Documentation/networking/device_drivers/ethernet/amd/pds_core.rst > +++ b/Documentation/networking/device_drivers/ethernet/amd/pds_core.rst > @@ -102,6 +102,94 @@ currently in use, and that bank will used for the next boot:: > # devlink dev flash pci/0000:b5:00.0 \ > file pensando/dsc_fw_1.63.0-22.tar > > +Firmware Management (PLDM) > +========================== > + > +Firmware that supports PLDM can be updated using the devlink flash command > +with a PLDM firmware package. The entire package can be updated at once:: > + > + # devlink dev flash pci/0000:b5:00.0 file firmware.pldmfw > + > +Individual components can also be updated by specifying the component name:: > + > + # devlink dev flash pci/0000:b5:00.0 \ > + file firmware.pldmfw component fw.cpld > + > +Per-component update uses driver-defined component names (fw.mainfw, > +fw.cpld, etc.). Not all components support per-component update - > +devlink will reject the request if the specified component cannot > +be updated. > + > +Info versions (PLDM) > +==================== > + > +Firmware that supports PLDM reports component versions using driver-defined > +names. The driver reports the following component versions: > + > +.. list-table:: devlink info versions for PLDM-capable firmware > + :widths: 5 5 90 > + > + * - Name > + - Type > + - Description > + * - ``fw`` > + - running > + - Version of firmware running on the device > + * - ``fw.mainfw`` > + - running, stored > + - Main firmware > + * - ``fw.mainfw.gold`` > + - stored > + - Gold (recovery) firmware > + * - ``fw.bootloader`` > + - running, stored > + - Boot loader > + * - ``fw.cpld`` > + - running, stored > + - CPLD > + * - ``fw.secure`` > + - running, stored > + - Secure boot firmware > + * - ``fw.fpga`` > + - running, stored > + - FPGA configuration > + * - ``fw.suc.mainfw`` > + - running, stored > + - System Unit Controller main firmware > + * - ``fw.suc.bootloader`` > + - running, stored > + - System Unit Controller bootloader > + * - ``fw.uboot`` > + - running, stored > + - U-Boot bootloader > + * - ``asic.id`` > + - fixed > + - The ASIC type for this device > + * - ``asic.rev`` > + - fixed > + - The revision of the ASIC for this device > + > +Example output:: > + > + $ devlink dev info pci/0000:00:05.0 > + pci/0000:00:05.0: > + driver pds_core > + serial_number FLM18420073 > + versions: > + fixed: > + asic.id 0x0 > + asic.rev 0x0 > + running: > + fw.bootloader 1.2.3 > + fw.mainfw 1.3.0 > + fw.cpld 3.18 > + fw 1.3.0 > + stored: > + fw.bootloader 1.2.3 > + fw.mainfw.gold 1.2.0 > + fw.mainfw 1.3.0 > + fw.cpld 3.18 > + > Health Reporters > ================ > > diff --git a/drivers/net/ethernet/amd/Kconfig b/drivers/net/ethernet/amd/Kconfig > index e35991141a1a..743e3d4b6b94 100644 > --- a/drivers/net/ethernet/amd/Kconfig > +++ b/drivers/net/ethernet/amd/Kconfig > @@ -171,6 +171,7 @@ config PDS_CORE > depends on 64BIT && PCI > select AUXILIARY_BUS > select NET_DEVLINK > + select PLDMFW > help > This enables the support for the AMD/Pensando Core device family of > adapters. More specific information on this driver can be > diff --git a/drivers/net/ethernet/amd/pds_core/core.h b/drivers/net/ethernet/amd/pds_core/core.h > index b7fe9ad73349..c686f0bbbaeb 100644 > --- a/drivers/net/ethernet/amd/pds_core/core.h > +++ b/drivers/net/ethernet/amd/pds_core/core.h > @@ -23,6 +23,14 @@ > #define PDSC_SETUP_RECOVERY false > #define PDSC_SETUP_INIT true > > +struct pdsc_deferred_dma { > + struct list_head list; > + dma_addr_t dma_addr; > + void *va; > + size_t size; > + enum dma_data_direction dir; > +}; > + > struct pdsc_dev_bar { > void __iomem *vaddr; > phys_addr_t bus_addr; > @@ -185,6 +193,8 @@ struct pdsc { > struct mutex devcmd_lock; /* lock for dev_cmd operations */ > struct mutex config_lock; /* lock for configuration operations */ > spinlock_t adminq_lock; /* lock for adminq operations */ > + struct list_head deferred_dma_list; > + spinlock_t deferred_dma_lock; /* lock for deferred DMA list */ > refcount_t adminq_refcnt; > struct pds_core_dev_info_regs __iomem *info_regs; > struct pds_core_dev_cmd_regs __iomem *cmd_regs; > @@ -199,6 +209,8 @@ struct pdsc { > u64 last_eid; > struct pdsc_viftype *viftype_status; > struct work_struct pci_reset_work; > + > + struct pds_core_component_list_info fw_components; > }; > > /** enum pds_core_dbell_bits - bitwise composition of dbell values. > @@ -281,8 +293,16 @@ bool pdsc_is_fw_running(struct pdsc *pdsc); > bool pdsc_is_fw_good(struct pdsc *pdsc); > int pdsc_devcmd(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, > union pds_core_dev_comp *comp, int max_seconds); > +int pdsc_devcmd_with_data(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, > + const void *data, size_t data_len, > + union pds_core_dev_comp *comp, int max_seconds); > +int pdsc_devcmd_with_data_nomsg(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, > + const void *data, size_t data_len, > + union pds_core_dev_comp *comp, int max_seconds); > int pdsc_devcmd_locked(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, > union pds_core_dev_comp *comp, int max_seconds); > +int pdsc_devcmd_locked_nomsg(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, > + union pds_core_dev_comp *comp, int max_seconds); > int pdsc_devcmd_init(struct pdsc *pdsc); > int pdsc_devcmd_reset(struct pdsc *pdsc); > int pdsc_dev_init(struct pdsc *pdsc); > @@ -315,11 +335,19 @@ void pdsc_process_adminq(struct pdsc_qcq *qcq); > void pdsc_work_thread(struct work_struct *work); > irqreturn_t pdsc_adminq_isr(int irq, void *data); > > -int pdsc_firmware_update(struct pdsc *pdsc, const struct firmware *fw, > +int pdsc_firmware_update(struct pdsc *pdsc, > + struct devlink_flash_update_params *params, > struct netlink_ext_ack *extack); > +int pdsc_get_component_info(struct pdsc *pdsc); > +const char *pdsc_fw_type_to_name(u8 type); > > void pdsc_fw_down(struct pdsc *pdsc); > void pdsc_fw_up(struct pdsc *pdsc); > void pdsc_pci_reset_thread(struct work_struct *work); > > +void pdsc_deferred_dma_add(struct pdsc *pdsc, struct pdsc_deferred_dma *entry, > + dma_addr_t dma_addr, void *va, size_t size, > + enum dma_data_direction dir); > +void pdsc_deferred_dma_free(struct pdsc *pdsc); > + > #endif /* _PDSC_H_ */ > diff --git a/drivers/net/ethernet/amd/pds_core/dev.c b/drivers/net/ethernet/amd/pds_core/dev.c > index 5c0ca3d0b000..6082b28915db 100644 > --- a/drivers/net/ethernet/amd/pds_core/dev.c > +++ b/drivers/net/ethernet/amd/pds_core/dev.c > @@ -206,15 +206,53 @@ static int __pdsc_devcmd_locked(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, > else > memcpy_fromio(comp, &pdsc->cmd_regs->comp, sizeof(*comp)); > > + if (err != -ETIMEDOUT && err != -EAGAIN) > + pdsc_deferred_dma_free(pdsc); > + > return err; > } > > +void pdsc_deferred_dma_add(struct pdsc *pdsc, struct pdsc_deferred_dma *entry, > + dma_addr_t dma_addr, void *va, size_t size, > + enum dma_data_direction dir) > +{ > + entry->dma_addr = dma_addr; > + entry->va = va; > + entry->size = size; > + entry->dir = dir; > + > + spin_lock(&pdsc->deferred_dma_lock); > + list_add_tail(&entry->list, &pdsc->deferred_dma_list); > + spin_unlock(&pdsc->deferred_dma_lock); > +} > + > +void pdsc_deferred_dma_free(struct pdsc *pdsc) > +{ > + struct pdsc_deferred_dma *entry, *tmp; > + > + spin_lock(&pdsc->deferred_dma_lock); > + list_for_each_entry_safe(entry, tmp, &pdsc->deferred_dma_list, list) { > + dma_unmap_single(pdsc->dev, entry->dma_addr, > + entry->size, entry->dir); > + kfree(entry->va); > + list_del(&entry->list); > + kfree(entry); > + } > + spin_unlock(&pdsc->deferred_dma_lock); > +} > + > int pdsc_devcmd_locked(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, > union pds_core_dev_comp *comp, int max_seconds) > { > return __pdsc_devcmd_locked(pdsc, cmd, comp, max_seconds, true); > } > > +int pdsc_devcmd_locked_nomsg(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, > + union pds_core_dev_comp *comp, int max_seconds) > +{ > + return __pdsc_devcmd_locked(pdsc, cmd, comp, max_seconds, false); > +} > + > int pdsc_devcmd(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, > union pds_core_dev_comp *comp, int max_seconds) > { > @@ -227,6 +265,47 @@ int pdsc_devcmd(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, > return err; > } > > +static int __pdsc_devcmd_with_data(struct pdsc *pdsc, > + union pds_core_dev_cmd *cmd, > + const void *data, size_t data_len, > + union pds_core_dev_comp *comp, > + int max_seconds, bool do_msg) > +{ > + int err; > + > + mutex_lock(&pdsc->devcmd_lock); > + if (!pdsc->cmd_regs) { > + err = -ENXIO; > + goto unlock; > + } > + if (data_len > sizeof(pdsc->cmd_regs->data)) { > + err = -ENOSPC; > + goto unlock; > + } > + memcpy_toio(&pdsc->cmd_regs->data, data, data_len); > + err = __pdsc_devcmd_locked(pdsc, cmd, comp, max_seconds, do_msg); > +unlock: > + mutex_unlock(&pdsc->devcmd_lock); > + > + return err; > +} > + > +int pdsc_devcmd_with_data(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, > + const void *data, size_t data_len, > + union pds_core_dev_comp *comp, int max_seconds) > +{ > + return __pdsc_devcmd_with_data(pdsc, cmd, data, data_len, > + comp, max_seconds, true); > +} > + > +int pdsc_devcmd_with_data_nomsg(struct pdsc *pdsc, union pds_core_dev_cmd *cmd, > + const void *data, size_t data_len, > + union pds_core_dev_comp *comp, int max_seconds) > +{ > + return __pdsc_devcmd_with_data(pdsc, cmd, data, data_len, > + comp, max_seconds, false); > +} > + > int pdsc_devcmd_init(struct pdsc *pdsc) > { > union pds_core_dev_comp comp = {}; > diff --git a/drivers/net/ethernet/amd/pds_core/devlink.c b/drivers/net/ethernet/amd/pds_core/devlink.c > index 2ea97e1c5939..3b763ee1715e 100644 > --- a/drivers/net/ethernet/amd/pds_core/devlink.c > +++ b/drivers/net/ethernet/amd/pds_core/devlink.c > @@ -90,7 +90,7 @@ int pdsc_dl_flash_update(struct devlink *dl, > { > struct pdsc *pdsc = devlink_priv(dl); > > - return pdsc_firmware_update(pdsc, params->fw, extack); > + return pdsc_firmware_update(pdsc, params, extack); > } > > static char *fw_slotnames[] = { > diff --git a/drivers/net/ethernet/amd/pds_core/fw.c b/drivers/net/ethernet/amd/pds_core/fw.c > index fa626719e68d..0ef34869fdc0 100644 > --- a/drivers/net/ethernet/amd/pds_core/fw.c > +++ b/drivers/net/ethernet/amd/pds_core/fw.c > @@ -1,6 +1,9 @@ > // SPDX-License-Identifier: GPL-2.0 > /* Copyright(c) 2023 Advanced Micro Devices, Inc */ > > +#include <linux/pldmfw.h> > +#include <linux/vmalloc.h> > + > #include "core.h" > > /* The worst case wait for the install activity is about 25 minutes when > @@ -14,6 +17,46 @@ > /* Number of periodic log updates during fw file download */ > #define PDSC_FW_INTERVAL_FRACTION 32 > > +#define PDSC_FW_COMPONENT_PREFIX "fw." > +#define PDSC_FW_COMPONENT_FULL_NAME_BUFLEN \ > + (sizeof(PDSC_FW_COMPONENT_PREFIX) + PDS_CORE_FW_COMPONENT_NAME_BUFLEN) > + > +/* Driver-defined component type to name mapping */ > +static const char * const pdsc_fw_type_names[] = { > + [PDS_CORE_FW_TYPE_MAIN] = "mainfw", > + [PDS_CORE_FW_TYPE_BOOT] = "bootloader", > + [PDS_CORE_FW_TYPE_CPLD] = "cpld", > + [PDS_CORE_FW_TYPE_SECURE] = "secure", > + [PDS_CORE_FW_TYPE_FPGA] = "fpga", > + [PDS_CORE_FW_TYPE_SUC_MAIN] = "suc.mainfw", > + [PDS_CORE_FW_TYPE_SUC_BOOT] = "suc.bootloader", > + [PDS_CORE_FW_TYPE_UBOOT] = "uboot", > +}; > + > +const char *pdsc_fw_type_to_name(u8 type) > +{ > + if (type < ARRAY_SIZE(pdsc_fw_type_names) && pdsc_fw_type_names[type]) > + return pdsc_fw_type_names[type]; > + return NULL; > +} > + > +static u8 pdsc_name_to_fw_type(const char *name) > +{ > + size_t prefix_len; > + int i; > + > + prefix_len = str_has_prefix(name, PDSC_FW_COMPONENT_PREFIX); > + if (prefix_len) > + name += prefix_len; > + > + for (i = 1; i < ARRAY_SIZE(pdsc_fw_type_names); i++) { > + if (pdsc_fw_type_names[i] && > + !strcmp(name, pdsc_fw_type_names[i])) > + return i; > + } > + return 0; > +} > + > static int pdsc_devcmd_fw_download_locked(struct pdsc *pdsc, u64 addr, > u32 offset, u32 length) > { > @@ -23,7 +66,7 @@ static int pdsc_devcmd_fw_download_locked(struct pdsc *pdsc, u64 addr, > .fw_download.addr = cpu_to_le64(addr), > .fw_download.length = cpu_to_le32(length), > }; > - union pds_core_dev_comp comp; > + union pds_core_dev_comp comp = {}; > > return pdsc_devcmd_locked(pdsc, &cmd, &comp, pdsc->devcmd_timeout); > } > @@ -95,8 +138,9 @@ static int pdsc_fw_status_long_wait(struct pdsc *pdsc, > return err; > } > > -int pdsc_firmware_update(struct pdsc *pdsc, const struct firmware *fw, > - struct netlink_ext_ack *extack) > +static int pdsc_legacy_firmware_update(struct pdsc *pdsc, > + const struct firmware *fw, > + struct netlink_ext_ack *extack) > { > u32 buf_sz, copy_sz, offset; > struct devlink *dl; > @@ -195,3 +239,720 @@ int pdsc_firmware_update(struct pdsc *pdsc, const struct firmware *fw, > NULL, 0, 0); > return err; > } > + > +struct pdsc_component_priv { > + u16 component_id; > + bool skip; > + struct list_head list_entry; > +}; > + > +struct pds_core_fwu_priv { > + struct pldmfw context; > + struct devlink_flash_update_params *params; > + struct netlink_ext_ack *extack; > + struct pdsc *pdsc; > + struct list_head components; > +}; > + > +static void pdsc_free_fwu_priv(struct pds_core_fwu_priv *priv) > +{ > + struct pdsc_component_priv *component_priv, *tmp; > + > + list_for_each_entry_safe(component_priv, tmp, &priv->components, > + list_entry) { > + list_del(&component_priv->list_entry); > + kfree(component_priv); > + } > +} > + > +static int pdsc_devcmd_match_record_desc(struct pdsc *pdsc, u16 desc_type, > + u16 desc_size, const u8 *desc_data, > + u8 *match) > +{ > + union pds_core_dev_cmd cmd = { > + .match_record_desc.opcode = PDS_CORE_CMD_MATCH_RECORD_DESC, > + .match_record_desc.ver = 1, > + .match_record_desc.type = cpu_to_le16(desc_type), > + .match_record_desc.size = cpu_to_le16(desc_size), > + }; > + union pds_core_dev_comp comp = {}; > + int err; > + > + err = pdsc_devcmd_with_data(pdsc, &cmd, desc_data, desc_size, > + &comp, pdsc->devcmd_timeout); > + *match = comp.match_record_desc.match; > + > + return err; > +} > + > +static bool pdsc_match_record_descs(struct pldmfw *context, > + struct pldmfw_record *record) > +{ > + struct pds_core_fwu_priv *priv = > + container_of(context, struct pds_core_fwu_priv, context); > + struct pdsc *pdsc = priv->pdsc; > + struct pldmfw_desc_tlv *desc; > + > + if (!pldmfw_op_pci_match_record(context, record)) > + return false; > + > + list_for_each_entry(desc, &record->descs, entry) { > + u8 match; > + int err; > + > + switch (desc->type) { > + /* skip types checked in pldmfw_op_pci_match_record */ > + case PLDM_DESC_ID_PCI_VENDOR_ID: > + case PLDM_DESC_ID_PCI_DEVICE_ID: > + case PLDM_DESC_ID_PCI_SUBVENDOR_ID: > + case PLDM_DESC_ID_PCI_SUBDEV_ID: > + continue; > + } > + > + if (!desc->size) > + return false; > + > + err = pdsc_devcmd_match_record_desc(pdsc, desc->type, > + desc->size, desc->data, > + &match); > + if (err) { > + dev_err(pdsc->dev, > + "match_record_desc failed type: 0x%04x size: %u, err %d\n", > + desc->type, desc->size, err); > + return false; > + } > + /* all record descriptors must match */ > + if (!match) > + return false; > + } > + > + return true; > +} > + > +static int pdsc_devcmd_send_package_data(struct pdsc *pdsc, u64 addr, > + u16 length, u16 offset, u16 total_len) > +{ > + union pds_core_dev_cmd cmd = { > + .send_pkg_data.opcode = PDS_CORE_CMD_SEND_PKG_DATA, > + .send_pkg_data.ver = 1, > + .send_pkg_data.data_pa = cpu_to_le64(addr), > + .send_pkg_data.data_len = cpu_to_le16(length), > + .send_pkg_data.offset = cpu_to_le16(offset), > + .send_pkg_data.total_len = cpu_to_le16(total_len), > + }; > + union pds_core_dev_comp comp = {}; > + > + return pdsc_devcmd(pdsc, &cmd, &comp, pdsc->devcmd_timeout); > +} > + > +static int pdsc_send_package_data(struct pldmfw *context, const u8 *data, > + u16 length) > +{ > + struct pds_core_fwu_priv *priv = > + container_of(context, struct pds_core_fwu_priv, context); > + struct pdsc_deferred_dma *deferred; > + struct device *dev = context->dev; > + struct pdsc *pdsc = priv->pdsc; > + dma_addr_t dma_addr; > + u8 *package_data; > + u32 offset; > + int err; > + > + if (!length) > + return 0; > + > + deferred = kmalloc_obj(*deferred, GFP_KERNEL); > + if (!deferred) > + return -ENOMEM; > + > + package_data = kmemdup(data, length, GFP_KERNEL); > + if (!package_data) { > + kfree(deferred); > + return -ENOMEM; > + } > + > + dma_addr = dma_map_single(dev, package_data, length, DMA_TO_DEVICE); > + if (dma_mapping_error(dev, dma_addr)) { > + dev_err(dev, "Failed to dma_map package_data length 0x%x\n", > + length); > + kfree(package_data); > + kfree(deferred); > + return -ENOMEM; > + } > + > + for (offset = 0; offset < length; offset += PDS_PAGE_SIZE) { > + u32 copy_sz; > + > + copy_sz = min_t(unsigned int, PDS_PAGE_SIZE, length - offset); > + err = pdsc_devcmd_send_package_data(pdsc, dma_addr + offset, > + copy_sz, offset, length); > + if (err) { > + dev_err(dev, > + "send_package_data failed off 0x%x len 0x%x: %pe\n", > + offset, copy_sz, ERR_PTR(err)); > + break; > + } > + } > + > + if (err == -ETIMEDOUT || err == -EAGAIN) { > + pdsc_deferred_dma_add(pdsc, deferred, dma_addr, > + package_data, length, DMA_TO_DEVICE); > + return err; > + } > + > + kfree(deferred); > + dma_unmap_single(dev, dma_addr, length, DMA_TO_DEVICE); > + kfree(package_data); > + return err; > +} > + > +static bool pdsc_component_type_exists(struct pdsc *pdsc, u8 type) > +{ > + int i; > + > + for (i = 0; i < pdsc->fw_components.num_components; i++) { > + if (pdsc->fw_components.info[i].component_type == type) > + return true; > + } > + return false; > +} > + > +static u8 pdsc_get_component_type_by_id(struct pdsc *pdsc, u16 component_id) > +{ > + int i; > + > + for (i = 0; i < pdsc->fw_components.num_components; i++) { > + struct pds_core_fw_component_info *info = > + &pdsc->fw_components.info[i]; > + > + if (info->identifier == component_id) > + return info->component_type; > + } > + return 0; > +} > + > +static bool pdsc_component_id_matches_type(struct pdsc *pdsc, > + u8 component_id, u8 type) > +{ > + int i; > + > + for (i = 0; i < pdsc->fw_components.num_components; i++) { > + struct pds_core_fw_component_info *info = > + &pdsc->fw_components.info[i]; > + > + if (info->identifier == component_id && > + info->component_type == type) > + return true; > + } > + return false; > +} > + > +static bool pdsc_skip_component(struct pds_core_fwu_priv *priv, > + u16 component_id) > +{ > + struct pdsc_component_priv *component_priv; > + > + list_for_each_entry(component_priv, &priv->components, list_entry) { > + if (component_priv->component_id == component_id) > + return component_priv->skip; > + } > + > + return false; > +} > + > +static int pdsc_send_component_table(struct pldmfw *context, > + struct pldmfw_component *component, > + u8 transfer_flag) > +{ > + struct pds_core_fwu_priv *priv = > + container_of(context, struct pds_core_fwu_priv, context); > + struct pds_core_component_tbl *component_tbl; > + struct pdsc_component_priv *component_priv; > + struct device *dev = context->dev; > + union pds_core_dev_comp comp = {}; > + union pds_core_dev_cmd cmd = {}; > + struct pdsc *pdsc = priv->pdsc; > + bool skip_component = false; > + u8 requested_type = 0; > + u16 buf_sz, tbl_sz; > + int err = 0; > + > + dev_dbg(dev, > + "component name %s classification %u id %u activation_method %u ver_len %d ver_str %.*s index %u size %u transfer_flag 0x%02x\n", > + priv->params->component, component->classification, > + component->identifier, component->activation_method, > + component->version_len, component->version_len, > + component->version_string, component->index, > + component->component_size, transfer_flag); > + > + component_priv = kzalloc_obj(*component_priv, GFP_KERNEL); > + if (!component_priv) > + return -ENOMEM; > + > + if (priv->params->component) { > + requested_type = pdsc_name_to_fw_type(priv->params->component); > + if (component->identifier > U8_MAX || > + !pdsc_component_id_matches_type(pdsc, > + component->identifier, > + requested_type)) { > + skip_component = true; > + goto add_component_priv; > + } > + } > + > + buf_sz = sizeof(pdsc->cmd_regs->data); > + tbl_sz = struct_size(component_tbl, version_str, > + component->version_len); > + if (tbl_sz > buf_sz) { > + dev_err(dev, "component_tbl size %d too big, max size: %d\n", > + tbl_sz, buf_sz); > + err = -ENOSPC; > + goto free_component_priv; > + } > + component_tbl = kzalloc(tbl_sz, GFP_KERNEL); > + if (!component_tbl) { > + err = -ENOMEM; > + goto free_component_priv; > + } > + > + component_tbl->comparison_stamp = > + cpu_to_le32(component->comparison_stamp); > + component_tbl->classification = cpu_to_le16(component->classification); > + component_tbl->identifier = cpu_to_le16(component->identifier); > + component_tbl->transfer_flag = transfer_flag; > + component_tbl->version_str_type = component->version_type; > + component_tbl->version_str_len = component->version_len; > + memcpy(component_tbl->version_str, component->version_string, > + component->version_len); > + > + cmd.send_component_tbl.opcode = PDS_CORE_CMD_SEND_COMPONENT_TBL; > + cmd.send_component_tbl.ver = 1; > + cmd.send_component_tbl.slot_id = PDS_CORE_FW_SLOT_INVALID; > + > + err = pdsc_devcmd_with_data(pdsc, &cmd, component_tbl, tbl_sz, > + &comp, pdsc->devcmd_timeout); > + kfree(component_tbl); > + if (err) { > + dev_err(dev, "Failed sending component table: %pe\n", > + ERR_PTR(err)); > + goto free_component_priv; > + } > + > + if (comp.send_component_tbl.response == 1 && > + comp.send_component_tbl.response_code == > + PDS_CORE_COMPONENT_PREREQS_NOT_MET) > + skip_component = true; > + > +add_component_priv: > + component_priv->skip = skip_component; > + component_priv->component_id = component->identifier; > + list_add(&component_priv->list_entry, &priv->components); > + > + return 0; > + > +free_component_priv: > + kfree(component_priv); > + return err; > +} > + > +int pdsc_get_component_info(struct pdsc *pdsc) > +{ > + union pds_core_dev_cmd cmd = { > + .get_component_info.opcode = PDS_CORE_CMD_GET_COMPONENT_INFO, > + .get_component_info.ver = 1, > + }; > + struct pds_core_component_list_info *list_info; > + struct pdsc_deferred_dma *deferred; > + union pds_core_dev_comp comp = {}; > + dma_addr_t dma_addr; > + u8 num_components; > + int err, i; > + > + deferred = kmalloc_obj(*deferred); > + if (!deferred) > + return -ENOMEM; > + > + list_info = kzalloc(PDS_PAGE_SIZE, GFP_KERNEL); > + if (!list_info) { > + kfree(deferred); > + return -ENOMEM; > + } > + > + dma_addr = dma_map_single(pdsc->dev, list_info, PDS_PAGE_SIZE, > + DMA_FROM_DEVICE); > + if (dma_mapping_error(pdsc->dev, dma_addr)) { > + dev_err(pdsc->dev, > + "Failed to dma_map component_list_info length %d\n", > + PDS_PAGE_SIZE); > + kfree(list_info); > + kfree(deferred); > + return -ENOMEM; > + } > + > + cmd.get_component_info.data_len = cpu_to_le16(PDS_PAGE_SIZE); > + cmd.get_component_info.data_pa = cpu_to_le64(dma_addr); > + > + err = pdsc_devcmd(pdsc, &cmd, &comp, pdsc->devcmd_timeout * 2); > + if (err == -ETIMEDOUT || err == -EAGAIN) { > + pdsc_deferred_dma_add(pdsc, deferred, dma_addr, list_info, > + PDS_PAGE_SIZE, DMA_FROM_DEVICE); > + return err; > + } > + > + kfree(deferred); > + dma_unmap_single(pdsc->dev, dma_addr, PDS_PAGE_SIZE, DMA_FROM_DEVICE); > + if (err) > + goto out; > + > + if (comp.get_component_info.ver == 0) { > + /* Don't support backward compatibility as version 0 has > + * alignment issues, so give a hint to users to update > + * their firmware > + */ > + dev_warn_once(pdsc->dev, > + "Incompatible get_component_info version %u reported by firmware\n", > + comp.get_component_info.ver); > + err = 0; > + goto out; > + } > + > + num_components = list_info->num_components; > + if (num_components > PDS_CORE_FW_COMPONENT_LIST_LEN) { > + err = -ENOMEM; > + goto out; > + } > + > + pdsc->fw_components.num_components = num_components; > + for (i = 0; i < num_components; i++) { > + struct pds_core_fw_component_info *info = > + &pdsc->fw_components.info[i]; > + > + memcpy(info, &list_info->info[i], sizeof(*info)); > + info->version[PDS_CORE_FW_COMPONENT_VER_BUFLEN - 1] = 0; > + info->name[PDS_CORE_FW_COMPONENT_NAME_BUFLEN - 1] = 0; > + } > + > +out: > + kfree(list_info); > + return err; > +} > + > +static int pdsc_devcmd_send_component(struct pdsc *pdsc, > + struct pds_core_flash_component *info, > + u16 info_sz, dma_addr_t addr, u32 length, > + u32 offset, u16 slot_id, > + union pds_core_dev_comp *comp) > +{ > + union pds_core_dev_cmd cmd = { > + .send_component.opcode = PDS_CORE_CMD_SEND_COMPONENT, > + .send_component.ver = 1, > + .send_component.operation = PDS_CORE_SEND_COMPONENT_START, > + .send_component.data_pa = cpu_to_le64(addr), > + .send_component.data_len = cpu_to_le32(length), > + .send_component.offset = cpu_to_le32(offset), > + .send_component.slot_id = slot_id, > + }; > + unsigned long timeout = 300 * HZ; > + unsigned long start_time; > + unsigned long end_time; > + int err; > + > + start_time = jiffies; > + end_time = start_time + timeout; > + do { > + /* prevent noisy/benign devcmd failures */ > + err = pdsc_devcmd_with_data_nomsg(pdsc, &cmd, info, info_sz, > + comp, 60); > + if (err != -EAGAIN) > + break; > + > + /* if required, subsequent commands check status of > + * PDS_CORE_CMD_SEND_COMPONENT command, which returns > + * EAGAIN while the command is still running, > + * else we get the final command status. > + */ > + cmd.send_component.operation = PDS_CORE_SEND_COMPONENT_STATUS; > + msleep(20); > + } while (time_before(jiffies, end_time)); > + > + if (err == -EAGAIN || err == -ETIMEDOUT) > + dev_err(pdsc->dev, "PDS_CORE_CMD_SEND_COMPONENT timed out\n"); > + > + return err; > +} > + > +static int pdsc_flash_component_chunk(struct pdsc *pdsc, struct device *dev, > + struct pds_core_flash_component *info, > + u16 info_sz, const u8 *data, u16 copy_sz, > + u32 offset, u8 slot_id, > + union pds_core_dev_comp *comp) > +{ > + struct pdsc_deferred_dma *deferred; > + dma_addr_t dma_addr; > + u8 *component_data; > + int err; > + > + deferred = kmalloc_obj(*deferred, GFP_KERNEL); > + if (!deferred) > + return -ENOMEM; > + > + component_data = kmemdup(data, copy_sz, GFP_KERNEL); > + if (!component_data) { > + kfree(deferred); > + return -ENOMEM; > + } > + > + dma_addr = dma_map_single(dev, component_data, copy_sz, DMA_TO_DEVICE); > + if (dma_mapping_error(dev, dma_addr)) { > + dev_err(dev, > + "Failed to dma_map component_data at offset 0x%x copy_sz 0x%x\n", > + offset, copy_sz); > + kfree(component_data); > + kfree(deferred); > + return -ENOMEM; > + } > + > + err = pdsc_devcmd_send_component(pdsc, info, info_sz, dma_addr, > + copy_sz, offset, slot_id, comp); > + if (err == -ETIMEDOUT || err == -EAGAIN) { > + pdsc_deferred_dma_add(pdsc, deferred, dma_addr, > + component_data, copy_sz, DMA_TO_DEVICE); > + return err; > + } > + > + kfree(deferred); > + dma_unmap_single(dev, dma_addr, copy_sz, DMA_TO_DEVICE); > + kfree(component_data); > + > + return err; > +} > + > +static int pdsc_flash_component(struct pldmfw *context, > + struct pldmfw_component *component) > +{ > + char component_name_buf[sizeof(PDSC_FW_COMPONENT_PREFIX) + 16]; > + struct pds_core_fwu_priv *priv = > + container_of(context, struct pds_core_fwu_priv, context); > + struct pds_core_flash_component *component_info; > + const char *component_name = NULL; > + struct device *dev = context->dev; > + struct pdsc *pdsc = priv->pdsc; > + u16 buf_sz, info_sz; > + struct devlink *dl; > + u8 component_type; > + u32 total_len; > + u32 offset; > + int err; > + > + if (pdsc_skip_component(priv, component->identifier)) > + return 0; > + > + component_type = pdsc_get_component_type_by_id(pdsc, > + component->identifier); > + if (component_type) { > + const char *type_name = pdsc_fw_type_to_name(component_type); > + > + if (type_name) { > + snprintf(component_name_buf, sizeof(component_name_buf), > + "%s%s", PDSC_FW_COMPONENT_PREFIX, type_name); > + component_name = component_name_buf; > + } > + } > + > + total_len = component->component_size; > + dev_dbg(dev, > + "component name %s class %u id %u act_meth %u ver_str %.*s index %u size %u\n", > + component_name ?: "(unknown)", component->classification, > + component->identifier, component->activation_method, > + component->version_len, component->version_string, > + component->index, component->component_size); > + > + buf_sz = sizeof(pdsc->cmd_regs->data); > + info_sz = struct_size(component_info, version_str, > + component->version_len); > + if (info_sz > buf_sz) { > + dev_err(dev, "component_info size %d too big, max size: %d\n", > + info_sz, buf_sz); > + return -ENOSPC; > + } > + component_info = vzalloc(info_sz); > + if (!component_info) > + return -ENOMEM; > + > + component_info->comparison_stamp = > + cpu_to_le32(component->comparison_stamp); > + component_info->image_size = cpu_to_le32(total_len); > + component_info->classification = cpu_to_le16(component->classification); > + component_info->identifier = cpu_to_le16(component->identifier); > + component_info->options = cpu_to_le16(component->options); > + component_info->version_str_type = component->version_type; > + component_info->version_str_len = component->version_len; > + memcpy(component_info->version_str, component->version_string, > + component->version_len); > + > + dl = priv_to_devlink(pdsc); > + > + offset = 0; > + while (offset < total_len) { > + union pds_core_dev_comp comp = {}; > + u16 copy_sz; > + > + copy_sz = min_t(unsigned int, PDS_PAGE_SIZE, > + total_len - offset); > + > + err = pdsc_flash_component_chunk(pdsc, dev, component_info, > + info_sz, > + component->component_data + > + offset, copy_sz, offset, > + PDS_CORE_FW_SLOT_INVALID, > + &comp); > + if (err && > + comp.send_component.compat_response && > + (comp.send_component.compat_response_code == > + PDS_CORE_COMPONENT_STAMP_IDENTICAL || > + comp.send_component.compat_response_code == > + PDS_CORE_COMPONENT_STAMP_LOWER)) { > + err = 0; > + devlink_flash_update_status_notify(dl, "Skipped", > + component_name, > + 0, 0); > + goto skip_component; > + } > + > + if (err) { > + dev_err(dev, > + "send_component failed offset 0x%x len 0x%x: %pe\n", > + offset, copy_sz, ERR_PTR(err)); > + goto err_out; > + } > + > + offset += copy_sz; > + devlink_flash_update_status_notify(dl, > + "Erasing/Flashing", > + component_name, offset, > + total_len); > + } > + > + vfree(component_info); > + return 0; > + > +err_out: > + devlink_flash_update_status_notify(dl, > + "Erasing/Flashing Component Failed", > + component_name, 0, 0); > +skip_component: > + vfree(component_info); > + return err; > +} > + > +static int pdsc_devcmd_finalize_update(struct pdsc *pdsc) > +{ > + union pds_core_dev_cmd cmd = { > + .finalize_update.opcode = PDS_CORE_CMD_FINALIZE_UPDATE, > + .finalize_update.ver = 1, > + }; > + union pds_core_dev_comp comp = {}; > + > + return pdsc_devcmd(pdsc, &cmd, &comp, pdsc->devcmd_timeout); > +} > + > +static int pdsc_finalize_update(struct pldmfw *context) > +{ > + struct pds_core_fwu_priv *priv = > + container_of(context, struct pds_core_fwu_priv, context); > + const char *component_name = priv->params->component; > + unsigned long start_time, end_time; > + struct device *dev = context->dev; > + struct pdsc *pdsc = priv->pdsc; > + struct devlink *dl; > + int err; > + > + dl = priv_to_devlink(pdsc); > + > + start_time = jiffies; > + end_time = start_time + (PDSC_FW_INSTALL_TIMEOUT * HZ); > + do { > + err = pdsc_devcmd_finalize_update(pdsc); > + if (!err || err != -EAGAIN) > + break; > + > + dev_dbg(dev, "retrying finalize_update: %pe\n", ERR_PTR(err)); > + msleep(20); > + } while (time_before(jiffies, end_time) && err == -EAGAIN); > + > + if (err) { > + devlink_flash_update_status_notify(dl, "Finalize Update Failed", > + component_name, 0, 0); > + dev_err(dev, "finalize_update failed: %pe\n", ERR_PTR(err)); > + return err; > + } > + > + devlink_flash_update_status_notify(dl, "Finalized Update", > + component_name, 0, 0); > + return 0; > +} > + > +static const struct pldmfw_ops pdsc_pldmfw_ops = { > + .match_record = pdsc_match_record_descs, > + .send_package_data = pdsc_send_package_data, > + .send_component_table = pdsc_send_component_table, > + .flash_component = pdsc_flash_component, > + .finalize_update = pdsc_finalize_update > +}; > + > +static int pdsc_pldm_firmware_update(struct pdsc *pdsc, > + struct devlink_flash_update_params *params, > + struct netlink_ext_ack *extack, > + const struct firmware *fw) > +{ > + struct pds_core_fwu_priv priv = {}; > + int err; > + > + if (!pdsc->fw_components.num_components) { > + err = pdsc_get_component_info(pdsc); > + if (err) { > + dev_err(pdsc->dev, > + "Failed to get component info: %pe\n", > + ERR_PTR(err)); > + return err; > + } > + } > + > + if (params->component) { > + u8 type = pdsc_name_to_fw_type(params->component); > + > + if (!type || !pdsc_component_type_exists(pdsc, type)) > + return -ENOENT; > + } > + > + INIT_LIST_HEAD(&priv.components); > + priv.context.ops = &pdsc_pldmfw_ops; > + priv.context.dev = pdsc->dev; > + priv.params = params; > + priv.pdsc = pdsc; > + > + err = pldmfw_flash_image(&priv.context, fw); > + pdsc_free_fwu_priv(&priv); > + > + return err; > +} > + > +int pdsc_firmware_update(struct pdsc *pdsc, > + struct devlink_flash_update_params *params, > + struct netlink_ext_ack *extack) > +{ > + int err; > + > + if (pdsc->dev_ident.version >= PDS_CORE_IDENTITY_VERSION_2 && > + pdsc->dev_ident.capabilities & > + cpu_to_le64(PDS_CORE_DEV_CAP_PLDM_FW_UPDATE)) > + err = pdsc_pldm_firmware_update(pdsc, params, extack, > + params->fw); > + else > + err = pdsc_legacy_firmware_update(pdsc, params->fw, extack); > + > + /* Invalidate cached component info so next info_get refreshes */ > + pdsc->fw_components.num_components = 0; > + > + return err; > +} > diff --git a/drivers/net/ethernet/amd/pds_core/main.c b/drivers/net/ethernet/amd/pds_core/main.c > index 22db78343eb0..02ff5e51f617 100644 > --- a/drivers/net/ethernet/amd/pds_core/main.c > +++ b/drivers/net/ethernet/amd/pds_core/main.c > @@ -246,6 +246,8 @@ static int pdsc_init_pf(struct pdsc *pdsc) > mutex_init(&pdsc->devcmd_lock); > mutex_init(&pdsc->config_lock); > spin_lock_init(&pdsc->adminq_lock); > + INIT_LIST_HEAD(&pdsc->deferred_dma_list); > + spin_lock_init(&pdsc->deferred_dma_lock); > > mutex_lock(&pdsc->config_lock); > set_bit(PDSC_S_FW_DEAD, &pdsc->state); > @@ -311,6 +313,7 @@ static int pdsc_init_pf(struct pdsc *pdsc) > destroy_workqueue(pdsc->wq); > mutex_destroy(&pdsc->config_lock); > mutex_destroy(&pdsc->devcmd_lock); > + pdsc_deferred_dma_free(pdsc); > pci_free_irq_vectors(pdsc->pdev); > pdsc_unmap_bars(pdsc); > err_out_release_regions: > @@ -452,6 +455,8 @@ static void pdsc_remove(struct pci_dev *pdev) > } > > pci_disable_device(pdev); > + if (!pdev->is_virtfn) > + pdsc_deferred_dma_free(pdsc); > > ida_free(&pdsc_ida, pdsc->uid); > pdsc_debugfs_del_dev(pdsc); > @@ -499,6 +504,8 @@ static void pdsc_reset_prepare(struct pci_dev *pdev) > pci_release_regions(pdev); > if (pci_is_enabled(pdev)) > pci_disable_device(pdev); > + if (!pdev->is_virtfn) > + pdsc_deferred_dma_free(pdsc); > } > > static void pdsc_reset_done(struct pci_dev *pdev) > diff --git a/include/linux/pds/pds_core_if.h b/include/linux/pds/pds_core_if.h > index 619186f26b5b..cc1f180aee55 100644 > --- a/include/linux/pds/pds_core_if.h > +++ b/include/linux/pds/pds_core_if.h > @@ -40,6 +40,13 @@ enum pds_core_cmd_opcode { > PDS_CORE_CMD_FW_DOWNLOAD = 4, > PDS_CORE_CMD_FW_CONTROL = 5, > > + PDS_CORE_CMD_GET_COMPONENT_INFO = 6, > + PDS_CORE_CMD_SEND_PKG_DATA = 7, > + PDS_CORE_CMD_SEND_COMPONENT_TBL = 8, > + PDS_CORE_CMD_SEND_COMPONENT = 9, > + PDS_CORE_CMD_FINALIZE_UPDATE = 10, > + PDS_CORE_CMD_MATCH_RECORD_DESC = 11, > + > /* SR/IOV commands */ > PDS_CORE_CMD_VF_GETATTR = 60, > PDS_CORE_CMD_VF_SETATTR = 61, > @@ -100,6 +107,14 @@ struct pds_core_drv_identity { > char driver_ver_str[32]; > }; > > +/** > + * enum pds_core_dev_capability - Device capabilities > + * @PDS_CORE_DEV_CAP_PLDM_FW_UPDATE: Device only supports FW update via PLDM > + */ > +enum pds_core_dev_capability { > + PDS_CORE_DEV_CAP_PLDM_FW_UPDATE = BIT(0), > +}; > + > #define PDS_DEV_TYPE_MAX 16 > /** > * struct pds_core_dev_identity - Device identity information > @@ -119,6 +134,9 @@ struct pds_core_drv_identity { > * value in usecs to device units using: > * device units = usecs * mult / div > * @vif_types: How many of each VIF device type is supported > + * @max_fw_slots: Maximum number of fw slots/components > + * only supported on version >= PDS_CORE_IDENTITY_VERSION_2 > + * @rsvd2: Word boundary padding > * @capabilities: Device capabilities > * only supported on version >= PDS_CORE_IDENTITY_VERSION_2 > */ > @@ -133,6 +151,8 @@ struct pds_core_dev_identity { > __le32 intr_coal_mult; > __le32 intr_coal_div; > __le16 vif_types[PDS_DEV_TYPE_MAX]; > + __le16 max_fw_slots; > + u8 rsvd2[6]; > __le64 capabilities; > }; > > @@ -279,11 +299,20 @@ enum pds_core_fw_control_oper { > PDS_CORE_FW_GET_LIST = 7, > }; > > +/** > + * enum pds_core_fw_slot - Firmware slot identifiers > + * @PDS_CORE_FW_SLOT_INVALID: Let firmware select slot based on package metadata > + * @PDS_CORE_FW_SLOT_A: Primary firmware slot A > + * @PDS_CORE_FW_SLOT_B: Primary firmware slot B > + * @PDS_CORE_FW_SLOT_GOLD: Gold/recovery firmware slot > + * @PDS_CORE_FW_SLOT_MAX: Sentinel value indicating no slot resolved > + */ > enum pds_core_fw_slot { > PDS_CORE_FW_SLOT_INVALID = 0, > PDS_CORE_FW_SLOT_A = 1, > PDS_CORE_FW_SLOT_B = 2, > PDS_CORE_FW_SLOT_GOLD = 3, > + PDS_CORE_FW_SLOT_MAX = 0xff, > }; > > /** > @@ -450,6 +479,365 @@ struct pds_core_vf_ctrl_comp { > u8 status; > }; > > +/** > + * struct pds_core_send_pkg_data_cmd - Send package data command > + * @opcode: Opcode PDS_CORE_CMD_SEND_PKG_DATA > + * @ver: Driver's max support version of this command > + * @total_len: Total length of the package data > + * @offset: Offset in the package data, non-zero if multiple commands are > + * needed for sending the package data > + * @data_len: Length of data stored at data_pa > + * @data_pa: Data physical address for DMA to device > + * > + * The package data may be too large to store in a single buffer, so multiple > + * PDS_CORE_CMD_SEND_PKG_DATA devcmds may be needed. > + */ > +struct pds_core_send_pkg_data_cmd { > + u8 opcode; > + u8 ver; > + __le16 total_len; > + __le16 offset; > + __le16 data_len; > + __le64 data_pa; > +}; > + > +/** > + * struct pds_core_send_pkg_data_comp - Send package data completion > + * @status: Status of the command (enum pds_core_status_code) > + * @ver: Device's max supported version of this command > + * @rsvd: Word boundary padding > + */ > +struct pds_core_send_pkg_data_comp { > + u8 status; > + u8 ver; > + u8 rsvd[2]; > +}; > + > +/** > + * struct pds_core_component_tbl - Component table details > + * @comparison_stamp: Comparison stamp used for component version checks > + * @classification: Vendor specific classification info > + * @identifier: Component's ID > + * @transfer_flag: Part of the component table this request represents > + * @version_str_type: The types of strings used > + * @version_str_len: Length of @version_str > + * @version_str: Component version information > + */ > +struct pds_core_component_tbl { > + __le32 comparison_stamp; > + __le16 classification; > + __le16 identifier; > + u8 transfer_flag; > + u8 version_str_type; > + u8 version_str_len; > + u8 version_str[]; > +}; > + > +/** > + * struct pds_core_send_component_tbl_cmd - Send component table command > + * @opcode: Opcode PDS_CORE_CMD_SEND_COMPONENT_TBL > + * @ver: Driver's max support version of this command > + * @slot_id: enum pds_core_fw_slot > + * @rsvd: Word boundary padding > + * > + * Expects to find component table info (struct pds_core_component_tbl) > + * in cmd_regs->data. Driver should keep the devcmd interface locked > + * while preparing the component table info. > + */ > +struct pds_core_send_component_tbl_cmd { > + u8 opcode; > + u8 ver; > + u8 slot_id; > + u8 rsvd; > +}; > + > +enum pds_core_component_resp_code { > + PDS_CORE_COMPONENT_VALID = 0x0, > + PDS_CORE_COMPONENT_STAMP_IDENTICAL = 0x1, > + PDS_CORE_COMPONENT_STAMP_LOWER = 0x2, > + PDS_CORE_COMPONENT_STAMP_OR_VERSION_INVALID = 0x3, > + PDS_CORE_COMPONENT_CONFLICT = 0x4, > + PDS_CORE_COMPONENT_PREREQS_NOT_MET = 0x5, > + PDS_CORE_COMPONENT_NOT_SUPPORTED = 0x6, > + PDS_CORE_COMPONENT_FW_TYPE_INVALID = 0xd0, > +}; > + > +/** > + * struct pds_core_send_component_tbl_comp - Send component table completion > + * @status: Status of the command (enum pds_core_status_code) > + * @ver: Device's max supported version of this command > + * @completion_code: Component completion code > + * @response: Component response > + * @response_code: Component response code > + * @slot_id: Actual slot_id of the component (enum pds_core_fw_slot) > + * @rsvd: Word boundary padding > + */ > +struct pds_core_send_component_tbl_comp { > + u8 status; > + u8 ver; > + u8 completion_code; > + u8 response; > + u8 response_code; > + u8 slot_id; > + u8 rsvd[2]; > +}; > + > +/** > + * enum pds_core_send_component_op - PDS_CORE_CMD_SEND_COMPONENT operation > + * @PDS_CORE_SEND_COMPONENT_START: Initial operation to start transfer > + * @PDS_CORE_SEND_COMPONENT_STATUS: Subsequent calls to check on status > + * PDS_CORE_CMD_SEND_COMPONENT > + */ > +enum pds_core_send_component_op { > + PDS_CORE_SEND_COMPONENT_START = 0, > + PDS_CORE_SEND_COMPONENT_STATUS = 1, > +}; > + > +#define PDS_CORE_FW_COMPONENT_ID_INVALID 0xFFFF > +/** > + * struct pds_core_flash_component - Component details > + * @comparison_stamp: Comparison stamp used for component version checks > + * @image_size: Component image size > + * @classification: Vendor specific classification info > + * @identifier: Component's ID > + * @options: Component options > + * @rsvd: Word boundary padding > + * @version_str_type: The types of strings used > + * @version_str_len: Length of @version_str > + * @version_str: Component version information > + */ > +struct pds_core_flash_component { > + __le32 comparison_stamp; > + __le32 image_size; > + __le16 classification; > + __le16 identifier; > + __le16 options; > + u8 rsvd[3]; > + u8 version_str_type; > + u8 version_str_len; > + u8 version_str[]; > +}; > + > +/** > + * struct pds_core_send_component_cmd - Send component command > + * @opcode: Opcode PDS_CORE_CMD_SEND_COMPONENT > + * @ver: Driver's max supported version of this command > + * @slot_id: enum pds_core_fw_slot > + * @operation: enum pds_core_send_component_op > + * @offset: Offset into the component, non-zero if multiple commands > + * are needed for a single component > + * @data_len: Length of this part of the component stored at @data_pa > + * @rsvd: Word boundary padding > + * @data_pa: DMA address of the component > + * > + * A component may be too large to store in a single buffer, so multiple > + * PDS_CORE_CMD_SEND_COMPONENT devcmds may be needed. > + * > + * Expects to find flash component info (struct pds_core_flash_component) > + * in cmd_regs->data. Driver should keep the devcmd interface locked > + * while preparing and sending the flash component info. > + */ > +struct pds_core_send_component_cmd { > + u8 opcode; > + u8 ver; > + u8 slot_id; > + u8 operation; > + __le32 offset; > + __le32 data_len; > + u8 rsvd[4]; > + __le64 data_pa; > +}; > + > +/** > + * struct pds_core_send_component_comp - Send component completion > + * @status: Status of the command (enum pds_core_status_code) > + * @ver: Device's max supported version of this command > + * @completion_code: Completion code > + * @compat_response: Compatibility response (0 = Component can be updated) > + * @compat_response_code: Compatibility response code > + * @rsvd: Word boundary padding > + */ > +struct pds_core_send_component_comp { > + u8 status; > + u8 ver; > + u8 completion_code; > + u8 compat_response; > + u8 compat_response_code; > + u8 rsvd[3]; > +}; > + > +/** > + * enum pds_core_fw_component_type - Firmware component type > + * @PDS_CORE_FW_TYPE_UNKNOWN: Unknown component type > + * @PDS_CORE_FW_TYPE_MAIN: Main firmware > + * @PDS_CORE_FW_TYPE_BOOT: Boot loader > + * @PDS_CORE_FW_TYPE_CPLD: CPLD firmware > + * @PDS_CORE_FW_TYPE_SECURE: Secure firmware > + * @PDS_CORE_FW_TYPE_FPGA: FPGA configuration > + * @PDS_CORE_FW_TYPE_SUC_MAIN: System Unit Controller firmware > + * @PDS_CORE_FW_TYPE_SUC_BOOT: System Unit Controller bootloader > + * @PDS_CORE_FW_TYPE_UBOOT: U-Boot bootloader > + * > + * Gold/recovery variants are identified by slot_id == PDS_CORE_FW_SLOT_GOLD > + * and reported with a ".gold" suffix (e.g., fw.mainfw.gold). > + */ > +enum pds_core_fw_component_type { > + PDS_CORE_FW_TYPE_UNKNOWN = 0, > + PDS_CORE_FW_TYPE_MAIN = 1, > + PDS_CORE_FW_TYPE_BOOT = 2, > + PDS_CORE_FW_TYPE_CPLD = 3, > + PDS_CORE_FW_TYPE_SECURE = 4, > + PDS_CORE_FW_TYPE_FPGA = 5, > + PDS_CORE_FW_TYPE_SUC_MAIN = 6, > + PDS_CORE_FW_TYPE_SUC_BOOT = 7, > + PDS_CORE_FW_TYPE_UBOOT = 8, > +}; > + > +/** > + * enum pds_core_component_info_flags - Component info flags > + * @PDS_CORE_FW_COMPONENT_INFO_F_RUNNING: Component is currently running > + * @PDS_CORE_FW_COMPONENT_INFO_F_STARTUP: Component version on next FW boot > + * @PDS_CORE_FW_COMPONENT_INFO_F_FIXED: Component is fixed and cannot be updated > + * @PDS_CORE_FW_COMPONENT_INFO_F_UPDATE_BY_NAME: Component can be updated > + * by name > + */ > +enum pds_core_component_info_flags { > + PDS_CORE_FW_COMPONENT_INFO_F_RUNNING = BIT(0), > + PDS_CORE_FW_COMPONENT_INFO_F_STARTUP = BIT(1), > + PDS_CORE_FW_COMPONENT_INFO_F_FIXED = BIT(2), > + PDS_CORE_FW_COMPONENT_INFO_F_UPDATE_BY_NAME = BIT(3), > +}; > + > +/** > + * struct pds_core_fw_component_info - GET_COMPONENT_INFO entry > + * @name: Component's name > + * @component_type: enum pds_core_fw_component_type > + * @rsvd: Word boundary padding > + * @flags: enum pds_core_component_info_flags > + * @identifier: Component's identifier > + * @slot_id: Component's slot identifier > + * @version: Component's version > + */ > +struct pds_core_fw_component_info { > +#define PDS_CORE_FW_COMPONENT_NAME_BUFLEN 24 > + char name[PDS_CORE_FW_COMPONENT_NAME_BUFLEN]; > + u8 component_type; > + u8 rsvd[3]; > + __le16 flags; > + u8 identifier; > + u8 slot_id; > +#define PDS_CORE_FW_COMPONENT_VER_BUFLEN 32 > + char version[PDS_CORE_FW_COMPONENT_VER_BUFLEN]; > +}; > + > +#define PDS_CORE_FW_COMPONENT_LIST_LEN ((PDS_PAGE_SIZE - 8) / \ > + sizeof(struct pds_core_fw_component_info)) > + > +/** > + * struct pds_core_component_list_info - GET_COMPONENT_INFO completion data > + * @num_components: Number of valid components > + * @rsvd: Word boundary padding > + * @info: List of valid components > + */ > +struct pds_core_component_list_info { > + u8 num_components; > + u8 rsvd[7]; > + struct pds_core_fw_component_info info[PDS_CORE_FW_COMPONENT_LIST_LEN]; > +}; > + > +/** > + * struct pds_core_get_component_info_cmd - GET_COMPONENT_INFO command > + * @opcode: PDS_CORE_CMD_GET_COMPONENT_INFO > + * @ver: Driver's max supported version of this command > + * @data_len: Length of data at data_pa > + * @rsvd: Word boundary padding > + * @data_pa: DMA address of data > + * > + * FW populates struct pds_core_component_list_info pointed to by @data_pa > + */ > +struct pds_core_get_component_info_cmd { > + u8 opcode; > + u8 ver; > + __le16 data_len; > + u8 rsvd[4]; > + __le64 data_pa; > +}; > + > +/** > + * struct pds_core_get_component_info_comp - GET_COMPONENT_INFO completion > + * @status: enum pds_core_status_code > + * @ver: Device's max supported version of this command > + * @rsvd: Word boundary padding > + */ > +struct pds_core_get_component_info_comp { > + u8 status; > + u8 ver; > + u8 rsvd[2]; > +}; > + > +/** > + * struct pds_core_finalize_update_cmd - FINALIZE_UPDATE command > + * @opcode: PDS_CORE_CMD_FINALIZE_UPDATE > + * @ver: Driver's max support version of this command > + * @rsvd: Word boundary padding > + * > + * Driver sends at the end of updating all components to finalize the update > + */ > +struct pds_core_finalize_update_cmd { > + u8 opcode; > + u8 ver; > + u8 rsvd[2]; > +}; > + > +/** > + * struct pds_core_finalize_update_comp - FINALIZE_UPDATE completion > + * @status: enum pds_core_status_code > + * @ver: Device's max supported version of this command > + * @rsvd: Word boundary padding > + */ > +struct pds_core_finalize_update_comp { > + u8 status; > + u8 ver; > + u8 rsvd[2]; > +}; > + > +/** > + * struct pds_core_match_record_desc_cmd - MATCH_RECORD_DESC command > + * @opcode: PDS_CORE_CMD_MATCH_RECORD_DESC > + * @ver: Driver's max supported version of this command > + * @type: PLDM Descriptor Identifier Type > + * @size: Length of the Descriptor Identifier Value > + * @rsvd: Word boundary padding > + * > + * Expects to find the Descriptor Identifier Data in cmd_regs->data. Driver > + * should keep the devcmd interface locked while preparing and sending this > + * command. > + */ > +struct pds_core_match_record_desc_cmd { > + u8 opcode; > + u8 ver; > + __le16 type; > + __le16 size; > + u8 rsvd[2]; > +}; > + > +/** > + * struct pds_core_match_record_desc_comp - MATCH_RECORD_DESC completion > + * @status: enum pds_core_status_code > + * @ver: Device's max supported version of this command > + * @match: Whether or not the Record Descriptor matches the device > + * @rsvd: Word boundary padding > + * > + * When status is PDS_RC_SUCCESS, then @match is valid, otherwise it's > + * undefined. > + */ > +struct pds_core_match_record_desc_comp { > + u8 status; > + u8 ver; > + u8 match; > + u8 rsvd; > +}; > + > /* > * union pds_core_dev_cmd - Overlay of core device command structures > */ > @@ -466,6 +854,13 @@ union pds_core_dev_cmd { > struct pds_core_vf_setattr_cmd vf_setattr; > struct pds_core_vf_getattr_cmd vf_getattr; > struct pds_core_vf_ctrl_cmd vf_ctrl; > + > + struct pds_core_get_component_info_cmd get_component_info; > + struct pds_core_send_pkg_data_cmd send_pkg_data; > + struct pds_core_send_component_tbl_cmd send_component_tbl; > + struct pds_core_send_component_cmd send_component; > + struct pds_core_finalize_update_cmd finalize_update; > + struct pds_core_match_record_desc_cmd match_record_desc; > }; > > /* > @@ -484,6 +879,13 @@ union pds_core_dev_comp { > struct pds_core_vf_setattr_comp vf_setattr; > struct pds_core_vf_getattr_comp vf_getattr; > struct pds_core_vf_ctrl_comp vf_ctrl; > + > + struct pds_core_get_component_info_comp get_component_info; > + struct pds_core_send_pkg_data_comp send_pkg_data; > + struct pds_core_send_component_tbl_comp send_component_tbl; > + struct pds_core_send_component_comp send_component; > + struct pds_core_finalize_update_comp finalize_update; > + struct pds_core_match_record_desc_comp match_record_desc; > }; > > /** ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v3 4/6] pds_core: add PLDM component info display 2026-06-08 22:32 [PATCH net-next v3 0/6] pds_core: Add PLDM firmware update and host backed memory support Nikhil P. Rao ` (2 preceding siblings ...) 2026-06-08 22:32 ` [PATCH v3 3/6] pds_core: add PLDM firmware update support via devlink flash Nikhil P. Rao @ 2026-06-08 22:32 ` Nikhil P. Rao 2026-06-08 22:32 ` [PATCH v3 5/6] pds_core: add host backed memory support for firmware Nikhil P. Rao 2026-06-08 22:32 ` [PATCH v3 6/6] pds_core: add debugfs support for host backed memory Nikhil P. Rao 5 siblings, 0 replies; 8+ messages in thread From: Nikhil P. Rao @ 2026-06-08 22:32 UTC (permalink / raw) To: netdev Cc: Brett Creeley, Andrew Lunn, David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, linux-kernel, Eric Joyner From: Brett Creeley <brett.creeley@amd.com> Add detailed component information display via devlink info. This allows users to see individual firmware components and their versions. Components are reported as fixed, running, or stored based on their firmware-provided flags. Example output: $ devlink dev info pci/0000:00:05.0 versions: fixed: asic.id 0x0 asic.rev 0x0 running: fw.bootloader 1.2.3 fw.uboot 1.60.0-73 fw.mainfw 1.60.0-73 fw.cpld 3.18 fw 1.60.0-73 stored: fw.bootloader 1.2.3 fw.uboot 1.60.0-73 fw.uboot.gold 1.50.0-22 fw.mainfw.gold 1.50.0-22 fw.mainfw 1.60.0-73 fw.cpld 3.18 Signed-off-by: Brett Creeley <brett.creeley@amd.com> --- drivers/net/ethernet/amd/pds_core/devlink.c | 105 +++++++++++++++++++- 1 file changed, 103 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/amd/pds_core/devlink.c b/drivers/net/ethernet/amd/pds_core/devlink.c index 3b763ee1715e..4be34d0cbb59 100644 --- a/drivers/net/ethernet/amd/pds_core/devlink.c +++ b/drivers/net/ethernet/amd/pds_core/devlink.c @@ -93,14 +93,97 @@ int pdsc_dl_flash_update(struct devlink *dl, return pdsc_firmware_update(pdsc, params, extack); } +static int pdsc_dl_report_component(struct devlink_info_req *req, + struct pds_core_fw_component_info *info) +{ + enum devlink_info_version_type ver_type; + u16 flags = le16_to_cpu(info->flags); + char *ver = info->version; + const char *name; + char buf[32]; + + name = pdsc_fw_type_to_name(info->component_type); + if (!name) + return 0; + + if (info->slot_id == PDS_CORE_FW_SLOT_GOLD) + snprintf(buf, sizeof(buf), "fw.%s.gold", name); + else + snprintf(buf, sizeof(buf), "fw.%s", name); + + ver_type = DEVLINK_INFO_VERSION_TYPE_NONE; + if (flags & PDS_CORE_FW_COMPONENT_INFO_F_UPDATE_BY_NAME) + ver_type = DEVLINK_INFO_VERSION_TYPE_COMPONENT; + + if (flags & PDS_CORE_FW_COMPONENT_INFO_F_FIXED) { + int err; + + err = devlink_info_version_fixed_put(req, buf, ver); + if (err) + return err; + } + + if (flags & PDS_CORE_FW_COMPONENT_INFO_F_RUNNING) { + int err; + + err = devlink_info_version_running_put_ext(req, buf, + ver, ver_type); + if (err) + return err; + } + + if (flags & PDS_CORE_FW_COMPONENT_INFO_F_STARTUP) { + int err; + + err = devlink_info_version_stored_put_ext(req, buf, + ver, ver_type); + if (err) + return err; + } + + return 0; +} + +static int pdsc_dl_component_info_get(struct devlink *dl, + struct devlink_info_req *req, + struct netlink_ext_ack *extack) +{ + struct pds_core_component_list_info *list_info; + struct pdsc *pdsc = devlink_priv(dl); + u8 num_components; + int err; + int i; + + if (!pdsc->fw_components.num_components) { + err = pdsc_get_component_info(pdsc); + if (err) { + dev_err(pdsc->dev, "Failed to get component_info %pe\n", + ERR_PTR(err)); + return err; + } + } + + list_info = &pdsc->fw_components; + num_components = min_t(u16, list_info->num_components, + le16_to_cpu(pdsc->dev_ident.max_fw_slots)); + for (i = 0; i < num_components; i++) { + err = pdsc_dl_report_component(req, &list_info->info[i]); + if (err) + return err; + } + + return 0; +} + static char *fw_slotnames[] = { "fw.goldfw", "fw.mainfwa", "fw.mainfwb", }; -int pdsc_dl_info_get(struct devlink *dl, struct devlink_info_req *req, - struct netlink_ext_ack *extack) +static int pdsc_dl_fw_list_info_get(struct devlink *dl, + struct devlink_info_req *req, + struct netlink_ext_ack *extack) { union pds_core_dev_cmd cmd = { .fw_control.opcode = PDS_CORE_CMD_FW_CONTROL, @@ -134,6 +217,24 @@ int pdsc_dl_info_get(struct devlink *dl, struct devlink_info_req *req, return err; } + return 0; +} + +int pdsc_dl_info_get(struct devlink *dl, struct devlink_info_req *req, + struct netlink_ext_ack *extack) +{ + struct pdsc *pdsc = devlink_priv(dl); + char buf[32]; + int err; + + if (pdsc->dev_ident.version >= PDS_CORE_IDENTITY_VERSION_2) + err = pdsc_dl_component_info_get(dl, req, extack); + else + err = pdsc_dl_fw_list_info_get(dl, req, extack); + if (err) + dev_warn_once(pdsc->dev, "Failed to get component info: %pe\n", + ERR_PTR(err)); + err = devlink_info_version_running_put(req, DEVLINK_INFO_VERSION_GENERIC_FW, pdsc->dev_info.fw_version); -- 2.43.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v3 5/6] pds_core: add host backed memory support for firmware 2026-06-08 22:32 [PATCH net-next v3 0/6] pds_core: Add PLDM firmware update and host backed memory support Nikhil P. Rao ` (3 preceding siblings ...) 2026-06-08 22:32 ` [PATCH v3 4/6] pds_core: add PLDM component info display Nikhil P. Rao @ 2026-06-08 22:32 ` Nikhil P. Rao 2026-06-08 22:32 ` [PATCH v3 6/6] pds_core: add debugfs support for host backed memory Nikhil P. Rao 5 siblings, 0 replies; 8+ messages in thread From: Nikhil P. Rao @ 2026-06-08 22:32 UTC (permalink / raw) To: netdev Cc: Brett Creeley, Andrew Lunn, David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, linux-kernel, Eric Joyner, Vamsi Atluri, Nikhil P . Rao From: Vamsi Atluri <Vamsi.Atluri@amd.com> Some newer AMD/Pensando cards have minimal memory and there are cases where components, specifically in the control plane, need more memory. This series adds support for host backed DMA memory that can be used by the firmware for the previously mentioned cases. Assisted-by: Claude:claude-opus-4.6 Signed-off-by: Vamsi Atluri <Vamsi.Atluri@amd.com> Signed-off-by: Nikhil P. Rao <nikhil.rao@amd.com> --- drivers/net/ethernet/amd/pds_core/core.c | 161 +++++++++++++++++++++++ drivers/net/ethernet/amd/pds_core/core.h | 20 +++ drivers/net/ethernet/amd/pds_core/main.c | 4 +- include/linux/pds/pds_core_if.h | 64 +++++++++ 4 files changed, 248 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/amd/pds_core/core.c b/drivers/net/ethernet/amd/pds_core/core.c index 705cab7b0727..249afcd5f5d7 100644 --- a/drivers/net/ethernet/amd/pds_core/core.c +++ b/drivers/net/ethernet/amd/pds_core/core.c @@ -487,6 +487,7 @@ void pdsc_teardown(struct pdsc *pdsc, bool removing) pdsc->viftype_status = NULL; } + pdsc_host_mem_free(pdsc); pdsc_dev_uninit(pdsc); set_bit(PDSC_S_FW_DEAD, &pdsc->state); @@ -496,6 +497,7 @@ int pdsc_start(struct pdsc *pdsc) { pds_core_intr_mask(&pdsc->intr_ctrl[pdsc->adminqcq.intx], PDS_CORE_INTR_MASK_CLEAR); + pdsc_host_mem_add(pdsc); return 0; } @@ -658,3 +660,162 @@ void pdsc_health_thread(struct work_struct *work) out_unlock: mutex_unlock(&pdsc->config_lock); } + +static void pdsc_host_mem_del_one(struct pdsc *pdsc, u16 tag, u8 reason) +{ + union pds_core_dev_comp comp = {}; + union pds_core_dev_cmd cmd = { + .host_mem.opcode = PDS_CORE_CMD_HOST_MEM, + .host_mem.oper = PDS_CORE_HOST_MEM_DEL, + .host_mem.tag = cpu_to_le16(tag), + .host_mem.reason = reason, + }; + + dev_dbg(pdsc->dev, "Sending devcmd for mem del tag %d\n", tag); + pdsc_devcmd(pdsc, &cmd, &comp, pdsc->devcmd_timeout); +} + +static int pdsc_host_mem_add_one(struct pdsc *pdsc, int index) +{ + struct pdsc_host_mem *hm = &pdsc->host_mem_reqs[index]; + union pds_core_dev_comp comp = {}; + union pds_core_dev_cmd cmd = {}; + int err; + + memset(hm, 0, sizeof(*hm)); + cmd.host_mem.opcode = PDS_CORE_CMD_HOST_MEM; + cmd.host_mem.oper = PDS_CORE_HOST_MEM_QUERY; + cmd.host_mem.index = cpu_to_le16(index); + dev_dbg(pdsc->dev, "Sending devcmd for mem query index %d\n", index); + err = pdsc_devcmd(pdsc, &cmd, &comp, pdsc->devcmd_timeout); + if (err || comp.status != PDS_RC_SUCCESS) { + dev_err(pdsc->dev, "mem query failed err %d status %d\n", + err, comp.status); + return err ? err : -EIO; + } + hm->size = le32_to_cpu(comp.host_mem.size); + hm->tag = le16_to_cpu(comp.host_mem.tag); + dev_dbg(pdsc->dev, "mem query returned size %d tag %d\n", + hm->size, hm->tag); + + if (!hm->size || hm->size > PDSC_HOST_MEM_MAX_CONTIG) { + dev_err(pdsc->dev, "invalid size %d for tag %d\n", + hm->size, hm->tag); + err = -EINVAL; + goto err_del; + } + + hm->order = get_order(hm->size); + hm->pg = alloc_pages(GFP_KERNEL | __GFP_ZERO | __GFP_NOWARN, hm->order); + if (!hm->pg) { + dev_err(pdsc->dev, "alloc order %d failed for tag %d\n", + hm->order, hm->tag); + err = -ENOMEM; + goto err_del; + } + + hm->pa = dma_map_page(pdsc->dev, hm->pg, 0, hm->size, + DMA_BIDIRECTIONAL); + if (dma_mapping_error(pdsc->dev, hm->pa)) { + dev_err(pdsc->dev, "dma map failed for tag %d size %d\n", + hm->tag, hm->size); + __free_pages(hm->pg, hm->order); + hm->pg = NULL; + err = -EIO; + goto err_del; + } + + /* Track this allocation so pdsc_host_mem_free() can clean it up */ + pdsc->num_host_mem_reqs++; + + memset(&cmd, 0, sizeof(cmd)); + memset(&comp, 0, sizeof(comp)); + cmd.host_mem.opcode = PDS_CORE_CMD_HOST_MEM; + cmd.host_mem.oper = PDS_CORE_HOST_MEM_ADD; + cmd.host_mem.tag = cpu_to_le16(hm->tag); + cmd.host_mem.size = cpu_to_le32(hm->size); + cmd.host_mem.buf_pa = cpu_to_le64(hm->pa); + + dev_dbg(pdsc->dev, "Sending devcmd for mem add tag %d size %d pa %pad\n", + hm->tag, hm->size, &hm->pa); + err = pdsc_devcmd(pdsc, &cmd, &comp, pdsc->devcmd_timeout); + if (err || comp.status != PDS_RC_SUCCESS) { + dev_err(pdsc->dev, "mem add failed err %d status %d for tag %d\n", + err, comp.status, hm->tag); + err = err ? err : -EIO; + goto err_del; + } + dev_dbg(pdsc->dev, "mem add completed for tag %d\n", hm->tag); + + return 0; + +err_del: + /* After MEM_QUERY succeeds, firmware expects MEM_ADD or MEM_DEL */ + pdsc_host_mem_del_one(pdsc, hm->tag, PDS_RC_ENOMEM); + return err; +} + +void pdsc_host_mem_add(struct pdsc *pdsc) +{ + union pds_core_dev_comp comp = {}; + union pds_core_dev_cmd cmd = {}; + u16 count; + int err; + int i; + + if (!(pdsc->dev_ident.capabilities & + cpu_to_le64(PDS_CORE_DEV_CAP_HOST_MEM))) + return; + + cmd.host_mem.opcode = PDS_CORE_CMD_HOST_MEM; + cmd.host_mem.oper = PDS_CORE_HOST_MEM_GET_COUNT; + cmd.host_mem.index = cpu_to_le16(PDSC_HOST_MEM_MAX_COUNT); + cmd.host_mem.max_contig = cpu_to_le32(PDSC_HOST_MEM_MAX_CONTIG); + dev_dbg(pdsc->dev, "Sending devcmd for mem get count max_contig %u\n", + PDSC_HOST_MEM_MAX_CONTIG); + err = pdsc_devcmd(pdsc, &cmd, &comp, pdsc->devcmd_timeout); + if (err || comp.status != PDS_RC_SUCCESS) { + dev_err(pdsc->dev, "mem get count failed err %d status %d\n", + err, comp.status); + return; + } + + count = min(le16_to_cpu(comp.host_mem.count), + PDSC_HOST_MEM_MAX_COUNT); + dev_dbg(pdsc->dev, "mem get count returned count %d\n", count); + if (count == 0) + return; + + pdsc->host_mem_reqs = kzalloc_objs(*pdsc->host_mem_reqs, count, + GFP_KERNEL); + if (!pdsc->host_mem_reqs) { + dev_err(pdsc->dev, "failed to alloc host_mem_reqs array\n"); + return; + } + + for (i = 0; i < count; i++) { + err = pdsc_host_mem_add_one(pdsc, i); + if (err) + break; + } +} + +void pdsc_host_mem_free(struct pdsc *pdsc) +{ + int i; + + if (!pdsc->host_mem_reqs) + return; + + for (i = 0; i < pdsc->num_host_mem_reqs; i++) { + dma_unmap_page(pdsc->dev, pdsc->host_mem_reqs[i].pa, + pdsc->host_mem_reqs[i].size, + DMA_BIDIRECTIONAL); + __free_pages(pdsc->host_mem_reqs[i].pg, + pdsc->host_mem_reqs[i].order); + } + + kfree(pdsc->host_mem_reqs); + pdsc->host_mem_reqs = NULL; + pdsc->num_host_mem_reqs = 0; +} diff --git a/drivers/net/ethernet/amd/pds_core/core.h b/drivers/net/ethernet/amd/pds_core/core.h index c686f0bbbaeb..53e5a6f0af9c 100644 --- a/drivers/net/ethernet/amd/pds_core/core.h +++ b/drivers/net/ethernet/amd/pds_core/core.h @@ -5,6 +5,7 @@ #define _PDSC_H_ #include <linux/debugfs.h> +#include <linux/mmzone.h> #include <net/devlink.h> #include <linux/pds/pds_common.h> @@ -23,6 +24,10 @@ #define PDSC_SETUP_RECOVERY false #define PDSC_SETUP_INIT true +/* Use fixed 4MB max to avoid cpu_to_le32() truncation on large-page configs */ +#define PDSC_HOST_MEM_MAX_CONTIG (4 * 1024 * 1024) +#define PDSC_HOST_MEM_MAX_COUNT 256 + struct pdsc_deferred_dma { struct list_head list; dma_addr_t dma_addr; @@ -149,6 +154,14 @@ struct pdsc_viftype { struct pds_auxiliary_dev *padev; }; +struct pdsc_host_mem { + u32 size; + u16 tag; + u8 order; + struct page *pg; + dma_addr_t pa; +}; + /* No state flags set means we are in a steady running state */ enum pdsc_state_flags { PDSC_S_FW_DEAD, /* stopped, wait on startup or recovery */ @@ -210,6 +223,9 @@ struct pdsc { struct pdsc_viftype *viftype_status; struct work_struct pci_reset_work; + struct pdsc_host_mem *host_mem_reqs; + u16 num_host_mem_reqs; + struct pds_core_component_list_info fw_components; }; @@ -287,6 +303,7 @@ void pdsc_debugfs_add_viftype(struct pdsc *pdsc); void pdsc_debugfs_add_irqs(struct pdsc *pdsc); void pdsc_debugfs_add_qcq(struct pdsc *pdsc, struct pdsc_qcq *qcq); void pdsc_debugfs_del_qcq(struct pdsc_qcq *qcq); +void pdsc_debugfs_add_host_mem(struct pdsc *pdsc); int pdsc_err_to_errno(enum pds_core_status_code code); bool pdsc_is_fw_running(struct pdsc *pdsc); @@ -345,6 +362,9 @@ void pdsc_fw_down(struct pdsc *pdsc); void pdsc_fw_up(struct pdsc *pdsc); void pdsc_pci_reset_thread(struct work_struct *work); +void pdsc_host_mem_add(struct pdsc *pdsc); +void pdsc_host_mem_free(struct pdsc *pdsc); + void pdsc_deferred_dma_add(struct pdsc *pdsc, struct pdsc_deferred_dma *entry, dma_addr_t dma_addr, void *va, size_t size, enum dma_data_direction dir); diff --git a/drivers/net/ethernet/amd/pds_core/main.c b/drivers/net/ethernet/amd/pds_core/main.c index 02ff5e51f617..a6f327f1c1d5 100644 --- a/drivers/net/ethernet/amd/pds_core/main.c +++ b/drivers/net/ethernet/amd/pds_core/main.c @@ -21,6 +21,8 @@ static const struct pci_device_id pdsc_id_table[] = { }; MODULE_DEVICE_TABLE(pci, pdsc_id_table); +static void pdsc_stop_health_thread(struct pdsc *pdsc); + static void pdsc_wdtimer_cb(struct timer_list *t) { struct pdsc *pdsc = timer_container_of(pdsc, t, wdtimer); @@ -437,7 +439,7 @@ static void pdsc_remove(struct pci_dev *pdev) pdsc_sriov_configure(pdev, 0); pdsc_auxbus_dev_del(pdsc, pdsc, &pdsc->padev); - timer_shutdown_sync(&pdsc->wdtimer); + pdsc_stop_health_thread(pdsc); if (pdsc->wq) destroy_workqueue(pdsc->wq); diff --git a/include/linux/pds/pds_core_if.h b/include/linux/pds/pds_core_if.h index cc1f180aee55..8a0c962b6472 100644 --- a/include/linux/pds/pds_core_if.h +++ b/include/linux/pds/pds_core_if.h @@ -46,6 +46,7 @@ enum pds_core_cmd_opcode { PDS_CORE_CMD_SEND_COMPONENT = 9, PDS_CORE_CMD_FINALIZE_UPDATE = 10, PDS_CORE_CMD_MATCH_RECORD_DESC = 11, + PDS_CORE_CMD_HOST_MEM = 12, /* SR/IOV commands */ PDS_CORE_CMD_VF_GETATTR = 60, @@ -110,9 +111,11 @@ struct pds_core_drv_identity { /** * enum pds_core_dev_capability - Device capabilities * @PDS_CORE_DEV_CAP_PLDM_FW_UPDATE: Device only supports FW update via PLDM + * @PDS_CORE_DEV_CAP_HOST_MEM: Device supports host memory for fw use */ enum pds_core_dev_capability { PDS_CORE_DEV_CAP_PLDM_FW_UPDATE = BIT(0), + PDS_CORE_DEV_CAP_HOST_MEM = BIT(1), }; #define PDS_DEV_TYPE_MAX 16 @@ -838,6 +841,65 @@ struct pds_core_match_record_desc_comp { u8 rsvd; }; +/** + * enum pds_core_host_mem_oper - HOST_MEM sub-operations + * @PDS_CORE_HOST_MEM_GET_COUNT: Query number of memory requests + * @PDS_CORE_HOST_MEM_QUERY: Query details of a memory request + * @PDS_CORE_HOST_MEM_ADD: Provide allocated memory to firmware + * @PDS_CORE_HOST_MEM_DEL: Notify firmware of memory deallocation + */ +enum pds_core_host_mem_oper { + PDS_CORE_HOST_MEM_GET_COUNT = 0, + PDS_CORE_HOST_MEM_QUERY = 1, + PDS_CORE_HOST_MEM_ADD = 2, + PDS_CORE_HOST_MEM_DEL = 3, +}; + +/** + * struct pds_core_host_mem_cmd - HOST_MEM command + * @opcode: Opcode PDS_CORE_CMD_HOST_MEM + * @oper: Operation (enum pds_core_host_mem_oper) + * @index: Memory request index (GET_COUNT: max_count, QUERY: index) + * @tag: Tag for this memory request (ADD/DEL) + * @reason: Reason for deletion (DEL only) + * @rsvd: Reserved + * @max_contig: Maximum contiguous memory size (GET_COUNT only) + * @size: Size of memory in bytes (ADD only) + * @buf_pa: DMA address of memory (ADD only) + * + * Unified command for all host memory operations. Fields are reused + * across operations to minimize opcode space usage. + */ +struct pds_core_host_mem_cmd { + u8 opcode; + u8 oper; + __le16 index; + __le16 tag; + u8 reason; + u8 rsvd; + __le32 max_contig; + __le32 size; + __le64 buf_pa; +}; + +/** + * struct pds_core_host_mem_comp - HOST_MEM completion + * @status: Status of the command (enum pds_core_status_code) + * @oper: Operation that was performed + * @count: Number of memory requests (GET_COUNT) + * @size: Size of memory request in bytes (QUERY) + * @tag: Tag for this memory request (QUERY/DEL) + * @rsvd: Reserved + */ +struct pds_core_host_mem_comp { + u8 status; + u8 oper; + __le16 count; + __le32 size; + __le16 tag; + u8 rsvd[6]; +}; + /* * union pds_core_dev_cmd - Overlay of core device command structures */ @@ -861,6 +923,7 @@ union pds_core_dev_cmd { struct pds_core_send_component_cmd send_component; struct pds_core_finalize_update_cmd finalize_update; struct pds_core_match_record_desc_cmd match_record_desc; + struct pds_core_host_mem_cmd host_mem; }; /* @@ -886,6 +949,7 @@ union pds_core_dev_comp { struct pds_core_send_component_comp send_component; struct pds_core_finalize_update_comp finalize_update; struct pds_core_match_record_desc_comp match_record_desc; + struct pds_core_host_mem_comp host_mem; }; /** -- 2.43.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH v3 6/6] pds_core: add debugfs support for host backed memory 2026-06-08 22:32 [PATCH net-next v3 0/6] pds_core: Add PLDM firmware update and host backed memory support Nikhil P. Rao ` (4 preceding siblings ...) 2026-06-08 22:32 ` [PATCH v3 5/6] pds_core: add host backed memory support for firmware Nikhil P. Rao @ 2026-06-08 22:32 ` Nikhil P. Rao 5 siblings, 0 replies; 8+ messages in thread From: Nikhil P. Rao @ 2026-06-08 22:32 UTC (permalink / raw) To: netdev Cc: Brett Creeley, Andrew Lunn, David S . Miller, Eric Dumazet, Jakub Kicinski, Paolo Abeni, linux-kernel, Eric Joyner, Vamsi Atluri From: Vamsi Atluri <Vamsi.Atluri@amd.com> Add debugfs file to display host memory allocations including tag, size, order, and physical address for each memory request. Signed-off-by: Vamsi Atluri <Vamsi.Atluri@amd.com> --- drivers/net/ethernet/amd/pds_core/core.c | 2 + drivers/net/ethernet/amd/pds_core/core.h | 1 + drivers/net/ethernet/amd/pds_core/debugfs.c | 45 +++++++++++++++++++++ 3 files changed, 48 insertions(+) diff --git a/drivers/net/ethernet/amd/pds_core/core.c b/drivers/net/ethernet/amd/pds_core/core.c index 249afcd5f5d7..fa73c008d683 100644 --- a/drivers/net/ethernet/amd/pds_core/core.c +++ b/drivers/net/ethernet/amd/pds_core/core.c @@ -487,6 +487,7 @@ void pdsc_teardown(struct pdsc *pdsc, bool removing) pdsc->viftype_status = NULL; } + pdsc_debugfs_del_host_mem(pdsc); pdsc_host_mem_free(pdsc); pdsc_dev_uninit(pdsc); @@ -498,6 +499,7 @@ int pdsc_start(struct pdsc *pdsc) pds_core_intr_mask(&pdsc->intr_ctrl[pdsc->adminqcq.intx], PDS_CORE_INTR_MASK_CLEAR); pdsc_host_mem_add(pdsc); + pdsc_debugfs_add_host_mem(pdsc); return 0; } diff --git a/drivers/net/ethernet/amd/pds_core/core.h b/drivers/net/ethernet/amd/pds_core/core.h index 53e5a6f0af9c..b453493c093f 100644 --- a/drivers/net/ethernet/amd/pds_core/core.h +++ b/drivers/net/ethernet/amd/pds_core/core.h @@ -304,6 +304,7 @@ void pdsc_debugfs_add_irqs(struct pdsc *pdsc); void pdsc_debugfs_add_qcq(struct pdsc *pdsc, struct pdsc_qcq *qcq); void pdsc_debugfs_del_qcq(struct pdsc_qcq *qcq); void pdsc_debugfs_add_host_mem(struct pdsc *pdsc); +void pdsc_debugfs_del_host_mem(struct pdsc *pdsc); int pdsc_err_to_errno(enum pds_core_status_code code); bool pdsc_is_fw_running(struct pdsc *pdsc); diff --git a/drivers/net/ethernet/amd/pds_core/debugfs.c b/drivers/net/ethernet/amd/pds_core/debugfs.c index 810a0cd9bcac..ef0a1b7d159b 100644 --- a/drivers/net/ethernet/amd/pds_core/debugfs.c +++ b/drivers/net/ethernet/amd/pds_core/debugfs.c @@ -178,3 +178,48 @@ void pdsc_debugfs_del_qcq(struct pdsc_qcq *qcq) debugfs_remove_recursive(qcq->dentry); qcq->dentry = NULL; } + +static int host_mem_show(struct seq_file *seq, void *v) +{ + struct pdsc *pdsc = seq->private; + struct pdsc_host_mem *hm; + int i; + + if (!pdsc->host_mem_reqs || pdsc->num_host_mem_reqs == 0) { + seq_puts(seq, "No host memory allocated\n"); + return 0; + } + + seq_printf(seq, "Host memory requests: %u\n\n", + pdsc->num_host_mem_reqs); + seq_puts(seq, "Tag Size Order PA\n"); + seq_puts(seq, "--- ---- ----- --\n"); + + for (i = 0; i < pdsc->num_host_mem_reqs; i++) { + hm = &pdsc->host_mem_reqs[i]; + + if (!hm->pg) + continue; + + seq_printf(seq, "%-6u %-12u %-6u %pad\n", + hm->tag, hm->size, hm->order, &hm->pa); + } + + return 0; +} +DEFINE_SHOW_ATTRIBUTE(host_mem); + +void pdsc_debugfs_add_host_mem(struct pdsc *pdsc) +{ + if (!(pdsc->dev_ident.capabilities & + cpu_to_le64(PDS_CORE_DEV_CAP_HOST_MEM))) + return; + + debugfs_create_file("host_mem", 0400, pdsc->dentry, + pdsc, &host_mem_fops); +} + +void pdsc_debugfs_del_host_mem(struct pdsc *pdsc) +{ + debugfs_lookup_and_remove("host_mem", pdsc->dentry); +} -- 2.43.0 ^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2026-06-08 22:53 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2026-06-08 22:32 [PATCH net-next v3 0/6] pds_core: Add PLDM firmware update and host backed memory support Nikhil P. Rao 2026-06-08 22:32 ` [PATCH v3 1/6] pds_core: add support for quiet devcmd failures Nikhil P. Rao 2026-06-08 22:32 ` [PATCH v3 2/6] pds_core: add support for identity version 2 Nikhil P. Rao 2026-06-08 22:32 ` [PATCH v3 3/6] pds_core: add PLDM firmware update support via devlink flash Nikhil P. Rao 2026-06-08 22:53 ` Jacob Keller 2026-06-08 22:32 ` [PATCH v3 4/6] pds_core: add PLDM component info display Nikhil P. Rao 2026-06-08 22:32 ` [PATCH v3 5/6] pds_core: add host backed memory support for firmware Nikhil P. Rao 2026-06-08 22:32 ` [PATCH v3 6/6] pds_core: add debugfs support for host backed memory Nikhil P. Rao
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox