From: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
To: intel-wired-lan@lists.osuosl.org
Cc: netdev@vger.kernel.org,
Michal Swiatkowski <michal.swiatkowski@linux.intel.com>,
Ahmed Zaki <ahmed.zaki@intel.com>
Subject: [PATCH iwl-next v1 06/10] libie, idpf: move hardware irq info struct to libie
Date: Mon, 7 Sep 2026 12:24:13 +0200 [thread overview]
Message-ID: <20260907102418.2697317-7-michal.swiatkowski@linux.intel.com> (raw)
In-Reply-To: <20260907102418.2697317-1-michal.swiatkowski@linux.intel.com>
Manually move definition related to irq info from idpf to libie_irq.
s/idpf_/libie_
It will be used by idpf and ixd driver.
Reviewed-by: Ahmed Zaki <ahmed.zaki@intel.com>
Signed-off-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
---
drivers/net/ethernet/intel/idpf/idpf.h | 36 +------------------
drivers/net/ethernet/intel/idpf/idpf_dev.c | 2 +-
drivers/net/ethernet/intel/idpf/idpf_vf_dev.c | 2 +-
.../net/ethernet/intel/idpf/idpf_virtchnl.c | 8 ++---
include/linux/net/intel/libie/irq.h | 34 ++++++++++++++++++
5 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/drivers/net/ethernet/intel/idpf/idpf.h b/drivers/net/ethernet/intel/idpf/idpf.h
index b7ed8272bc93..1c67895a014e 100644
--- a/drivers/net/ethernet/intel/idpf/idpf.h
+++ b/drivers/net/ethernet/intel/idpf/idpf.h
@@ -577,40 +577,6 @@ struct idpf_vport_config {
iter = (++__##iter) < &(adapter)->vports[(adapter)->max_vports] ? \
*__##iter : NULL)
-/**
- * struct idpf_vec_regs - hardware registers related to vector
- * @dyn_ctl: Dynamic control interrupt register offset
- * @itrn: Interrupt Throttling Rate register offset
- * @itrn_index_spacing: Register spacing between ITR registers of the same
- * vector
- */
-struct idpf_vec_regs {
- u32 dyn_ctl;
- u32 itrn;
- u32 itrn_index_spacing;
-};
-
-/**
- * struct idpf_hw_vector - single hardware vector info
- * @regs: address of irq registers
- * @idx: hardware vector index
- */
-struct idpf_hw_vector {
- struct idpf_vec_regs regs;
- int idx;
-};
-
-/**
- * struct idpf_irq_info - hardware data needed to setup irq
- * @vectors: allocated during initialization store hardware information
- * for all vectors that can be used on a whole device
- * @num: amount of vectors stored here
- */
-struct idpf_irq_info {
- struct idpf_hw_vector *vectors;
- int num;
-};
-
/**
* struct idpf_adapter - Device data struct generated on probe
* @pdev: PCI device struct given on probe
@@ -685,7 +651,7 @@ struct idpf_adapter {
struct msix_entry *rdma_msix_entries;
struct libie_irq irq;
struct virtchnl2_alloc_vectors *req_vec_chunks;
- struct idpf_irq_info irq_info;
+ struct libie_irq_info irq_info;
struct idpf_q_vector mb_vector;
irqreturn_t (*irq_mb_handler)(int irq, void *data);
diff --git a/drivers/net/ethernet/intel/idpf/idpf_dev.c b/drivers/net/ethernet/intel/idpf/idpf_dev.c
index cd947fd24ff6..61f5e8e4d20b 100644
--- a/drivers/net/ethernet/intel/idpf/idpf_dev.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_dev.c
@@ -87,7 +87,7 @@ static void idpf_noirq_intr_reg_init(struct idpf_adapter *adapter,
static void idpf_intr_reg_init(struct idpf_adapter *adapter,
struct idpf_q_vector *q_vector, u16 idx)
{
- struct idpf_hw_vector *v = &adapter->irq_info.vectors[idx];
+ struct libie_hw_vector *v = &adapter->irq_info.vectors[idx];
struct idpf_intr_reg *intr = &q_vector->intr_reg;
struct libie_mmio_info *mmio;
u32 rx_itr, tx_itr;
diff --git a/drivers/net/ethernet/intel/idpf/idpf_vf_dev.c b/drivers/net/ethernet/intel/idpf/idpf_vf_dev.c
index df3eabe12b18..4c1c2476613b 100644
--- a/drivers/net/ethernet/intel/idpf/idpf_vf_dev.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_vf_dev.c
@@ -86,7 +86,7 @@ static void idpf_vf_noirq_intr_reg_init(struct idpf_adapter *adapter,
static void idpf_vf_intr_reg_init(struct idpf_adapter *adapter,
struct idpf_q_vector *q_vector, u16 idx)
{
- struct idpf_hw_vector *v = &adapter->irq_info.vectors[idx];
+ struct libie_hw_vector *v = &adapter->irq_info.vectors[idx];
struct idpf_intr_reg *intr = &q_vector->intr_reg;
struct libie_mmio_info *mmio;
u32 rx_itr, tx_itr;
diff --git a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
index e24740bbb7ca..9377af87125f 100644
--- a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
@@ -1855,7 +1855,7 @@ idpf_prep_map_unmap_queue_set_vector_msg(u32 vport_id, void *buf,
*/
static int
idpf_send_map_unmap_queue_set_vector_msg(const struct idpf_queue_set *qs,
- const struct idpf_irq_info *info,
+ const struct libie_irq_info *info,
bool map)
{
struct virtchnl2_queue_vector *vqv __free(kfree) = NULL;
@@ -2238,14 +2238,14 @@ int idpf_send_add_queues_msg(struct idpf_adapter *adapter,
*
* Returns 0 on success, negative on failure.
*/
-static int idpf_create_vectors_info(struct idpf_irq_info *info,
+static int idpf_create_vectors_info(struct libie_irq_info *info,
const struct virtchnl2_get_capabilities *caps,
const struct virtchnl2_alloc_vectors *vectors,
const u16 num_vectors)
{
const struct virtchnl2_vector_chunks *chunks = &vectors->vchunks;
int all_vectors = num_vectors + IDPF_MBX_Q_VEC;
- struct idpf_hw_vector *vector;
+ struct libie_hw_vector *vector;
int reg_cnt;
if (le16_to_cpu(vectors->num_vectors) < num_vectors)
@@ -2266,7 +2266,7 @@ static int idpf_create_vectors_info(struct idpf_irq_info *info,
for (int i = 0; i < le16_to_cpu(chunks->num_vchunks); i++) {
const struct virtchnl2_vector_chunk *chunk = &chunks->vchunks[i];
u32 dyn_spacing, itrn_spacing;
- struct idpf_vec_regs reg_val;
+ struct libie_vec_regs reg_val;
u16 vec_id;
reg_val.dyn_ctl = le32_to_cpu(chunk->dynctl_reg_start);
diff --git a/include/linux/net/intel/libie/irq.h b/include/linux/net/intel/libie/irq.h
index 8af8fc22ab09..e219fde575d8 100644
--- a/include/linux/net/intel/libie/irq.h
+++ b/include/linux/net/intel/libie/irq.h
@@ -64,6 +64,40 @@ struct libie_irq {
struct xarray entries;
};
+/**
+ * struct libie_vec_regs - hardware registers related to vector
+ * @dyn_ctl: Dynamic control interrupt register offset
+ * @itrn: Interrupt Throttling Rate register offset
+ * @itrn_index_spacing: Register spacing between ITR registers of the same
+ * vector
+ */
+struct libie_vec_regs {
+ u32 dyn_ctl;
+ u32 itrn;
+ u32 itrn_index_spacing;
+};
+
+/**
+ * struct libie_hw_vector - single hardware vector info
+ * @regs: address of irq registers
+ * @idx: hardware vector index
+ */
+struct libie_hw_vector {
+ struct libie_vec_regs regs;
+ int idx;
+};
+
+/**
+ * struct libie_irq_info - hardware data needed to setup irq
+ * @vectors: allocated during initialization store hardware information
+ * for all vectors that can be used on a whole device
+ * @num: amount of vectors stored here
+ */
+struct libie_irq_info {
+ struct libie_hw_vector *vectors;
+ int num;
+};
+
int libie_irq_init(struct libie_irq *irq, struct pci_dev *pdev,
int min, int max);
void libie_irq_deinit(struct libie_irq *irq);
--
2.49.0
next prev parent reply other threads:[~2026-09-07 11:04 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-07 10:24 [PATCH iwl-next v1 00/10] Interrupts helper in libie Michal Swiatkowski
2026-09-07 10:24 ` [PATCH iwl-next v1 01/10] idpf: store HW vectors information Michal Swiatkowski
2026-09-07 10:24 ` [PATCH iwl-next v1 02/10] idpf: fill q_vector interrupt registers one by one Michal Swiatkowski
2026-09-07 10:24 ` [PATCH iwl-next v1 03/10] idpf: get rid of msix_entries array Michal Swiatkowski
2026-09-07 10:24 ` [PATCH iwl-next v1 04/10] idpf: drop v_idx from q_vector structure Michal Swiatkowski
2026-09-07 10:24 ` [PATCH iwl-next v1 05/10] libie, idpf: move irq code to libie Michal Swiatkowski
2026-09-07 10:24 ` Michal Swiatkowski [this message]
2026-09-07 10:24 ` [PATCH iwl-next v1 07/10] libie, idpf: move parsing alloc vectors command " Michal Swiatkowski
2026-09-07 10:24 ` [PATCH iwl-next v1 08/10] ice: use libie_irq for interrupts managing Michal Swiatkowski
2026-09-07 10:24 ` [PATCH iwl-next v1 09/10] ixd: support for getting lan memory regions Michal Swiatkowski
2026-09-07 10:24 ` [PATCH iwl-next v1 10/10] ixd: use interrupt for mailbox communication Michal Swiatkowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260907102418.2697317-7-michal.swiatkowski@linux.intel.com \
--to=michal.swiatkowski@linux.intel.com \
--cc=ahmed.zaki@intel.com \
--cc=intel-wired-lan@lists.osuosl.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox