diff --git a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c
index 3e9c89b0..9df3ef55 100644
--- a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c
+++ b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.c
@@ -1267,6 +1267,10 @@ static void ether_free_irqs(struct ether_priv_data *pdata)
 	unsigned int chan;
 
 	if (pdata->common_irq_alloc_mask & 1U) {
+		if ((pdata->osi_core->mac == OSI_MAC_HW_MGBE) &&
+		    (pdata->osi_core->use_virtualization == OSI_DISABLE)) {
+			irq_set_affinity_hint(pdata->common_irq, NULL);
+		}
 		devm_free_irq(pdata->dev, pdata->common_irq, pdata);
 		pdata->common_irq_alloc_mask = 0U;
 	}
@@ -1461,8 +1465,18 @@ static int ether_request_irqs(struct ether_priv_data *pdata)
 			pdata->common_irq);
 		return ret;
 	}
+
 	pdata->common_irq_alloc_mask = 1;
 
+	if ((osi_core->mac == OSI_MAC_HW_MGBE) &&
+	    (cpu_online(pdata->common_isr_cpu_id)) &&
+	    (osi_core->use_virtualization == OSI_DISABLE)) {
+		cpumask_set_cpu(pdata->common_isr_cpu_id,
+				&pdata->common_isr_cpu_mask);
+		irq_set_affinity_hint(pdata->common_irq,
+				      &pdata->common_isr_cpu_mask);
+	}
+
 	if (osi_core->mac_ver > OSI_EQOS_MAC_5_00 ||
 	    osi_core->mac == OSI_MAC_HW_MGBE) {
 		for (i = 0; i < osi_core->num_vm_irqs; i++) {
@@ -5350,6 +5364,14 @@ static int ether_parse_dt(struct ether_priv_data *pdata)
 		dev_info(dev, "setting default promiscuous mode supported\n");
 		pdata->promisc_mode = OSI_ENABLE;
 	}
+
+	ret = of_property_read_u32(np, "nvidia,common_irq-cpu-id",
+				   &pdata->common_isr_cpu_id);
+	if (ret < 0) {
+		pdata->common_isr_cpu_id = ETHER_COMMON_IRQ_DEFAULT_CPU;
+		ret = 0;
+	}
+
 	/* any other invalid promiscuous mode DT value */
 	if (pdata->promisc_mode != OSI_DISABLE &&
 	    pdata->promisc_mode != OSI_ENABLE){
diff --git a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.h b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.h
index 456af4e8..238cd8c9 100644
--- a/drivers/net/ethernet/nvidia/nvethernet/ether_linux.h
+++ b/drivers/net/ethernet/nvidia/nvethernet/ether_linux.h
@@ -36,6 +36,7 @@
 #include <linux/module.h>
 #include <linux/reset.h>
 #include <linux/slab.h>
+#include <linux/smp.h>
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/tcp.h>
@@ -84,6 +85,10 @@
  * @brief Size of Ethernet IRQ name.
  */
 #define ETHER_IRQ_NAME_SZ		32
+/**
+ * @brief CPU to handle ethernet common interrupt
+ */
+#define ETHER_COMMON_IRQ_DEFAULT_CPU	4U
 
 /**
  * @addtogroup MAC address DT string
@@ -466,6 +471,10 @@ struct ether_priv_data {
 	unsigned int common_irq_alloc_mask;
 	/** Common IRQ number for MAC */
 	int common_irq;
+	/** CPU affinity mask for Common IRQ */
+	cpumask_t common_isr_cpu_mask;
+	/** CPU ID for handling Common IRQ */
+	unsigned int common_isr_cpu_id;
 	/** Array of DMA Transmit channel IRQ numbers */
 	int tx_irqs[ETHER_MAX_IRQS];
 	/** Array of DMA Receive channel IRQ numbers */