Skip to content

Commit 193ac9c

Browse files
committed
net: mana: Add handler for hardware servicing events
jira LE-4365 Rebuild_History Non-Buildable kernel-6.12.0-55.38.1.el10_0 commit-author Haiyang Zhang <haiyangz@microsoft.com> commit 7768c5f To collaborate with hardware servicing events, upon receiving the special EQE notification from the HW channel, remove the devices on this bus. Then, after a waiting period based on the device specs, rescan the parent bus to recover the devices. Signed-off-by: Haiyang Zhang <haiyangz@microsoft.com> Reviewed-by: Shradha Gupta <shradhagupta@linux.microsoft.com> Reviewed-by: Simon Horman <horms@kernel.org> Link: https://patch.msgid.link/1749834034-18498-1-git-send-email-haiyangz@linux.microsoft.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> (cherry picked from commit 7768c5f) Signed-off-by: Jonathan Maple <jmaple@ciq.com>
1 parent bc28fd4 commit 193ac9c

File tree

2 files changed

+83
-2
lines changed

2 files changed

+83
-2
lines changed

drivers/net/ethernet/microsoft/mana/gdma_main.c

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,11 +353,59 @@ void mana_gd_ring_cq(struct gdma_queue *cq, u8 arm_bit)
353353
head, arm_bit);
354354
}
355355

356+
#define MANA_SERVICE_PERIOD 10
357+
358+
struct mana_serv_work {
359+
struct work_struct serv_work;
360+
struct pci_dev *pdev;
361+
};
362+
363+
static void mana_serv_func(struct work_struct *w)
364+
{
365+
struct mana_serv_work *mns_wk;
366+
struct pci_bus *bus, *parent;
367+
struct pci_dev *pdev;
368+
369+
mns_wk = container_of(w, struct mana_serv_work, serv_work);
370+
pdev = mns_wk->pdev;
371+
372+
pci_lock_rescan_remove();
373+
374+
if (!pdev)
375+
goto out;
376+
377+
bus = pdev->bus;
378+
if (!bus) {
379+
dev_err(&pdev->dev, "MANA service: no bus\n");
380+
goto out;
381+
}
382+
383+
parent = bus->parent;
384+
if (!parent) {
385+
dev_err(&pdev->dev, "MANA service: no parent bus\n");
386+
goto out;
387+
}
388+
389+
pci_stop_and_remove_bus_device(bus->self);
390+
391+
msleep(MANA_SERVICE_PERIOD * 1000);
392+
393+
pci_rescan_bus(parent);
394+
395+
out:
396+
pci_unlock_rescan_remove();
397+
398+
pci_dev_put(pdev);
399+
kfree(mns_wk);
400+
module_put(THIS_MODULE);
401+
}
402+
356403
static void mana_gd_process_eqe(struct gdma_queue *eq)
357404
{
358405
u32 head = eq->head % (eq->queue_size / GDMA_EQE_SIZE);
359406
struct gdma_context *gc = eq->gdma_dev->gdma_context;
360407
struct gdma_eqe *eq_eqe_ptr = eq->queue_mem_ptr;
408+
struct mana_serv_work *mns_wk;
361409
union gdma_eqe_info eqe_info;
362410
enum gdma_eqe_type type;
363411
struct gdma_event event;
@@ -401,6 +449,33 @@ static void mana_gd_process_eqe(struct gdma_queue *eq)
401449
eq->eq.callback(eq->eq.context, eq, &event);
402450
break;
403451

452+
case GDMA_EQE_HWC_FPGA_RECONFIG:
453+
dev_info(gc->dev, "Recv MANA service type:%d\n", type);
454+
455+
if (gc->in_service) {
456+
dev_info(gc->dev, "Already in service\n");
457+
break;
458+
}
459+
460+
if (!try_module_get(THIS_MODULE)) {
461+
dev_info(gc->dev, "Module is unloading\n");
462+
break;
463+
}
464+
465+
mns_wk = kzalloc(sizeof(*mns_wk), GFP_ATOMIC);
466+
if (!mns_wk) {
467+
module_put(THIS_MODULE);
468+
break;
469+
}
470+
471+
dev_info(gc->dev, "Start MANA service type:%d\n", type);
472+
gc->in_service = true;
473+
mns_wk->pdev = to_pci_dev(gc->dev);
474+
pci_dev_get(mns_wk->pdev);
475+
INIT_WORK(&mns_wk->serv_work, mana_serv_func);
476+
schedule_work(&mns_wk->serv_work);
477+
break;
478+
404479
default:
405480
break;
406481
}

include/net/mana/gdma.h

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ enum gdma_eqe_type {
5858
GDMA_EQE_HWC_INIT_EQ_ID_DB = 129,
5959
GDMA_EQE_HWC_INIT_DATA = 130,
6060
GDMA_EQE_HWC_INIT_DONE = 131,
61-
GDMA_EQE_HWC_SOC_RECONFIG = 132,
61+
GDMA_EQE_HWC_FPGA_RECONFIG = 132,
6262
GDMA_EQE_HWC_SOC_RECONFIG_DATA = 133,
6363
GDMA_EQE_RNIC_QP_FATAL = 176,
6464
};
@@ -388,6 +388,8 @@ struct gdma_context {
388388
u32 test_event_eq_id;
389389

390390
bool is_pf;
391+
bool in_service;
392+
391393
phys_addr_t bar0_pa;
392394
void __iomem *bar0_va;
393395
void __iomem *shm_base;
@@ -558,12 +560,16 @@ enum {
558560
/* Driver can handle holes (zeros) in the device list */
559561
#define GDMA_DRV_CAP_FLAG_1_DEV_LIST_HOLES_SUP BIT(11)
560562

563+
/* Driver can self reset on FPGA Reconfig EQE notification */
564+
#define GDMA_DRV_CAP_FLAG_1_HANDLE_RECONFIG_EQE BIT(17)
565+
561566
#define GDMA_DRV_CAP_FLAGS1 \
562567
(GDMA_DRV_CAP_FLAG_1_EQ_SHARING_MULTI_VPORT | \
563568
GDMA_DRV_CAP_FLAG_1_NAPI_WKDONE_FIX | \
564569
GDMA_DRV_CAP_FLAG_1_HWC_TIMEOUT_RECONFIG | \
565570
GDMA_DRV_CAP_FLAG_1_VARIABLE_INDIRECTION_TABLE_SUPPORT | \
566-
GDMA_DRV_CAP_FLAG_1_DEV_LIST_HOLES_SUP)
571+
GDMA_DRV_CAP_FLAG_1_DEV_LIST_HOLES_SUP | \
572+
GDMA_DRV_CAP_FLAG_1_HANDLE_RECONFIG_EQE)
567573

568574
#define GDMA_DRV_CAP_FLAGS2 0
569575

0 commit comments

Comments
 (0)