From: Lijo Lazar <[email protected]> Move more IP version specific related things to ualink version file. Use soc v1.0 IH client id defintion and define mpnht interrupt source id in ivsrcid header.
Signed-off-by: Lijo Lazar <[email protected]> Reviewed-by: Hawking Zhang <[email protected]> Signed-off-by: Alex Deucher <[email protected]> --- drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.c | 28 +++++------------ drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.h | 4 ++- drivers/gpu/drm/amd/amdgpu/ualink_v1_0.c | 24 +++++++++++++-- .../ivsrcid/mpnht/irqsrcs_mpnht_15_0.h | 30 +++++++++++++++++++ 4 files changed, 63 insertions(+), 23 deletions(-) create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/mpnht/irqsrcs_mpnht_15_0.h diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.c index d7d74b1ae7fc6..5957a3a2c85b1 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.c @@ -1419,8 +1419,6 @@ static const struct kobj_type ualink_station_config_ktype = { int ualink_ip_sw_init(struct amdgpu_ip_block *ip_block) { - int r; - struct amdgpu_ualink_station_config *stations; struct amdgpu_ualink_vpod_config *vpod_config; struct amdgpu_ualink_ppod_setup *ppod_setup; @@ -1460,12 +1458,6 @@ int ualink_ip_sw_init(struct amdgpu_ip_block *ip_block) adev->ualink.config = vpod_config; adev->ualink.stations = stations; - r = amdgpu_ualink_init_interrupt(adev); - if (r) { - dev_err(adev->dev, "Failed to add UALink irq: %d\n", r); - return r; - } - return 0; } @@ -6012,32 +6004,28 @@ static const struct amdgpu_irq_src_funcs ualink_irq_funcs = { .process = amdgpu_ualink_process_irq, }; -/* TODO: if move to header file soc21_enum.h */ -#define UALINK_IH_CLIENT_ID 0x1C -#define UALINK_IH_SOURCE_ID 0x0 - /** - * amdgpu_ualink_init_interrupt - initialization of UALink IRQ + * amdgpu_ualink_init_interrupt - register the UALink IRQ source * @adev: amdgpu device pointer + * @client_id: IH client ID for the interrupt source + * @src_id: source ID for the interrupt source * - * Registers the UALink interrupt source with the IH (Interrupt Handler) - * subsystem during early device initialization. This sets up the IRQ - * callback functions for handling remote interrupts from peer GPUs. + * Registers the UALink interrupt source with the IH subsystem. * * Return: 0 on success, negative error code on failure */ -int amdgpu_ualink_init_interrupt(struct amdgpu_device *adev) +int amdgpu_ualink_init_interrupt(struct amdgpu_device *adev, + unsigned int client_id, unsigned int src_id) { int r; dev_dbg(adev->dev, "init ualink irq client_id 0x%x src_id 0x%x\n", - UALINK_IH_CLIENT_ID, UALINK_IH_SOURCE_ID); + client_id, src_id); adev->ualink.irq.num_types = 1; adev->ualink.irq.funcs = &ualink_irq_funcs; - r = amdgpu_irq_add_id(adev, UALINK_IH_CLIENT_ID, - UALINK_IH_SOURCE_ID, &adev->ualink.irq); + r = amdgpu_irq_add_id(adev, client_id, src_id, &adev->ualink.irq); return r; } diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.h index e23aaf8b313e1..792b0fc9fed97 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.h @@ -388,7 +388,9 @@ struct amdgpu_ualink_mgr { unsigned long drop_msg_bitmap; }; -int amdgpu_ualink_init_interrupt(struct amdgpu_device *adev); +int amdgpu_ualink_init_interrupt(struct amdgpu_device *adev, + unsigned int client_id, unsigned int src_id); + int amdgpu_ualink_sw_init(struct amdgpu_device *adev); void amdgpu_ualink_sw_fini(struct amdgpu_device *adev); diff --git a/drivers/gpu/drm/amd/amdgpu/ualink_v1_0.c b/drivers/gpu/drm/amd/amdgpu/ualink_v1_0.c index 0fe2c0fba4cf9..58cf98ac94add 100644 --- a/drivers/gpu/drm/amd/amdgpu/ualink_v1_0.c +++ b/drivers/gpu/drm/amd/amdgpu/ualink_v1_0.c @@ -23,6 +23,7 @@ #include <linux/delay.h> #include "amdgpu.h" +#include "ivsrcid/mpnht/irqsrcs_mpnht_15_0.h" #include "amdgpu_ualink.h" #include "ualink_v1_0.h" @@ -104,11 +105,30 @@ static int ualink_v1_0_early_init(struct amdgpu_ip_block *ip_block) return 0; } +static int ualink_v1_0_sw_init(struct amdgpu_ip_block *ip_block) +{ + struct amdgpu_device *adev = ip_block->adev; + int r; + + r = ualink_ip_sw_init(ip_block); + if (r) + return r; + + r = amdgpu_ualink_init_interrupt(adev, SOC_V1_0_IH_CLIENTID_nHT, + MPNHT_15_0__SRCID__REMOTE_INTERRUPT); + if (r) { + dev_err(adev->dev, "Failed to add UALink irq: %d\n", r); + return r; + } + + return 0; +} + static const struct amd_ip_funcs ualink_v1_0_ip_funcs = { .name = "ualink", .early_init = ualink_v1_0_early_init, .late_init = ualink_ip_late_init, - .sw_init = ualink_ip_sw_init, + .sw_init = ualink_v1_0_sw_init, .sw_fini = ualink_ip_sw_fini, .hw_init = ualink_ip_hw_init, }; @@ -119,4 +139,4 @@ const struct amdgpu_ip_block_version ualink_v1_0_ip_block = { .minor = 0, .rev = 0, .funcs = &ualink_v1_0_ip_funcs, -}; \ No newline at end of file +}; diff --git a/drivers/gpu/drm/amd/include/ivsrcid/mpnht/irqsrcs_mpnht_15_0.h b/drivers/gpu/drm/amd/include/ivsrcid/mpnht/irqsrcs_mpnht_15_0.h new file mode 100644 index 0000000000000..c960353f107db --- /dev/null +++ b/drivers/gpu/drm/amd/include/ivsrcid/mpnht/irqsrcs_mpnht_15_0.h @@ -0,0 +1,30 @@ +/* + * Copyright 2026 Advanced Micro Devices, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR + * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + * OTHER DEALINGS IN THE SOFTWARE. + * + */ + +#ifndef __IRQSRCS_MPNHT_15_0_H__ +#define __IRQSRCS_MPNHT_15_0_H__ + +/* MPNHT remote interrupt */ +#define MPNHT_15_0__SRCID__REMOTE_INTERRUPT 0x00 + +#endif -- 2.55.0
