Skip to content

Commit 8905a2c

Browse files
author
Paolo Abeni
committed
Merge branch 'net-txgbe-fix-msi-and-intx-interrupts'
Jiawen Wu says: ==================== net: txgbe: fix MSI and INTx interrupts Fix MSI and INTx interrupts for txgbe driver. changes in v3: - Add flag wx->misc_irq_domain. - Separate commits. - Detail null-defer events. changes in v2: https://lore.kernel.org/all/[email protected] - Split into two commits. - Detail commit description. v1: https://lore.kernel.org/all/[email protected] ==================== Link: https://patch.msgid.link/[email protected] Signed-off-by: Paolo Abeni <[email protected]>
2 parents b698ab5 + 935124d commit 8905a2c

File tree

7 files changed

+64
-85
lines changed

7 files changed

+64
-85
lines changed

‎drivers/net/ethernet/wangxun/libwx/wx_hw.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1959,6 +1959,7 @@ int wx_sw_init(struct wx *wx)
19591959
}
19601960

19611961
bitmap_zero(wx->state, WX_STATE_NBITS);
1962+
wx->misc_irq_domain = false;
19621963

19631964
return 0;
19641965
}

‎drivers/net/ethernet/wangxun/libwx/wx_lib.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1686,6 +1686,7 @@ static int wx_set_interrupt_capability(struct wx *wx)
16861686
}
16871687

16881688
pdev->irq = pci_irq_vector(pdev, 0);
1689+
wx->num_q_vectors = 1;
16891690

16901691
return 0;
16911692
}
@@ -1996,7 +1997,8 @@ void wx_free_irq(struct wx *wx)
19961997
int vector;
19971998

19981999
if (!(pdev->msix_enabled)) {
1999-
free_irq(pdev->irq, wx);
2000+
if (!wx->misc_irq_domain)
2001+
free_irq(pdev->irq, wx);
20002002
return;
20012003
}
20022004

@@ -2011,7 +2013,7 @@ void wx_free_irq(struct wx *wx)
20112013
free_irq(entry->vector, q_vector);
20122014
}
20132015

2014-
if (wx->mac.type == wx_mac_em)
2016+
if (!wx->misc_irq_domain)
20152017
free_irq(wx->msix_entry->vector, wx);
20162018
}
20172019
EXPORT_SYMBOL(wx_free_irq);
@@ -2026,6 +2028,9 @@ int wx_setup_isb_resources(struct wx *wx)
20262028
{
20272029
struct pci_dev *pdev = wx->pdev;
20282030

2031+
if (wx->isb_mem)
2032+
return 0;
2033+
20292034
wx->isb_mem = dma_alloc_coherent(&pdev->dev,
20302035
sizeof(u32) * 4,
20312036
&wx->isb_dma,
@@ -2385,7 +2390,6 @@ static void wx_free_all_tx_resources(struct wx *wx)
23852390

23862391
void wx_free_resources(struct wx *wx)
23872392
{
2388-
wx_free_isb_resources(wx);
23892393
wx_free_all_rx_resources(wx);
23902394
wx_free_all_tx_resources(wx);
23912395
}

‎drivers/net/ethernet/wangxun/libwx/wx_type.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1058,6 +1058,7 @@ struct wx {
10581058
dma_addr_t isb_dma;
10591059
u32 *isb_mem;
10601060
u32 isb_tag[WX_ISB_MAX];
1061+
bool misc_irq_domain;
10611062

10621063
#define WX_MAX_RETA_ENTRIES 128
10631064
#define WX_RSS_INDIR_TBL_MAX 64

‎drivers/net/ethernet/wangxun/ngbe/ngbe_main.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,7 @@ static int ngbe_open(struct net_device *netdev)
387387
err_free_irq:
388388
wx_free_irq(wx);
389389
err_free_resources:
390+
wx_free_isb_resources(wx);
390391
wx_free_resources(wx);
391392
return err;
392393
}
@@ -408,6 +409,7 @@ static int ngbe_close(struct net_device *netdev)
408409

409410
ngbe_down(wx);
410411
wx_free_irq(wx);
412+
wx_free_isb_resources(wx);
411413
wx_free_resources(wx);
412414
phylink_disconnect_phy(wx->phylink);
413415
wx_control_hw(wx, false);

‎drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c

Lines changed: 47 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -27,57 +27,19 @@ void txgbe_irq_enable(struct wx *wx, bool queues)
2727
}
2828

2929
/**
30-
* txgbe_intr - msi/legacy mode Interrupt Handler
31-
* @irq: interrupt number
32-
* @data: pointer to a network interface device structure
33-
**/
34-
static irqreturn_t txgbe_intr(int __always_unused irq, void *data)
35-
{
36-
struct wx_q_vector *q_vector;
37-
struct wx *wx = data;
38-
struct pci_dev *pdev;
39-
u32 eicr;
40-
41-
q_vector = wx->q_vector[0];
42-
pdev = wx->pdev;
43-
44-
eicr = wx_misc_isb(wx, WX_ISB_VEC0);
45-
if (!eicr) {
46-
/* shared interrupt alert!
47-
* the interrupt that we masked before the ICR read.
48-
*/
49-
if (netif_running(wx->netdev))
50-
txgbe_irq_enable(wx, true);
51-
return IRQ_NONE; /* Not our interrupt */
52-
}
53-
wx->isb_mem[WX_ISB_VEC0] = 0;
54-
if (!(pdev->msi_enabled))
55-
wr32(wx, WX_PX_INTA, 1);
56-
57-
wx->isb_mem[WX_ISB_MISC] = 0;
58-
/* would disable interrupts here but it is auto disabled */
59-
napi_schedule_irqoff(&q_vector->napi);
60-
61-
/* re-enable link(maybe) and non-queue interrupts, no flush.
62-
* txgbe_poll will re-enable the queue interrupts
63-
*/
64-
if (netif_running(wx->netdev))
65-
txgbe_irq_enable(wx, false);
66-
67-
return IRQ_HANDLED;
68-
}
69-
70-
/**
71-
* txgbe_request_msix_irqs - Initialize MSI-X interrupts
30+
* txgbe_request_queue_irqs - Initialize MSI-X queue interrupts
7231
* @wx: board private structure
7332
*
74-
* Allocate MSI-X vectors and request interrupts from the kernel.
33+
* Allocate MSI-X queue vectors and request interrupts from the kernel.
7534
**/
76-
static int txgbe_request_msix_irqs(struct wx *wx)
35+
int txgbe_request_queue_irqs(struct wx *wx)
7736
{
7837
struct net_device *netdev = wx->netdev;
7938
int vector, err;
8039

40+
if (!wx->pdev->msix_enabled)
41+
return 0;
42+
8143
for (vector = 0; vector < wx->num_q_vectors; vector++) {
8244
struct wx_q_vector *q_vector = wx->q_vector[vector];
8345
struct msix_entry *entry = &wx->msix_q_entries[vector];
@@ -110,34 +72,6 @@ static int txgbe_request_msix_irqs(struct wx *wx)
11072
return err;
11173
}
11274

113-
/**
114-
* txgbe_request_irq - initialize interrupts
115-
* @wx: board private structure
116-
*
117-
* Attempt to configure interrupts using the best available
118-
* capabilities of the hardware and kernel.
119-
**/
120-
int txgbe_request_irq(struct wx *wx)
121-
{
122-
struct net_device *netdev = wx->netdev;
123-
struct pci_dev *pdev = wx->pdev;
124-
int err;
125-
126-
if (pdev->msix_enabled)
127-
err = txgbe_request_msix_irqs(wx);
128-
else if (pdev->msi_enabled)
129-
err = request_irq(wx->pdev->irq, &txgbe_intr, 0,
130-
netdev->name, wx);
131-
else
132-
err = request_irq(wx->pdev->irq, &txgbe_intr, IRQF_SHARED,
133-
netdev->name, wx);
134-
135-
if (err)
136-
wx_err(wx, "request_irq failed, Error %d\n", err);
137-
138-
return err;
139-
}
140-
14175
static int txgbe_request_gpio_irq(struct txgbe *txgbe)
14276
{
14377
txgbe->gpio_irq = irq_find_mapping(txgbe->misc.domain, TXGBE_IRQ_GPIO);
@@ -177,6 +111,36 @@ static const struct irq_domain_ops txgbe_misc_irq_domain_ops = {
177111
};
178112

179113
static irqreturn_t txgbe_misc_irq_handle(int irq, void *data)
114+
{
115+
struct wx_q_vector *q_vector;
116+
struct txgbe *txgbe = data;
117+
struct wx *wx = txgbe->wx;
118+
u32 eicr;
119+
120+
if (wx->pdev->msix_enabled)
121+
return IRQ_WAKE_THREAD;
122+
123+
eicr = wx_misc_isb(wx, WX_ISB_VEC0);
124+
if (!eicr) {
125+
/* shared interrupt alert!
126+
* the interrupt that we masked before the ICR read.
127+
*/
128+
if (netif_running(wx->netdev))
129+
txgbe_irq_enable(wx, true);
130+
return IRQ_NONE; /* Not our interrupt */
131+
}
132+
wx->isb_mem[WX_ISB_VEC0] = 0;
133+
if (!(wx->pdev->msi_enabled))
134+
wr32(wx, WX_PX_INTA, 1);
135+
136+
/* would disable interrupts here but it is auto disabled */
137+
q_vector = wx->q_vector[0];
138+
napi_schedule_irqoff(&q_vector->napi);
139+
140+
return IRQ_WAKE_THREAD;
141+
}
142+
143+
static irqreturn_t txgbe_misc_irq_thread_fn(int irq, void *data)
180144
{
181145
struct txgbe *txgbe = data;
182146
struct wx *wx = txgbe->wx;
@@ -223,6 +187,7 @@ void txgbe_free_misc_irq(struct txgbe *txgbe)
223187

224188
int txgbe_setup_misc_irq(struct txgbe *txgbe)
225189
{
190+
unsigned long flags = IRQF_ONESHOT;
226191
struct wx *wx = txgbe->wx;
227192
int hwirq, err;
228193

@@ -236,14 +201,17 @@ int txgbe_setup_misc_irq(struct txgbe *txgbe)
236201
irq_create_mapping(txgbe->misc.domain, hwirq);
237202

238203
txgbe->misc.chip = txgbe_irq_chip;
239-
if (wx->pdev->msix_enabled)
204+
if (wx->pdev->msix_enabled) {
240205
txgbe->misc.irq = wx->msix_entry->vector;
241-
else
206+
} else {
242207
txgbe->misc.irq = wx->pdev->irq;
208+
if (!wx->pdev->msi_enabled)
209+
flags |= IRQF_SHARED;
210+
}
243211

244-
err = request_threaded_irq(txgbe->misc.irq, NULL,
245-
txgbe_misc_irq_handle,
246-
IRQF_ONESHOT,
212+
err = request_threaded_irq(txgbe->misc.irq, txgbe_misc_irq_handle,
213+
txgbe_misc_irq_thread_fn,
214+
flags,
247215
wx->netdev->name, txgbe);
248216
if (err)
249217
goto del_misc_irq;
@@ -256,6 +224,8 @@ int txgbe_setup_misc_irq(struct txgbe *txgbe)
256224
if (err)
257225
goto free_gpio_irq;
258226

227+
wx->misc_irq_domain = true;
228+
259229
return 0;
260230

261231
free_gpio_irq:

‎drivers/net/ethernet/wangxun/txgbe/txgbe_irq.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
/* Copyright (c) 2015 - 2024 Beijing WangXun Technology Co., Ltd. */
33

44
void txgbe_irq_enable(struct wx *wx, bool queues);
5-
int txgbe_request_irq(struct wx *wx);
5+
int txgbe_request_queue_irqs(struct wx *wx);
66
void txgbe_free_misc_irq(struct txgbe *txgbe);
77
int txgbe_setup_misc_irq(struct txgbe *txgbe);

‎drivers/net/ethernet/wangxun/txgbe/txgbe_main.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -294,9 +294,9 @@ static int txgbe_open(struct net_device *netdev)
294294

295295
wx_configure(wx);
296296

297-
err = txgbe_request_irq(wx);
297+
err = txgbe_request_queue_irqs(wx);
298298
if (err)
299-
goto err_free_isb;
299+
goto err_free_resources;
300300

301301
/* Notify the stack of the actual queue counts. */
302302
err = netif_set_real_num_tx_queues(netdev, wx->num_tx_queues);
@@ -313,8 +313,8 @@ static int txgbe_open(struct net_device *netdev)
313313

314314
err_free_irq:
315315
wx_free_irq(wx);
316-
err_free_isb:
317-
wx_free_isb_resources(wx);
316+
err_free_resources:
317+
wx_free_resources(wx);
318318
err_reset:
319319
txgbe_reset(wx);
320320

@@ -729,6 +729,7 @@ static void txgbe_remove(struct pci_dev *pdev)
729729

730730
txgbe_remove_phy(txgbe);
731731
txgbe_free_misc_irq(txgbe);
732+
wx_free_isb_resources(wx);
732733

733734
pci_release_selected_regions(pdev,
734735
pci_select_bars(pdev, IORESOURCE_MEM));

0 commit comments

Comments
 (0)