From nobody Fri Apr 3 04:38:50 2026 Received: from out198-6.us.a.mail.aliyun.com (out198-6.us.a.mail.aliyun.com [47.90.198.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AB7252765E2; Wed, 25 Mar 2026 04:17:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=47.90.198.6 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774412229; cv=none; b=nWm2CTsnTtHZ2qh/lATTgmLy+9qp0AEKXUEdYpn6xwp1eCHesuPLAehb/oTI7i91Fl22h9vqqs6NshYXv51gilpwOUdPU4SAbWTOQZeIFTMFxQ5YqVFCqhiUarqmxJqVibL+7Da8jhQ8dj/x8fiKZJC24fGYUMNckC8UiscKBZ4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774412229; c=relaxed/simple; bh=lnX83ws55ssjj3Vq6LiaG1wrWFODe8buV9fJqZJ2FGc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=i0Tes1pPddIXCbhE8NPvM4G55+7pxFPrwPfM7f7dpeDBS70SK2GnmevFKceG7D9m4A94NmKo3JdbyYoQUxMOj9Ghop79+eRWxLqint476lbJqgmKd6Aa+UfT4fXZafkxWBEcRJOiY49Cd2RCuHqMle1GJOg62adNCs3R6LwbLbY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=nebula-matrix.com; spf=pass smtp.mailfrom=nebula-matrix.com; arc=none smtp.client-ip=47.90.198.6 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=nebula-matrix.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=nebula-matrix.com X-Alimail-AntiSpam: AC=CONTINUE;BC=0.917129|0.8892149;CH=green;DM=|SPAM|false|;DS=CONTINUE|ham_alarm|0.0185623-0.0034656-0.977972;FP=11968137997965905578|0|0|0|0|-1|-1|-1;HT=maildocker-contentspam033032023038;MF=illusion.wang@nebula-matrix.com;NM=1;PH=DS;RN=16;RT=16;SR=0;TI=SMTPD_---.gzTMEeK_1774411260; Received: from localhost.localdomain(mailfrom:illusion.wang@nebula-matrix.com fp:SMTPD_---.gzTMEeK_1774411260 cluster:ay29) by smtp.aliyun-inc.com; Wed, 25 Mar 2026 12:01:01 +0800 From: "illusion.wang" To: dimon.zhao@nebula-matrix.com, illusion.wang@nebula-matrix.com, alvin.wang@nebula-matrix.com, sam.chen@nebula-matrix.com, netdev@vger.kernel.org Cc: andrew+netdev@lunn.ch, corbet@lwn.net, kuba@kernel.org, linux-doc@vger.kernel.org, lorenzo@kernel.org, pabeni@redhat.com, horms@kernel.org, vadim.fedorenko@linux.dev, lukas.bulwahn@redhat.com, edumazet@google.com, linux-kernel@vger.kernel.org (open list) Subject: [PATCH v9 net-next 07/11] net/nebula-matrix: add intr resource implementation Date: Wed, 25 Mar 2026 12:00:39 +0800 Message-ID: <20260325040048.2313-8-illusion.wang@nebula-matrix.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260325040048.2313-1-illusion.wang@nebula-matrix.com> References: <20260325040048.2313-1-illusion.wang@nebula-matrix.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable MSI-X Interrupt Configuration:=C2=A0 Dynamically allocate and manage MSI-X interrupt vectors, including network interrupts and other types of interrupts. Interrupt Mapping Table Management: Maintain the MSI-X mapping table (msix_map_table) to establish interrupt associations between hardware and software. Interrupt Enabling/Disabling: Support enabling or disabling specific interrupts through hardware operations. Interrupt Information Query: Provide interfaces to obtain the hardware register addresses and data of interrupts. Signed-off-by: illusion.wang --- .../net/ethernet/nebula-matrix/nbl/Makefile | 1 + .../nbl/nbl_hw/nbl_hw_leonis/nbl_hw_leonis.c | 71 +++++ .../nbl_hw_leonis/nbl_resource_leonis.c | 13 + .../nebula-matrix/nbl/nbl_hw/nbl_interrupt.c | 243 ++++++++++++++++++ .../nebula-matrix/nbl/nbl_hw/nbl_interrupt.h | 12 + .../nebula-matrix/nbl/nbl_hw/nbl_resource.h | 33 +++ .../nbl/nbl_include/nbl_include.h | 2 + 7 files changed, 375 insertions(+) create mode 100644 drivers/net/ethernet/nebula-matrix/nbl/nbl_hw/nbl_inter= rupt.c create mode 100644 drivers/net/ethernet/nebula-matrix/nbl/nbl_hw/nbl_inter= rupt.h diff --git a/drivers/net/ethernet/nebula-matrix/nbl/Makefile b/drivers/net/= ethernet/nebula-matrix/nbl/Makefile index b03c20f9988e..a56e722a5ac7 100644 --- a/drivers/net/ethernet/nebula-matrix/nbl/Makefile +++ b/drivers/net/ethernet/nebula-matrix/nbl/Makefile @@ -9,6 +9,7 @@ nbl-objs +=3D nbl_common/nbl_common.o \ nbl_hw/nbl_hw_leonis/nbl_resource_leonis.o \ nbl_hw/nbl_hw_leonis/nbl_hw_leonis_regs.o \ nbl_hw/nbl_resource.o \ + nbl_hw/nbl_interrupt.o \ nbl_core/nbl_dispatch.o \ nbl_core/nbl_dev.o \ nbl_main.o diff --git a/drivers/net/ethernet/nebula-matrix/nbl/nbl_hw/nbl_hw_leonis/nb= l_hw_leonis.c b/drivers/net/ethernet/nebula-matrix/nbl/nbl_hw/nbl_hw_leonis= /nbl_hw_leonis.c index 10cd46ed7317..a2c92a060c72 100644 --- a/drivers/net/ethernet/nebula-matrix/nbl/nbl_hw/nbl_hw_leonis/nbl_hw_le= onis.c +++ b/drivers/net/ethernet/nebula-matrix/nbl/nbl_hw/nbl_hw_leonis/nbl_hw_le= onis.c @@ -62,6 +62,73 @@ static void nbl_hw_wr_regs(struct nbl_hw_mgt *hw_mgt, u6= 4 reg, const u32 *data, spin_unlock(&hw_mgt->reg_lock); } =20 +static void nbl_hw_enable_mailbox_irq(struct nbl_hw_mgt *hw_mgt, u16 func_= id, + bool enable_msix, u16 global_vec_id) +{ + struct nbl_mailbox_qinfo_map_table mb_qinfo_map =3D { 0 }; + + nbl_hw_rd_regs(hw_mgt, NBL_MAILBOX_QINFO_MAP_REG_ARR(func_id), + (u32 *)&mb_qinfo_map, sizeof(mb_qinfo_map)); + + if (enable_msix) { + mb_qinfo_map.msix_idx =3D global_vec_id; + mb_qinfo_map.msix_idx_valid =3D 1; + } else { + mb_qinfo_map.msix_idx =3D 0; + mb_qinfo_map.msix_idx_valid =3D 0; + } + + nbl_hw_wr_regs(hw_mgt, NBL_MAILBOX_QINFO_MAP_REG_ARR(func_id), + (u32 *)&mb_qinfo_map, sizeof(mb_qinfo_map)); +} + +static void nbl_hw_configure_msix_map(struct nbl_hw_mgt *hw_mgt, u16 func_= id, + bool valid, dma_addr_t dma_addr, u8 bus, + u8 devid, u8 function) +{ + struct nbl_function_msix_map function_msix_map =3D { 0 }; + + if (valid) { + function_msix_map.msix_map_base_addr =3D dma_addr; + /* use af's bdf, because dma memmory is alloc by af */ + function_msix_map.function =3D function; + function_msix_map.devid =3D devid; + function_msix_map.bus =3D bus; + function_msix_map.valid =3D 1; + } + + nbl_hw_wr_regs(hw_mgt, + NBL_PCOMPLETER_FUNCTION_MSIX_MAP_REG_ARR(func_id), + (u32 *)&function_msix_map, sizeof(function_msix_map)); +} + +static void nbl_hw_configure_msix_info(struct nbl_hw_mgt *hw_mgt, u16 func= _id, + bool valid, u16 interrupt_id, u8 bus, + u8 devid, u8 function, bool msix_mask_en) +{ + struct nbl_pcompleter_host_msix_fid_table host_msix_fid_tbl =3D { 0 }; + struct nbl_host_msix_info msix_info =3D { 0 }; + + if (valid) { + host_msix_fid_tbl.vld =3D 1; + host_msix_fid_tbl.fid =3D func_id; + + msix_info.intrl_pnum =3D 0; + msix_info.intrl_rate =3D 0; + msix_info.function =3D function; + msix_info.devid =3D devid; + msix_info.bus =3D bus; + msix_info.valid =3D 1; + if (msix_mask_en) + msix_info.msix_mask_en =3D 1; + } + + nbl_hw_wr_regs(hw_mgt, NBL_PADPT_HOST_MSIX_INFO_REG_ARR(interrupt_id), + (u32 *)&msix_info, sizeof(msix_info)); + nbl_hw_wr_regs(hw_mgt, NBL_PCOMPLETER_HOST_MSIX_FID_TABLE(interrupt_id), + (u32 *)&host_msix_fid_tbl, sizeof(host_msix_fid_tbl)); +} + static void nbl_hw_update_mailbox_queue_tail_ptr(struct nbl_hw_mgt *hw_mgt, u16 tail_ptr, u8 txrx) { @@ -194,6 +261,9 @@ static u32 nbl_hw_get_fw_eth_map(struct nbl_hw_mgt *hw_= mgt) } =20 static struct nbl_hw_ops hw_ops =3D { + .configure_msix_map =3D nbl_hw_configure_msix_map, + .configure_msix_info =3D nbl_hw_configure_msix_info, + .update_mailbox_queue_tail_ptr =3D nbl_hw_update_mailbox_queue_tail_ptr, .config_mailbox_rxq =3D nbl_hw_config_mailbox_rxq, .config_mailbox_txq =3D nbl_hw_config_mailbox_txq, @@ -203,6 +273,7 @@ static struct nbl_hw_ops hw_ops =3D { .get_real_bus =3D nbl_hw_get_real_bus, =20 .cfg_mailbox_qinfo =3D nbl_hw_cfg_mailbox_qinfo, + .enable_mailbox_irq =3D nbl_hw_enable_mailbox_irq, =20 .get_fw_eth_num =3D nbl_hw_get_fw_eth_num, .get_fw_eth_map =3D nbl_hw_get_fw_eth_map, diff --git a/drivers/net/ethernet/nebula-matrix/nbl/nbl_hw/nbl_hw_leonis/nb= l_resource_leonis.c b/drivers/net/ethernet/nebula-matrix/nbl/nbl_hw/nbl_hw_= leonis/nbl_resource_leonis.c index d3613f7105b6..bf76291b0e9f 100644 --- a/drivers/net/ethernet/nebula-matrix/nbl/nbl_hw/nbl_hw_leonis/nbl_resou= rce_leonis.c +++ b/drivers/net/ethernet/nebula-matrix/nbl/nbl_hw/nbl_hw_leonis/nbl_resou= rce_leonis.c @@ -11,6 +11,7 @@ static struct nbl_resource_ops res_ops =3D { .get_eth_id =3D nbl_res_get_eth_id, }; =20 +static bool is_ops_inited; static struct nbl_resource_mgt * nbl_res_setup_res_mgt(struct nbl_common_info *common) { @@ -36,11 +37,19 @@ static struct nbl_resource_ops_tbl * nbl_res_setup_ops(struct device *dev, struct nbl_resource_mgt *res_mgt) { struct nbl_resource_ops_tbl *res_ops_tbl; + int ret; =20 res_ops_tbl =3D devm_kzalloc(dev, sizeof(*res_ops_tbl), GFP_KERNEL); if (!res_ops_tbl) return ERR_PTR(-ENOMEM); =20 + if (!is_ops_inited) { + ret =3D nbl_intr_setup_ops(&res_ops); + if (ret) + return ERR_PTR(-ENOMEM); + is_ops_inited =3D true; + } + res_ops_tbl->ops =3D &res_ops; res_ops_tbl->priv =3D res_mgt; =20 @@ -202,6 +211,10 @@ static int nbl_res_start(struct nbl_resource_mgt *res_= mgt, ret =3D nbl_res_ctrl_dev_vsi_info_init(res_mgt); if (ret) return ret; + + ret =3D nbl_intr_mgt_start(res_mgt); + if (ret) + return ret; } return 0; } diff --git a/drivers/net/ethernet/nebula-matrix/nbl/nbl_hw/nbl_interrupt.c = b/drivers/net/ethernet/nebula-matrix/nbl/nbl_hw/nbl_interrupt.c new file mode 100644 index 000000000000..d9f909e2de88 --- /dev/null +++ b/drivers/net/ethernet/nebula-matrix/nbl/nbl_hw/nbl_interrupt.c @@ -0,0 +1,243 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (c) 2025 Nebula Matrix Limited. + */ +#include +#include +#include "nbl_interrupt.h" + +static int nbl_res_intr_destroy_msix_map(struct nbl_resource_mgt *res_mgt, + u16 func_id) +{ + struct nbl_interrupt_mgt *intr_mgt =3D res_mgt->intr_mgt; + struct nbl_hw_ops *hw_ops =3D res_mgt->hw_ops_tbl->ops; + struct device *dev =3D res_mgt->common->dev; + struct nbl_msix_map_table *msix_map_table; + u16 *interrupts; + u16 intr_num, i; + + /* use ctrl dev bdf */ + hw_ops->configure_msix_map(res_mgt->hw_ops_tbl->priv, func_id, false, 0, + 0, 0, 0); + + intr_num =3D intr_mgt->func_intr_res[func_id].num_interrupts; + interrupts =3D intr_mgt->func_intr_res[func_id].interrupts; + + WARN_ON(!interrupts); + for (i =3D 0; i < intr_num; i++) { + if (interrupts[i] >=3D NBL_MAX_OTHER_INTERRUPT) + clear_bit(interrupts[i] - NBL_MAX_OTHER_INTERRUPT, + intr_mgt->interrupt_net_bitmap); + else + clear_bit(interrupts[i], + intr_mgt->interrupt_others_bitmap); + + hw_ops->configure_msix_info(res_mgt->hw_ops_tbl->priv, func_id, + false, interrupts[i], 0, 0, 0, + false); + } + + kfree(interrupts); + intr_mgt->func_intr_res[func_id].interrupts =3D NULL; + intr_mgt->func_intr_res[func_id].num_interrupts =3D 0; + + msix_map_table =3D &intr_mgt->func_intr_res[func_id].msix_map_table; + dma_free_coherent(dev, msix_map_table->size, msix_map_table->base_addr, + msix_map_table->dma); + msix_map_table->size =3D 0; + msix_map_table->base_addr =3D NULL; + msix_map_table->dma =3D 0; + + return 0; +} + +static int nbl_res_intr_configure_msix_map(struct nbl_resource_mgt *res_mg= t, + u16 func_id, u16 num_net_msix, + u16 num_others_msix, + bool net_msix_mask_en) +{ + struct nbl_interrupt_mgt *intr_mgt =3D res_mgt->intr_mgt; + struct nbl_hw_ops *hw_ops =3D res_mgt->hw_ops_tbl->ops; + struct nbl_common_info *common =3D res_mgt->common; + struct nbl_msix_map_table *msix_map_table; + struct nbl_msix_map *msix_map_entries; + struct device *dev =3D common->dev; + u16 requested, intr_index; + u8 bus, devid, function; + bool msix_mask_en; + u16 *interrupts; + int ret =3D 0; + u16 i; + + requested =3D num_net_msix + num_others_msix; + if (requested > NBL_MSIX_MAP_TABLE_MAX_ENTRIES) + return -EINVAL; + if (intr_mgt->func_intr_res[func_id].interrupts) + nbl_res_intr_destroy_msix_map(res_mgt, func_id); + + ret =3D nbl_res_func_id_to_bdf(res_mgt, func_id, &bus, &devid, &function); + if (ret =3D=3D U32_MAX) + return -EINVAL; + + msix_map_table =3D &intr_mgt->func_intr_res[func_id].msix_map_table; + WARN_ON(msix_map_table->base_addr); + msix_map_table->size =3D + sizeof(struct nbl_msix_map) * NBL_MSIX_MAP_TABLE_MAX_ENTRIES; + msix_map_table->base_addr =3D dma_alloc_coherent(dev, + msix_map_table->size, + &msix_map_table->dma, + GFP_ATOMIC | __GFP_ZERO); + if (!msix_map_table->base_addr) { + pr_err("Allocate DMA memory for function msix map table failed\n"); + msix_map_table->size =3D 0; + return -ENOMEM; + } + + interrupts =3D kcalloc(requested, sizeof(interrupts[0]), GFP_ATOMIC); + if (!interrupts) { + ret =3D -ENOMEM; + goto alloc_interrupts_err; + } + + intr_mgt->func_intr_res[func_id].interrupts =3D interrupts; + intr_mgt->func_intr_res[func_id].num_interrupts =3D requested; + intr_mgt->func_intr_res[func_id].num_net_interrupts =3D num_net_msix; + + for (i =3D 0; i < num_net_msix; i++) { + intr_index =3D find_first_zero_bit(intr_mgt->interrupt_net_bitmap, + NBL_MAX_NET_INTERRUPT); + if (intr_index =3D=3D NBL_MAX_NET_INTERRUPT) { + pr_err("There is no available interrupt left\n"); + ret =3D -EAGAIN; + goto get_interrupt_err; + } + interrupts[i] =3D intr_index + NBL_MAX_OTHER_INTERRUPT; + set_bit(intr_index, intr_mgt->interrupt_net_bitmap); + } + + for (i =3D num_net_msix; i < requested; i++) { + intr_index =3D + find_first_zero_bit(intr_mgt->interrupt_others_bitmap, + NBL_MAX_OTHER_INTERRUPT); + if (intr_index =3D=3D NBL_MAX_OTHER_INTERRUPT) { + pr_err("There is no available interrupt left\n"); + ret =3D -EAGAIN; + goto get_interrupt_err; + } + interrupts[i] =3D intr_index; + set_bit(intr_index, intr_mgt->interrupt_others_bitmap); + } + + msix_map_entries =3D msix_map_table->base_addr; + for (i =3D 0; i < requested; i++) { + msix_map_entries[i].global_msix_index =3D interrupts[i]; + msix_map_entries[i].valid =3D 1; + + if (i < num_net_msix && net_msix_mask_en) + msix_mask_en =3D 1; + else + msix_mask_en =3D 0; + hw_ops->configure_msix_info(res_mgt->hw_ops_tbl->priv, func_id, + true, interrupts[i], bus, devid, + function, msix_mask_en); + } + + /* use ctrl dev bdf */ + hw_ops->configure_msix_map(res_mgt->hw_ops_tbl->priv, func_id, true, + msix_map_table->dma, common->hw_bus, + common->devid, common->function); + + return 0; + +get_interrupt_err: + while (i--) { + intr_index =3D interrupts[i]; + if (intr_index >=3D NBL_MAX_OTHER_INTERRUPT) + clear_bit(intr_index - NBL_MAX_OTHER_INTERRUPT, + intr_mgt->interrupt_net_bitmap); + else + clear_bit(intr_index, + intr_mgt->interrupt_others_bitmap); + } + kfree(interrupts); + intr_mgt->func_intr_res[func_id].num_interrupts =3D 0; + intr_mgt->func_intr_res[func_id].interrupts =3D NULL; + +alloc_interrupts_err: + dma_free_coherent(dev, msix_map_table->size, msix_map_table->base_addr, + msix_map_table->dma); + msix_map_table->size =3D 0; + msix_map_table->base_addr =3D NULL; + msix_map_table->dma =3D 0; + + return ret; +} + +static int nbl_res_intr_enable_mailbox_irq(struct nbl_resource_mgt *res_mg= t, + u16 func_id, u16 vector_id, + bool enable_msix) +{ + struct nbl_interrupt_mgt *intr_mgt =3D res_mgt->intr_mgt; + struct nbl_hw_ops *hw_ops =3D res_mgt->hw_ops_tbl->ops; + u16 global_vec_id; + + global_vec_id =3D intr_mgt->func_intr_res[func_id].interrupts[vector_id]; + hw_ops->enable_mailbox_irq(res_mgt->hw_ops_tbl->priv, func_id, + enable_msix, global_vec_id); + + return 0; +} + +/* NBL_INTR_SET_OPS(ops_name, func) + * + * Use X Macros to reduce setup and remove codes. + */ +#define NBL_INTR_OPS_TBL \ +do { \ + NBL_INTR_SET_OPS(configure_msix_map, \ + nbl_res_intr_configure_msix_map); \ + NBL_INTR_SET_OPS(destroy_msix_map, \ + nbl_res_intr_destroy_msix_map); \ + NBL_INTR_SET_OPS(enable_mailbox_irq, \ + nbl_res_intr_enable_mailbox_irq); \ +} while (0) + +/* Structure starts here, adding an op should not modify anything below */ +static struct nbl_interrupt_mgt *nbl_intr_setup_mgt(struct device *dev) +{ + struct nbl_interrupt_mgt *intr_mgt; + + intr_mgt =3D devm_kzalloc(dev, sizeof(*intr_mgt), GFP_KERNEL); + if (!intr_mgt) + return ERR_PTR(-ENOMEM); + + return intr_mgt; +} + +int nbl_intr_mgt_start(struct nbl_resource_mgt *res_mgt) +{ + struct device *dev =3D res_mgt->common->dev; + struct nbl_interrupt_mgt *intr_mgt; + int ret; + + intr_mgt =3D nbl_intr_setup_mgt(dev); + if (IS_ERR(intr_mgt)) { + ret =3D PTR_ERR(intr_mgt); + return ret; + } + res_mgt->intr_mgt =3D intr_mgt; + return 0; +} + +int nbl_intr_setup_ops(struct nbl_resource_ops *res_ops) +{ +#define NBL_INTR_SET_OPS(name, func) \ + do { \ + res_ops->NBL_NAME(name) =3D func; \ + ; \ + } while (0) + NBL_INTR_OPS_TBL; +#undef NBL_INTR_SET_OPS + + return 0; +} diff --git a/drivers/net/ethernet/nebula-matrix/nbl/nbl_hw/nbl_interrupt.h = b/drivers/net/ethernet/nebula-matrix/nbl/nbl_hw/nbl_interrupt.h new file mode 100644 index 000000000000..b876bf30084b --- /dev/null +++ b/drivers/net/ethernet/nebula-matrix/nbl/nbl_hw/nbl_interrupt.h @@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* + * Copyright (c) 2025 Nebula Matrix Limited. + */ + +#ifndef _NBL_INTERRUPT_H_ +#define _NBL_INTERRUPT_H_ + +#include "nbl_resource.h" + +#define NBL_MSIX_MAP_TABLE_MAX_ENTRIES 1024 +#endif diff --git a/drivers/net/ethernet/nebula-matrix/nbl/nbl_hw/nbl_resource.h b= /drivers/net/ethernet/nebula-matrix/nbl/nbl_hw/nbl_resource.h index b090157cfacd..0dbbd05df7bc 100644 --- a/drivers/net/ethernet/nebula-matrix/nbl/nbl_hw/nbl_resource.h +++ b/drivers/net/ethernet/nebula-matrix/nbl/nbl_hw/nbl_resource.h @@ -18,6 +18,37 @@ =20 struct nbl_resource_mgt; =20 +/* --------- INTERRUPT ---------- */ +#define NBL_MAX_OTHER_INTERRUPT 1024 +#define NBL_MAX_NET_INTERRUPT 4096 + +struct nbl_msix_map { + u16 valid:1; + u16 global_msix_index:13; + u16 rsv:2; +}; + +struct nbl_msix_map_table { + struct nbl_msix_map *base_addr; + dma_addr_t dma; + size_t size; +}; + +struct nbl_func_interrupt_resource_mng { + u16 num_interrupts; + u16 num_net_interrupts; + u16 msix_base; + u16 msix_max; + u16 *interrupts; + struct nbl_msix_map_table msix_map_table; +}; + +struct nbl_interrupt_mgt { + DECLARE_BITMAP(interrupt_net_bitmap, NBL_MAX_NET_INTERRUPT); + DECLARE_BITMAP(interrupt_others_bitmap, NBL_MAX_OTHER_INTERRUPT); + struct nbl_func_interrupt_resource_mng func_intr_res[NBL_MAX_FUNC]; +}; + /* --------- INFO ---------- */ struct nbl_sriov_info { unsigned int bdf; @@ -79,6 +110,8 @@ int nbl_res_func_id_to_bdf(struct nbl_resource_mgt *res_= mgt, u16 func_id, u8 *bus, u8 *dev, u8 *function); void nbl_res_get_eth_id(struct nbl_resource_mgt *res_mgt, u16 vsi_id, u8 *eth_mode, u8 *eth_id, u8 *logic_eth_id); +int nbl_intr_mgt_start(struct nbl_resource_mgt *res_mgt); +int nbl_intr_setup_ops(struct nbl_resource_ops *resource_ops); void nbl_res_pf_dev_vsi_type_to_hw_vsi_type(u16 src_type, enum nbl_vsi_serv_type *dst_type); #endif diff --git a/drivers/net/ethernet/nebula-matrix/nbl/nbl_include/nbl_include= .h b/drivers/net/ethernet/nebula-matrix/nbl/nbl_include/nbl_include.h index 6a0bf5e8ca32..e4f11e6ded94 100644 --- a/drivers/net/ethernet/nebula-matrix/nbl/nbl_include/nbl_include.h +++ b/drivers/net/ethernet/nebula-matrix/nbl/nbl_include/nbl_include.h @@ -19,6 +19,8 @@ =20 #define NBL_MAX_FUNC 520 #define NBL_MAX_ETHERNET 4 +/* Used for macros to pass checkpatch */ +#define NBL_NAME(x) x =20 enum nbl_product_type { NBL_LEONIS_TYPE, --=20 2.47.3