Received: by 2002:ac0:a5a6:0:0:0:0:0 with SMTP id m35-v6csp2457058imm; Tue, 4 Sep 2018 04:57:47 -0700 (PDT) X-Google-Smtp-Source: ANB0VdY6IiuvXY7OWLJNa1KUvHodEOI/Ak5tAfHOmmyfijgzy9RxFbamNUUQ4DCIe6tlPVnASwRQ X-Received: by 2002:a17:902:6b0b:: with SMTP id o11-v6mr33123608plk.214.1536062267356; Tue, 04 Sep 2018 04:57:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536062267; cv=none; d=google.com; s=arc-20160816; b=FB+NXPC3uy8HI/tVv5UyICDJGFbxgSx0x0f7Tk1Ta9q8DybTXoIMU2H7VWIAz+0LhM mlfTcnGf5BPMYNENWHONsXdXQ6w3d6U6mbvLcLg2uBHLARpuYRfbWwVGzN/E6ZENO6RB IBT3Cc7N0Ri7mJxCBeCwN933hT+Al4Ka5ZzRFO1IBM+n0nQY8PhOr/cXZB0YlKe00qKp dpM4QVpjD0hCVUFzg3KqAbAILpiIYyYNdPovdwZlbFmo8MEQju7lwudZYcejuKHa71Uh DET1943a/NXsetQCoAiHkhVzuIT525BE0xoguEFYMDfICPhVa0Y2VH5hNK6o4zEMRfGS Rokg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=bD1MxRLgpDynhenUMtxV06TIQ+lkhLirw3i7l5ZgMHw=; b=U1GDoxkY52oINM8A4WYjl2VWHFDxYz457tTjaqzg1ztb/5HEt0jTI9PT9Niw4Ao1zI S0kUt0X+Dyg5VbiJXgpAAhIJ+Pv6a45/T5pNvNkkx0iypp/WdN6oYZiluQ6Snb6UvXQn CtUsRs02eiEtzeM0/bncd6jSzP5CQr6Ew+7mgg2zvy2uZ3/H4wstytERVASN5PYb9hWi 7Ho+Y8NSGNcSg4IO/BLDFqxO8N8jiBvHicRuOlVyjcIPtoxJZQTiAzeUAvPvckGVs6c3 dsb3fDnCiIamjjWCNju8KDwXPUgyt64ADGyAO/a4c+3eF6rvcTNig3N3dCBGHgf+F5MC sHXQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=tBpXvFmO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d37-v6si21200829plb.430.2018.09.04.04.57.31; Tue, 04 Sep 2018 04:57:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20161025 header.b=tBpXvFmO; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727687AbeIDQU6 (ORCPT + 99 others); Tue, 4 Sep 2018 12:20:58 -0400 Received: from mail-pf1-f195.google.com ([209.85.210.195]:46141 "EHLO mail-pf1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727650AbeIDQU5 (ORCPT ); Tue, 4 Sep 2018 12:20:57 -0400 Received: by mail-pf1-f195.google.com with SMTP id u24-v6so1564295pfn.13; Tue, 04 Sep 2018 04:56:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bD1MxRLgpDynhenUMtxV06TIQ+lkhLirw3i7l5ZgMHw=; b=tBpXvFmOo74lLeCn61QEHNOw36E/sVLDv9FEevDRSla+jSLx88exrBc0RdoV4BObIP d3UwEhAecS23RMDO4ayuZ9LtGjtCt9XcCvmSRnjNqCAcVqShCj6wDGT772Gwd28dVgI+ /Th6Pb6iCEtObb6+qnq0dgJlu4lfUZNi/gyK1NKLZzhg+Zsk+xaKK36Z0K0qnBVKvMEe 7npfhPyVOtu2a1V4rmr8qxMBp3KgYi2kH88zT4+Rko/Kb9FbnEHLvqi5BlNg+I9Kcc7Q d4qvNVkpFjzaP9ZIcmec4DaS6+6hXbYIMEc7sbmK0RmwiDOQcrrfSCHfTqvAUYTBh4PC 550w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=bD1MxRLgpDynhenUMtxV06TIQ+lkhLirw3i7l5ZgMHw=; b=du/i52lWklN3HX+t/iGBE+kHEfr4qnHg+kgOTJvczRsECRB7j+fIfWLTz8NXLjkgXm wTphZ8MPWoe97K+DswyLpuAzfUmdF1SOJlBDlukAyG1M1mzEDUOQYgzLCrwCpatnQo+t cjFFPRcidnxSUNIbTkUM3OuQXfLD2q97IX3aJ2g55X8L96lTR6USd+Irko5mkt76gaNK PctiGggVGFcm8YzxhOTYIQ5lnnCVh+ZpuW3Ia7HEGjrohUPOKhPmyM0/GdW2azoNy3V/ MdqMvoukgxE9FZAOWY1qnHRyGu6APMTyt86/lTv15tRzLt837theWgeZYfzae1hLY20q kaNA== X-Gm-Message-State: APzg51DS1kGdXlAA6IPYSbC9BLxrGBPAyJw7LJN9zp9AAr6MzePIyyBi vqgMbKFqOoPIb9D1uml+jtZ7FDxs X-Received: by 2002:a63:946:: with SMTP id 67-v6mr22073863pgj.132.1536062167432; Tue, 04 Sep 2018 04:56:07 -0700 (PDT) Received: from machine421.caveonetworks.com ([115.113.156.2]) by smtp.googlemail.com with ESMTPSA id u184-v6sm29740190pgd.46.2018.09.04.04.56.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 04 Sep 2018 04:56:06 -0700 (PDT) From: sunil.kovvuri@gmail.com To: linux-kernel@vger.kernel.org, arnd@arndb.de, olof@lixom.net Cc: linux-arm-kernel@lists.infradead.org, linux-soc@vger.kernel.org, andrew@lunn.ch, davem@davemloft.net, Linu Cherian Subject: [PATCH v2 14/15] soc: octeontx2: Register for CGX lmac events Date: Tue, 4 Sep 2018 17:24:49 +0530 Message-Id: <1536062090-30446-15-git-send-email-sunil.kovvuri@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1536062090-30446-1-git-send-email-sunil.kovvuri@gmail.com> References: <1536062090-30446-1-git-send-email-sunil.kovvuri@gmail.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Linu Cherian Added support in RVU AF driver to register for CGX LMAC link status change events from firmware and managing them. Processing part will be added in followup patches. - Introduced eventqueue for posting events from cgx lmac. Queueing mechanism will ensure that events can be posted and firmware can be acked immediately and hence event reception and processing are decoupled. - Events gets added to the queue by notification callback. Notification callback is expected to be atomic, since it is called from interrupt context. - Events are dequeued and processed in a worker thread. Signed-off-by: Linu Cherian --- drivers/soc/marvell/octeontx2/rvu.c | 6 +- drivers/soc/marvell/octeontx2/rvu.h | 5 ++ drivers/soc/marvell/octeontx2/rvu_cgx.c | 101 +++++++++++++++++++++++++++++++- 3 files changed, 108 insertions(+), 4 deletions(-) diff --git a/drivers/soc/marvell/octeontx2/rvu.c b/drivers/soc/marvell/octeontx2/rvu.c index faf7d0f..282982f 100644 --- a/drivers/soc/marvell/octeontx2/rvu.c +++ b/drivers/soc/marvell/octeontx2/rvu.c @@ -1564,10 +1564,11 @@ static int rvu_probe(struct pci_dev *pdev, const struct pci_device_id *id) err = rvu_register_interrupts(rvu); if (err) - goto err_mbox; + goto err_cgx; return 0; - +err_cgx: + rvu_cgx_wq_destroy(rvu); err_mbox: rvu_mbox_destroy(rvu); err_hwsetup: @@ -1589,6 +1590,7 @@ static void rvu_remove(struct pci_dev *pdev) struct rvu *rvu = pci_get_drvdata(pdev); rvu_unregister_interrupts(rvu); + rvu_cgx_wq_destroy(rvu); rvu_mbox_destroy(rvu); rvu_reset_all_blocks(rvu); rvu_free_hw_resources(rvu); diff --git a/drivers/soc/marvell/octeontx2/rvu.h b/drivers/soc/marvell/octeontx2/rvu.h index 385f597..d169fa9 100644 --- a/drivers/soc/marvell/octeontx2/rvu.h +++ b/drivers/soc/marvell/octeontx2/rvu.h @@ -110,6 +110,10 @@ struct rvu { * every cgx lmac port */ void **cgx_idmap; /* cgx id to cgx data map table */ + struct work_struct cgx_evh_work; + struct workqueue_struct *cgx_evh_wq; + spinlock_t cgx_evq_lock; /* cgx event queue lock */ + struct list_head cgx_evq_head; /* cgx event queue head */ }; static inline void rvu_write64(struct rvu *rvu, u64 block, u64 offset, u64 val) @@ -150,4 +154,5 @@ int rvu_poll_reg(struct rvu *rvu, u64 block, u64 offset, u64 mask, bool zero); /* CGX APIs */ int rvu_cgx_probe(struct rvu *rvu); +void rvu_cgx_wq_destroy(struct rvu *rvu); #endif /* RVU_H */ diff --git a/drivers/soc/marvell/octeontx2/rvu_cgx.c b/drivers/soc/marvell/octeontx2/rvu_cgx.c index bf81507..2359806e 100644 --- a/drivers/soc/marvell/octeontx2/rvu_cgx.c +++ b/drivers/soc/marvell/octeontx2/rvu_cgx.c @@ -15,6 +15,11 @@ #include "rvu.h" #include "cgx.h" +struct cgx_evq_entry { + struct list_head evq_node; + struct cgx_link_event link_event; +}; + static inline u8 cgxlmac_id_to_bmap(u8 cgx_id, u8 lmac_id) { return ((cgx_id & 0xF) << 4) | (lmac_id & 0xF); @@ -72,9 +77,95 @@ static int rvu_map_cgx_lmac_pf(struct rvu *rvu) return 0; } +/* This is called from interrupt context and is expected to be atomic */ +static int cgx_lmac_postevent(struct cgx_link_event *event, void *data) +{ + struct rvu *rvu = data; + struct cgx_evq_entry *qentry; + + /* post event to the event queue */ + qentry = kmalloc(sizeof(*qentry), GFP_ATOMIC); + if (!qentry) + return -ENOMEM; + qentry->link_event = *event; + spin_lock(&rvu->cgx_evq_lock); + list_add_tail(&qentry->evq_node, &rvu->cgx_evq_head); + spin_unlock(&rvu->cgx_evq_lock); + + /* start worker to process the events */ + queue_work(rvu->cgx_evh_wq, &rvu->cgx_evh_work); + + return 0; +} + +static void cgx_evhandler_task(struct work_struct *work) +{ + struct rvu *rvu = container_of(work, struct rvu, cgx_evh_work); + struct cgx_evq_entry *qentry; + struct cgx_link_event *event; + unsigned long flags; + + do { + /* Dequeue an event */ + spin_lock_irqsave(&rvu->cgx_evq_lock, flags); + qentry = list_first_entry_or_null(&rvu->cgx_evq_head, + struct cgx_evq_entry, + evq_node); + if (qentry) + list_del(&qentry->evq_node); + spin_unlock_irqrestore(&rvu->cgx_evq_lock, flags); + if (!qentry) + break; /* nothing more to process */ + + event = &qentry->link_event; + + /* Do nothing for now */ + kfree(qentry); + } while (1); +} + +static void cgx_lmac_event_handler_init(struct rvu *rvu) +{ + struct cgx_event_cb cb; + int cgx, lmac, err; + void *cgxd; + + spin_lock_init(&rvu->cgx_evq_lock); + INIT_LIST_HEAD(&rvu->cgx_evq_head); + INIT_WORK(&rvu->cgx_evh_work, cgx_evhandler_task); + rvu->cgx_evh_wq = alloc_workqueue("rvu_evh_wq", 0, 0); + if (!rvu->cgx_evh_wq) { + dev_err(rvu->dev, "alloc workqueue failed"); + return; + } + + cb.notify_link_chg = cgx_lmac_postevent; /* link change call back */ + cb.data = rvu; + + for (cgx = 0; cgx < rvu->cgx_cnt; cgx++) { + cgxd = rvu_cgx_pdata(cgx, rvu); + for (lmac = 0; lmac < cgx_get_lmac_cnt(cgxd); lmac++) { + err = cgx_lmac_evh_register(&cb, cgxd, lmac); + if (err) + dev_err(rvu->dev, + "%d:%d handler register failed\n", + cgx, lmac); + } + } +} + +void rvu_cgx_wq_destroy(struct rvu *rvu) +{ + if (rvu->cgx_evh_wq) { + flush_workqueue(rvu->cgx_evh_wq); + destroy_workqueue(rvu->cgx_evh_wq); + rvu->cgx_evh_wq = NULL; + } +} + int rvu_cgx_probe(struct rvu *rvu) { - int i; + int i, err; /* find available cgx ports */ rvu->cgx_cnt = cgx_get_cgx_cnt(); @@ -93,5 +184,11 @@ int rvu_cgx_probe(struct rvu *rvu) rvu->cgx_idmap[i] = cgx_get_pdata(i); /* Map CGX LMAC interfaces to RVU PFs */ - return rvu_map_cgx_lmac_pf(rvu); + err = rvu_map_cgx_lmac_pf(rvu); + if (err) + return err; + + /* Register for CGX events */ + cgx_lmac_event_handler_init(rvu); + return 0; } -- 2.7.4