Skip to content

Commit 6f608e2

Browse files
net: mana: Add handler for hardware servicing events
jira LE-3919 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: Shreeya Patel <spatel@ciq.com> Signed-off-by: Jonathan Maple <jmaple@ciq.com> Signed-off-by: Shreeya Patel <spatel@ciq.com>
1 parent f4e2987 commit 6f608e2

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
@@ -351,11 +351,59 @@ void mana_gd_ring_cq(struct gdma_queue *cq, u8 arm_bit)
351351
head, arm_bit);
352352
}
353353

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

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

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
};
@@ -387,6 +387,8 @@ struct gdma_context {
387387
u32 test_event_eq_id;
388388

389389
bool is_pf;
390+
bool in_service;
391+
390392
phys_addr_t bar0_pa;
391393
void __iomem *bar0_va;
392394
void __iomem *shm_base;
@@ -557,12 +559,16 @@ enum {
557559
/* Driver can handle holes (zeros) in the device list */
558560
#define GDMA_DRV_CAP_FLAG_1_DEV_LIST_HOLES_SUP BIT(11)
559561

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

567573
#define GDMA_DRV_CAP_FLAGS2 0
568574

0 commit comments

Comments
 (0)