From patchwork Mon Jan 27 13:05:22 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sunil Kovvuri X-Patchwork-Id: 1229791 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=nCIs5Esv; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 485qkX4fgWz9s1x for ; Tue, 28 Jan 2020 00:06:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727534AbgA0NGL (ORCPT ); Mon, 27 Jan 2020 08:06:11 -0500 Received: from mail-pj1-f67.google.com ([209.85.216.67]:35070 "EHLO mail-pj1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725828AbgA0NGL (ORCPT ); Mon, 27 Jan 2020 08:06:11 -0500 Received: by mail-pj1-f67.google.com with SMTP id q39so3103237pjc.0 for ; Mon, 27 Jan 2020 05:06:11 -0800 (PST) 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=bSnF46/C5Ueo01VGUSpJO+52BxPNa8TZBsqKS/t5ofE=; b=nCIs5EsvisX6yp/Nsk+RtelWJebb52v4Ynz/Xji0atzwvPTfdtxBHqt5gXNqKsHOVv rTE6jFvJBrNJrYv4Q92egpcyLpYIY1tygeftaNoMwlZKWmoLQ4f1F/JUX9F9JL1u2Rnm vnC6/i7ZpDX4lEySpKuU6FIgoHu/cOFxo9h0Z2Q4K8wsVRIu6PwWWjQRQQopXBKffRPO J9UzgXX6FxUC2C+LPf3NtTKpEU2VR35cW7I/uuJBDz9VF8FrMe6R/P2DgdAuLaytL+En JDYt3jZVfFYikwwsBoMzKzxgWT/qLpCHfa6pm1hLs6bWwCVYWbvhhUiBijSVou5tgRSB OuOA== 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=bSnF46/C5Ueo01VGUSpJO+52BxPNa8TZBsqKS/t5ofE=; b=Hn6uD3kwWs3w8IPg/7DC7VtBoxloFFbAJ7XuZf5a7YJZnwJr/VfGNpNDK3pEdSsEvM sSKxlnlNOmq4gh2EjtFskdFVB4L1bdlEyJTNqDi0T05x5TsyG9g019lZFWbrTeVNRRGq q4LakzMmN8qW5ocdvXBLapZwGLiaciKTUgQ74XSDGWvXsdfC+vmBGA1HbhpiWtw5KzEZ PIMyAH2LQlPzt8EAiDrq5qjGlzgZQZreU1qcRpYNT9n/7vc+pe0Wr93ti4DNhPcgGDWG HYkFBLp8iw5x2CHP2nkVKa+j5b725Q54l6s1/aDGQPVTBVJZCiZ/tw5tH4EbTpFP1ycH ZGsg== X-Gm-Message-State: APjAAAXtdb1src5WF0x9oKOxI6i3H7YxzTt9KPRDbqdD7fBY34N8r+7A 0UT+EnVriwyvqBzTJ3rlrn0v+2lI4no= X-Google-Smtp-Source: APXvYqw3pe6QuQjhj9CJnTzffnpDn+DYzTl0QalxNFTde3j02O/Mzi4aw6JEc+471nrRE7kbRcdQkQ== X-Received: by 2002:a17:902:bd4b:: with SMTP id b11mr17912284plx.45.1580130370104; Mon, 27 Jan 2020 05:06:10 -0800 (PST) Received: from machine421.marvell.com ([115.113.156.2]) by smtp.googlemail.com with ESMTPSA id c15sm17241717pja.30.2020.01.27.05.06.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 27 Jan 2020 05:06:09 -0800 (PST) From: sunil.kovvuri@gmail.com To: netdev@vger.kernel.org Cc: davem@davemloft.net, kubakici@wp.pl, mkubecek@suse.cz, maciej.fijalkowski@intel.com, Linu Cherian , Tomasz Duszynski , Sunil Goutham Subject: [PATCH v6 08/17] octeontx2-pf: Register and handle link notifications Date: Mon, 27 Jan 2020 18:35:22 +0530 Message-Id: <1580130331-8964-9-git-send-email-sunil.kovvuri@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1580130331-8964-1-git-send-email-sunil.kovvuri@gmail.com> References: <1580130331-8964-1-git-send-email-sunil.kovvuri@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Linu Cherian PF and AF (admin function) shares 64KB of reserved memory region for communication. This region is shared for - Messages sent by PF and responses sent by AF. - Notifications sent by AF and ACKs sent by PF. This patch adds infrastructure to handle notifications sent by AF and adds handlers to process them. One of the main usecase of notifications from AF is physical link changes. So this patch adds registration of PF with AF to receive link status change notifications and also adds the handler for that notification. Signed-off-by: Linu Cherian Signed-off-by: Tomasz Duszynski Signed-off-by: Sunil Goutham --- .../ethernet/marvell/octeontx2/nic/otx2_common.h | 5 ++ .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 79 ++++++++++++++++++++++ .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 25 +++++++ 3 files changed, 109 insertions(+) diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h index 1194854..16d7dd7 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_common.h @@ -135,6 +135,9 @@ struct otx2_nic { void *iommu_domain; u16 rbsize; /* Receive buffer size */ +#define OTX2_FLAG_INTF_DOWN BIT_ULL(2) + u64 flags; + struct otx2_qset qset; struct otx2_hw hw; struct pci_dev *pdev; @@ -145,6 +148,7 @@ struct otx2_nic { struct workqueue_struct *mbox_wq; u16 pcifunc; /* RVU PF_FUNC */ + struct cgx_link_user_info linfo; /* Block address of NIX either BLKADDR_NIX0 or BLKADDR_NIX1 */ int nix_blkaddr; @@ -485,6 +489,7 @@ int otx2_txschq_stop(struct otx2_nic *pfvf); void otx2_sqb_flush(struct otx2_nic *pfvf); dma_addr_t otx2_alloc_rbuf(struct otx2_nic *pfvf, struct otx2_pool *pool, gfp_t gfp); +int otx2_rxtx_enable(struct otx2_nic *pfvf, bool enable); void otx2_ctx_disable(struct mbox *mbox, int type, bool npa); void otx2_cleanup_rx_cqes(struct otx2_nic *pfvf, struct otx2_cq_queue *cq); void otx2_cleanup_tx_cqes(struct otx2_nic *pfvf, struct otx2_cq_queue *cq); diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c index a18bf5f..8cb1cf5 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_pf.c @@ -167,6 +167,38 @@ static void otx2_pfaf_mbox_handler(struct work_struct *work) otx2_mbox_reset(mbox, 0); } +static void otx2_handle_link_event(struct otx2_nic *pf) +{ + struct cgx_link_user_info *linfo = &pf->linfo; + struct net_device *netdev = pf->netdev; + + pr_info("%s NIC Link is %s %d Mbps %s duplex\n", netdev->name, + linfo->link_up ? "UP" : "DOWN", linfo->speed, + linfo->full_duplex ? "Full" : "Half"); + if (linfo->link_up) { + netif_carrier_on(netdev); + netif_tx_start_all_queues(netdev); + } else { + netif_tx_stop_all_queues(netdev); + netif_carrier_off(netdev); + } +} + +int otx2_mbox_up_handler_cgx_link_event(struct otx2_nic *pf, + struct cgx_link_info_msg *msg, + struct msg_rsp *rsp) +{ + /* Copy the link info sent by AF */ + pf->linfo = msg->link_info; + + /* interface has not been fully configured yet */ + if (pf->flags & OTX2_FLAG_INTF_DOWN) + return 0; + + otx2_handle_link_event(pf); + return 0; +} + static int otx2_process_mbox_msg_up(struct otx2_nic *pf, struct mbox_msghdr *req) { @@ -367,6 +399,27 @@ static int otx2_pfaf_mbox_init(struct otx2_nic *pf) return err; } +static int otx2_cgx_config_linkevents(struct otx2_nic *pf, bool enable) +{ + struct msg_req *msg; + int err; + + otx2_mbox_lock(&pf->mbox); + if (enable) + msg = otx2_mbox_alloc_msg_cgx_start_linkevents(&pf->mbox); + else + msg = otx2_mbox_alloc_msg_cgx_stop_linkevents(&pf->mbox); + + if (!msg) { + otx2_mbox_unlock(&pf->mbox); + return -ENOMEM; + } + + err = otx2_sync_mbox_msg(&pf->mbox); + otx2_mbox_unlock(&pf->mbox); + return err; +} + static int otx2_set_real_num_queues(struct net_device *netdev, int tx_queues, int rx_queues) { @@ -690,6 +743,18 @@ static int otx2_open(struct net_device *netdev) otx2_set_cints_affinity(pf); + pf->flags &= ~OTX2_FLAG_INTF_DOWN; + /* 'intf_down' may be checked on any cpu */ + smp_wmb(); + + /* we have already received link status notification */ + if (pf->linfo.link_up && !(pf->pcifunc & RVU_PFVF_FUNC_MASK)) + otx2_handle_link_event(pf); + + err = otx2_rxtx_enable(pf, true); + if (err) + goto err_free_cints; + return 0; err_free_cints: @@ -713,6 +778,13 @@ static int otx2_stop(struct net_device *netdev) netif_carrier_off(netdev); netif_tx_stop_all_queues(netdev); + pf->flags |= OTX2_FLAG_INTF_DOWN; + /* 'intf_down' may be checked on any cpu */ + smp_wmb(); + + /* First stop packet Rx/Tx */ + otx2_rxtx_enable(pf, false); + /* Cleanup CQ NAPI and IRQ */ vec = pf->hw.nix_msixoff + NIX_LF_CINT_VEC_START; for (qidx = 0; qidx < pf->hw.cint_cnt; qidx++) { @@ -867,6 +939,7 @@ static int otx2_probe(struct pci_dev *pdev, const struct pci_device_id *id) pf->netdev = netdev; pf->pdev = pdev; pf->dev = dev; + pf->flags |= OTX2_FLAG_INTF_DOWN; hw = &pf->hw; hw->pdev = pdev; @@ -959,6 +1032,9 @@ static int otx2_probe(struct pci_dev *pdev, const struct pci_device_id *id) goto err_detach_rsrc; } + /* Enable link notifications */ + otx2_cgx_config_linkevents(pf, true); + return 0; err_detach_rsrc: @@ -987,6 +1063,9 @@ static void otx2_remove(struct pci_dev *pdev) pf = netdev_priv(netdev); + /* Disable link notifications */ + otx2_cgx_config_linkevents(pf, false); + unregister_netdev(netdev); otx2_detach_resources(&pf->mbox); otx2_disable_mbox_intr(pf); diff --git a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c index f19f5d0..87b579a 100644 --- a/drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c +++ b/drivers/net/ethernet/marvell/octeontx2/nic/otx2_txrx.c @@ -315,6 +315,10 @@ int otx2_napi_handler(struct napi_struct *napi, int budget) otx2_write64(pfvf, NIX_LF_CINTX_INT(cq_poll->cint_idx), BIT_ULL(0)); if (workdone < budget && napi_complete_done(napi, workdone)) { + /* If interface is going down, don't re-enable IRQ */ + if (pfvf->flags & OTX2_FLAG_INTF_DOWN) + return workdone; + /* Re-enable interrupts */ otx2_write64(pfvf, NIX_LF_CINTX_ENA_W1S(cq_poll->cint_idx), BIT_ULL(0)); @@ -531,3 +535,24 @@ void otx2_cleanup_tx_cqes(struct otx2_nic *pfvf, struct otx2_cq_queue *cq) otx2_write64(pfvf, NIX_LF_CQ_OP_DOOR, ((u64)cq->cq_idx << 32) | processed_cqe); } + +int otx2_rxtx_enable(struct otx2_nic *pfvf, bool enable) +{ + struct msg_req *msg; + int err; + + otx2_mbox_lock(&pfvf->mbox); + if (enable) + msg = otx2_mbox_alloc_msg_nix_lf_start_rx(&pfvf->mbox); + else + msg = otx2_mbox_alloc_msg_nix_lf_stop_rx(&pfvf->mbox); + + if (!msg) { + otx2_mbox_unlock(&pfvf->mbox); + return -ENOMEM; + } + + err = otx2_sync_mbox_msg(&pfvf->mbox); + otx2_mbox_unlock(&pfvf->mbox); + return err; +}