Skip to content

Commit 7768c5f

Browse files
haiyangzkuba-moo
authored andcommitted
net: mana: Add handler for hardware servicing events
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 <[email protected]> Reviewed-by: Shradha Gupta <[email protected]> Reviewed-by: Simon Horman <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 7aa3f99 commit 7768c5f

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
@@ -352,11 +352,59 @@ void mana_gd_ring_cq(struct gdma_queue *cq, u8 arm_bit)
352352
}
353353
EXPORT_SYMBOL_NS(mana_gd_ring_cq, "NET_MANA");
354354

355+
#define MANA_SERVICE_PERIOD 10
356+
357+
struct mana_serv_work {
358+
struct work_struct serv_work;
359+
struct pci_dev *pdev;
360+
};
361+
362+
static void mana_serv_func(struct work_struct *w)
363+
{
364+
struct mana_serv_work *mns_wk;
365+
struct pci_bus *bus, *parent;
366+
struct pci_dev *pdev;
367+
368+
mns_wk = container_of(w, struct mana_serv_work, serv_work);
369+
pdev = mns_wk->pdev;
370+
371+
pci_lock_rescan_remove();
372+
373+
if (!pdev)
374+
goto out;
375+
376+
bus = pdev->bus;
377+
if (!bus) {
378+
dev_err(&pdev->dev, "MANA service: no bus\n");
379+
goto out;
380+
}
381+
382+
parent = bus->parent;
383+
if (!parent) {
384+
dev_err(&pdev->dev, "MANA service: no parent bus\n");
385+
goto out;
386+
}
387+
388+
pci_stop_and_remove_bus_device(bus->self);
389+
390+
msleep(MANA_SERVICE_PERIOD * 1000);
391+
392+
pci_rescan_bus(parent);
393+
394+
out:
395+
pci_unlock_rescan_remove();
396+
397+
pci_dev_put(pdev);
398+
kfree(mns_wk);
399+
module_put(THIS_MODULE);
400+
}
401+
355402
static void mana_gd_process_eqe(struct gdma_queue *eq)
356403
{
357404
u32 head = eq->head % (eq->queue_size / GDMA_EQE_SIZE);
358405
struct gdma_context *gc = eq->gdma_dev->gdma_context;
359406
struct gdma_eqe *eq_eqe_ptr = eq->queue_mem_ptr;
407+
struct mana_serv_work *mns_wk;
360408
union gdma_eqe_info eqe_info;
361409
enum gdma_eqe_type type;
362410
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_HWC_SOC_SERVICE = 134,
6464
GDMA_EQE_RNIC_QP_FATAL = 176,
@@ -403,6 +403,8 @@ struct gdma_context {
403403
u32 test_event_eq_id;
404404

405405
bool is_pf;
406+
bool in_service;
407+
406408
phys_addr_t bar0_pa;
407409
void __iomem *bar0_va;
408410
void __iomem *shm_base;
@@ -578,12 +580,16 @@ enum {
578580
/* Driver can handle holes (zeros) in the device list */
579581
#define GDMA_DRV_CAP_FLAG_1_DEV_LIST_HOLES_SUP BIT(11)
580582

583+
/* Driver can self reset on FPGA Reconfig EQE notification */
584+
#define GDMA_DRV_CAP_FLAG_1_HANDLE_RECONFIG_EQE BIT(17)
585+
581586
#define GDMA_DRV_CAP_FLAGS1 \
582587
(GDMA_DRV_CAP_FLAG_1_EQ_SHARING_MULTI_VPORT | \
583588
GDMA_DRV_CAP_FLAG_1_NAPI_WKDONE_FIX | \
584589
GDMA_DRV_CAP_FLAG_1_HWC_TIMEOUT_RECONFIG | \
585590
GDMA_DRV_CAP_FLAG_1_VARIABLE_INDIRECTION_TABLE_SUPPORT | \
586-
GDMA_DRV_CAP_FLAG_1_DEV_LIST_HOLES_SUP)
591+
GDMA_DRV_CAP_FLAG_1_DEV_LIST_HOLES_SUP | \
592+
GDMA_DRV_CAP_FLAG_1_HANDLE_RECONFIG_EQE)
587593

588594
#define GDMA_DRV_CAP_FLAGS2 0
589595

0 commit comments

Comments
 (0)