From nobody Sun Apr 28 00:56:27 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1E33EC6FD1C for ; Fri, 24 Mar 2023 17:47:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231954AbjCXRre (ORCPT ); Fri, 24 Mar 2023 13:47:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229919AbjCXRr0 (ORCPT ); Fri, 24 Mar 2023 13:47:26 -0400 Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B807A1A483; Fri, 24 Mar 2023 10:47:22 -0700 (PDT) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32OH2iG9001060; Fri, 24 Mar 2023 10:47:14 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=Dfy95zihIeiPxGIQsmCcnEYy81MvYE1r0t8pmRgHugY=; b=Edte0BLLlyKRJFnu1L9p624kS4LKqulizUvdMw6QtpWadoRg4GaLcKQjTwIf+BXi1775 H6PplIrMt9CVMeTt6g6AmZB0czXz/JV8XKVVzUE01VlIYfyTeYgeSmj2jqcbLSy1jLQ9 p24sZoGZq+6gzjt9FtK7w5A0IKIcrrGUivKonAF0GNT6GHOdJEAwUP8IG8eSNQZk4qtg XWNN1cuEFK+i6Y94miOCDr7H+n4ZjEIeiX+Yex82/UxMLq7UPKb9jF08LF7F9MGiH8w2 epcMyHihqNJJLUsm2vaagOSt38O18QhGHT7CFwJJc1GGps5SiRNDnA44JU3INE9lfI5l iw== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3pgxmfkdp4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Fri, 24 Mar 2023 10:47:14 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Fri, 24 Mar 2023 10:47:12 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Fri, 24 Mar 2023 10:47:12 -0700 Received: from sburla-PowerEdge-T630.sclab.marvell.com (unknown [10.106.27.217]) by maili.marvell.com (Postfix) with ESMTP id 644153F705C; Fri, 24 Mar 2023 10:47:12 -0700 (PDT) From: Veerasenareddy Burru To: , , , , CC: , Veerasenareddy Burru , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Subject: [PATCH net-next v5 1/8] octeon_ep: defer probe if firmware not ready Date: Fri, 24 Mar 2023 10:46:56 -0700 Message-ID: <20230324174704.9752-2-vburru@marvell.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20230324174704.9752-1-vburru@marvell.com> References: <20230324174704.9752-1-vburru@marvell.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: gZQ-WfwI7M1wSOM-K2gjCHHGuRJjbyaF X-Proofpoint-ORIG-GUID: gZQ-WfwI7M1wSOM-K2gjCHHGuRJjbyaF X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-24_11,2023-03-24_01,2023-02-09_01 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Defer probe if firmware is not ready for device usage. Signed-off-by: Veerasenareddy Burru Signed-off-by: Abhijit Ayarekar Signed-off-by: Satananda Burla --- v4 -> v5: * no change v3 -> v4: * address review comments https://lore.kernel.org/all/Y+vFlfakHj33DEkt@boxer/ - fix return statement for get_fw_ready_status(). v2 -> v3: * fix review comments https://lore.kernel.org/all/Y4chWyR6qTlptkTE@unreal/ - change get_fw_ready_status() to return bool - fix the success oriented flow while looking for PCI extended capability v1 -> v2: * was scheduling workqueue task to wait for firmware ready, to probe/initialize the device. * now, removed the workqueue task; the probe returns EPROBE_DEFER, if firmware is not ready. * removed device status oct->status, as it is not required with the modified implementation. .../ethernet/marvell/octeon_ep/octep_main.c | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c b/drivers/= net/ethernet/marvell/octeon_ep/octep_main.c index fdce78ceea87..0a50da52dc27 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c @@ -1016,6 +1016,26 @@ static void octep_device_cleanup(struct octep_device= *oct) oct->conf =3D NULL; } =20 +static bool get_fw_ready_status(struct pci_dev *pdev) +{ + u32 pos =3D 0; + u16 vsec_id; + u8 status; + + while ((pos =3D pci_find_next_ext_capability(pdev, pos, + PCI_EXT_CAP_ID_VNDR))) { + pci_read_config_word(pdev, pos + 4, &vsec_id); +#define FW_STATUS_VSEC_ID 0xA3 + if (vsec_id !=3D FW_STATUS_VSEC_ID) + continue; + + pci_read_config_byte(pdev, (pos + 8), &status); + dev_info(&pdev->dev, "Firmware ready status =3D %u\n", status); + return status; + } + return false; +} + /** * octep_probe() - Octeon PCI device probe handler. * @@ -1051,6 +1071,12 @@ static int octep_probe(struct pci_dev *pdev, const s= truct pci_device_id *ent) =20 pci_set_master(pdev); =20 + if (!get_fw_ready_status(pdev)) { + dev_notice(&pdev->dev, "Firmware not ready; defer probe.\n"); + err =3D -EPROBE_DEFER; + goto err_alloc_netdev; + } + netdev =3D alloc_etherdev_mq(sizeof(struct octep_device), OCTEP_MAX_QUEUES); if (!netdev) { --=20 2.36.0 From nobody Sun Apr 28 00:56:27 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5322C6FD20 for ; Fri, 24 Mar 2023 17:47:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232002AbjCXRri (ORCPT ); Fri, 24 Mar 2023 13:47:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230369AbjCXRr1 (ORCPT ); Fri, 24 Mar 2023 13:47:27 -0400 Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3C931A486; Fri, 24 Mar 2023 10:47:22 -0700 (PDT) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32OH2r7W001150; Fri, 24 Mar 2023 10:47:15 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=YLg7fBizamqpcT+QXE3Dc4rKa6tDAkvztVDZ5KQchM8=; b=MajjehlJ6F5nQoD2luoWAD3V5We5cYMi4BE1hqCBUgJ3zPu5nSGJ8nFqMg7Z7LUU+GDw foNlRTqTyNXIx06lexwhuIwbYtn4QxdzcnXA3baIc9mQ6N1/E9tXuao/sL0O3KJv1dSE hHtRgrj/2FSQ7mivfXioStVfk5so1GklVxaGui8FHzE8jXlx6k53C6XoSBCbXf6bGfU0 fgCETTOLwStHH3tQvx3h8R3lFJ2bBjmchpIW+K1y8qceYMsGNajV3R4RvrMKXerDjH3C htM9kdJ0RjJPIxbrKwxLC06Nr9eZB4JDe2ro2MDvV5u5UUtceeX0NYWkZiusnUJmcLk6 iA== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3pgxmfkdp2-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Fri, 24 Mar 2023 10:47:14 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Fri, 24 Mar 2023 10:47:13 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Fri, 24 Mar 2023 10:47:13 -0700 Received: from sburla-PowerEdge-T630.sclab.marvell.com (unknown [10.106.27.217]) by maili.marvell.com (Postfix) with ESMTP id 1330D3F7059; Fri, 24 Mar 2023 10:47:13 -0700 (PDT) From: Veerasenareddy Burru To: , , , , CC: , Veerasenareddy Burru , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Subject: [PATCH net-next v5 2/8] octeon_ep: poll for control messages Date: Fri, 24 Mar 2023 10:46:57 -0700 Message-ID: <20230324174704.9752-3-vburru@marvell.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20230324174704.9752-1-vburru@marvell.com> References: <20230324174704.9752-1-vburru@marvell.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: NuLIAEWot7LgDnVMVUSyCv5ipDEIqqVb X-Proofpoint-ORIG-GUID: NuLIAEWot7LgDnVMVUSyCv5ipDEIqqVb X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-24_11,2023-03-24_01,2023-02-09_01 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Poll for control messages until interrupts are enabled. All the interrupts are enabled in ndo_open(). Add ability to listen for notifications from firmware before ndo_open(). Once interrupts are enabled, this polling is disabled and all the messages are processed by bottom half of interrupt handler. Signed-off-by: Veerasenareddy Burru Signed-off-by: Abhijit Ayarekar --- v4 -> v5: * no change v3-> v4: * resovled review comments https://lore.kernel.org/all/Y+vIHjaUvkWXw55x@boxer/ - changed return type from integer to bool, where the possible return values are only 0 and 1. - reverted an unnecessary change that caused rct breakage. v2-> v3: * resovled review comment; fixed reverse christmas tree. v1 -> v2: * removed device status oct->status, as it is not required with the modified implementation in 0001-xxxx.patch .../marvell/octeon_ep/octep_cn9k_pf.c | 47 +++++++++---------- .../ethernet/marvell/octeon_ep/octep_main.c | 35 ++++++++++++++ .../ethernet/marvell/octeon_ep/octep_main.h | 11 ++++- .../marvell/octeon_ep/octep_regs_cn9k_pf.h | 4 ++ 4 files changed, 70 insertions(+), 27 deletions(-) diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c b/drive= rs/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c index 6ad88d0fe43f..adc2279bc66d 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c @@ -352,19 +352,28 @@ static void octep_setup_mbox_regs_cn93_pf(struct octe= p_device *oct, int q_no) mbox->mbox_read_reg =3D oct->mmio[0].hw_addr + CN93_SDP_R_MBOX_VF_PF_DATA= (q_no); } =20 -/* Mailbox Interrupt handler */ -static void cn93_handle_pf_mbox_intr(struct octep_device *oct) +/* Process non-ioq interrupts required to keep pf interface running. + * OEI_RINT is needed for control mailbox + */ +static bool octep_poll_non_ioq_interrupts_cn93_pf(struct octep_device *oct) { - u64 mbox_int_val =3D 0ULL, val =3D 0ULL, qno =3D 0ULL; + bool handled =3D false; + u64 reg0; =20 - mbox_int_val =3D readq(oct->mbox[0]->mbox_int_reg); - for (qno =3D 0; qno < OCTEP_MAX_VF; qno++) { - val =3D readq(oct->mbox[qno]->mbox_read_reg); - dev_dbg(&oct->pdev->dev, - "PF MBOX READ: val:%llx from VF:%llx\n", val, qno); + /* Check for OEI INTR */ + reg0 =3D octep_read_csr64(oct, CN93_SDP_EPF_OEI_RINT); + if (reg0) { + dev_info(&oct->pdev->dev, + "Received OEI_RINT intr: 0x%llx\n", + reg0); + octep_write_csr64(oct, CN93_SDP_EPF_OEI_RINT, reg0); + if (reg0 & CN93_SDP_EPF_OEI_RINT_DATA_BIT_MBOX) + queue_work(octep_wq, &oct->ctrl_mbox_task); + + handled =3D true; } =20 - writeq(mbox_int_val, oct->mbox[0]->mbox_int_reg); + return handled; } =20 /* Interrupts handler for all non-queue generic interrupts. */ @@ -434,24 +443,9 @@ static irqreturn_t octep_non_ioq_intr_handler_cn93_pf(= void *dev) goto irq_handled; } =20 - /* Check for MBOX INTR */ - reg_val =3D octep_read_csr64(oct, CN93_SDP_EPF_MBOX_RINT(0)); - if (reg_val) { - dev_info(&pdev->dev, - "Received MBOX_RINT intr: 0x%llx\n", reg_val); - cn93_handle_pf_mbox_intr(oct); + /* Check for MBOX INTR and OEI INTR */ + if (octep_poll_non_ioq_interrupts_cn93_pf(oct)) goto irq_handled; - } - - /* Check for OEI INTR */ - reg_val =3D octep_read_csr64(oct, CN93_SDP_EPF_OEI_RINT); - if (reg_val) { - dev_info(&pdev->dev, - "Received OEI_EINT intr: 0x%llx\n", reg_val); - octep_write_csr64(oct, CN93_SDP_EPF_OEI_RINT, reg_val); - queue_work(octep_wq, &oct->ctrl_mbox_task); - goto irq_handled; - } =20 /* Check for DMA INTR */ reg_val =3D octep_read_csr64(oct, CN93_SDP_EPF_DMA_RINT); @@ -712,6 +706,7 @@ void octep_device_setup_cn93_pf(struct octep_device *oc= t) =20 oct->hw_ops.enable_interrupts =3D octep_enable_interrupts_cn93_pf; oct->hw_ops.disable_interrupts =3D octep_disable_interrupts_cn93_pf; + oct->hw_ops.poll_non_ioq_interrupts =3D octep_poll_non_ioq_interrupts_cn9= 3_pf; =20 oct->hw_ops.update_iq_read_idx =3D octep_update_iq_read_index_cn93_pf; =20 diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c b/drivers/= net/ethernet/marvell/octeon_ep/octep_main.c index 0a50da52dc27..a3e4d9355681 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c @@ -17,6 +17,7 @@ #include "octep_main.h" #include "octep_ctrl_net.h" =20 +#define OCTEP_INTR_POLL_TIME_MSECS 100 struct workqueue_struct *octep_wq; =20 /* Supported Devices */ @@ -511,6 +512,7 @@ static int octep_open(struct net_device *netdev) ret =3D octep_get_link_status(oct); if (!ret) octep_set_link_status(oct, true); + oct->poll_non_ioq_intr =3D false; =20 /* Enable the input and output queues for this Octeon device */ oct->hw_ops.enable_io_queues(oct); @@ -572,6 +574,11 @@ static int octep_stop(struct net_device *netdev) oct->hw_ops.reset_io_queues(oct); octep_free_oqs(oct); octep_free_iqs(oct); + + oct->poll_non_ioq_intr =3D true; + queue_delayed_work(octep_wq, &oct->intr_poll_task, + msecs_to_jiffies(OCTEP_INTR_POLL_TIME_MSECS)); + netdev_info(netdev, "Device stopped !!\n"); return 0; } @@ -864,6 +871,28 @@ static const struct net_device_ops octep_netdev_ops = =3D { .ndo_change_mtu =3D octep_change_mtu, }; =20 +/** + * octep_intr_poll_task - work queue task to process non-ioq interrupts. + * + * @work: pointer to mbox work_struct + * + * Process non-ioq interrupts to handle control mailbox, pfvf mailbox. + **/ +static void octep_intr_poll_task(struct work_struct *work) +{ + struct octep_device *oct =3D container_of(work, struct octep_device, + intr_poll_task.work); + + if (!oct->poll_non_ioq_intr) { + dev_info(&oct->pdev->dev, "Interrupt poll task stopped.\n"); + return; + } + + oct->hw_ops.poll_non_ioq_interrupts(oct); + queue_delayed_work(octep_wq, &oct->intr_poll_task, + msecs_to_jiffies(OCTEP_INTR_POLL_TIME_MSECS)); +} + /** * octep_ctrl_mbox_task - work queue task to handle ctrl mbox messages. * @@ -1099,6 +1128,10 @@ static int octep_probe(struct pci_dev *pdev, const s= truct pci_device_id *ent) } INIT_WORK(&octep_dev->tx_timeout_task, octep_tx_timeout_task); INIT_WORK(&octep_dev->ctrl_mbox_task, octep_ctrl_mbox_task); + INIT_DELAYED_WORK(&octep_dev->intr_poll_task, octep_intr_poll_task); + octep_dev->poll_non_ioq_intr =3D true; + queue_delayed_work(octep_wq, &octep_dev->intr_poll_task, + msecs_to_jiffies(OCTEP_INTR_POLL_TIME_MSECS)); =20 netdev->netdev_ops =3D &octep_netdev_ops; octep_set_ethtool_ops(netdev); @@ -1159,6 +1192,8 @@ static void octep_remove(struct pci_dev *pdev) if (netdev->reg_state =3D=3D NETREG_REGISTERED) unregister_netdev(netdev); =20 + oct->poll_non_ioq_intr =3D false; + cancel_delayed_work_sync(&oct->intr_poll_task); octep_device_cleanup(oct); pci_release_mem_regions(pdev); free_netdev(netdev); diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.h b/drivers/= net/ethernet/marvell/octeon_ep/octep_main.h index 123ffc13754d..836d990ba3fa 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.h +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.h @@ -73,6 +73,7 @@ struct octep_hw_ops { =20 void (*enable_interrupts)(struct octep_device *oct); void (*disable_interrupts)(struct octep_device *oct); + bool (*poll_non_ioq_interrupts)(struct octep_device *oct); =20 void (*enable_io_queues)(struct octep_device *oct); void (*disable_io_queues)(struct octep_device *oct); @@ -270,7 +271,15 @@ struct octep_device { =20 /* Work entry to handle ctrl mbox interrupt */ struct work_struct ctrl_mbox_task; - + /* Wait queue for host to firmware requests */ + wait_queue_head_t ctrl_req_wait_q; + /* List of objects waiting for h2f response */ + struct list_head ctrl_req_wait_list; + + /* Enable non-ioq interrupt polling */ + bool poll_non_ioq_intr; + /* Work entry to poll non-ioq interrupts */ + struct delayed_work intr_poll_task; }; =20 static inline u16 OCTEP_MAJOR_REV(struct octep_device *oct) diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_regs_cn9k_pf.h b/= drivers/net/ethernet/marvell/octeon_ep/octep_regs_cn9k_pf.h index 3d5d39a52fe6..0466fd9a002d 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_regs_cn9k_pf.h +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_regs_cn9k_pf.h @@ -364,4 +364,8 @@ =20 /* Number of non-queue interrupts in CN93xx */ #define CN93_NUM_NON_IOQ_INTR 16 + +/* bit 0 for control mbox interrupt */ +#define CN93_SDP_EPF_OEI_RINT_DATA_BIT_MBOX BIT_ULL(0) + #endif /* _OCTEP_REGS_CN9K_PF_H_ */ --=20 2.36.0 From nobody Sun Apr 28 00:56:27 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BD021C76195 for ; Fri, 24 Mar 2023 17:47:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231997AbjCXRrl (ORCPT ); Fri, 24 Mar 2023 13:47:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40544 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231740AbjCXRr1 (ORCPT ); Fri, 24 Mar 2023 13:47:27 -0400 Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B0C751A493; Fri, 24 Mar 2023 10:47:23 -0700 (PDT) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32OH2r7X001150; Fri, 24 Mar 2023 10:47:15 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=xfcro882otU9jgc0oI8iBxCajulNUCQMvAsdjN3RA+A=; b=em+fBYVPzFqTNR6pCrA1jwb2cSyshUv4zGqgr5tdSV0kkEIYQr67GZUcSzz/b14KhlXA Mh5benxF6e7ZjSwCxdd2KZNacTcRZ4ZEymTvTixYYAd7VR1CAe7TYdciX33vDh3Z8ANt qd6TacfKeKf6hKbFR+p776RS5vqFQ6RrJZODpulFyr6pMAlunQee6sDI8TAb8pvSkxud C1Wtha0P/+vRxQfho2iYAPV+KPzivMqCi1g5ehfMtaEX2FYnYJSOX8hX5iumDh/JRDJ/ UivD08sSQJsu2BSEXQpFCrgvsWiVpUc2cRSpo35dnZXNv+dbJ7XXvq70fmcvEzC/J7oF nA== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3pgxmfkdp2-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Fri, 24 Mar 2023 10:47:15 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Fri, 24 Mar 2023 10:47:13 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Fri, 24 Mar 2023 10:47:13 -0700 Received: from sburla-PowerEdge-T630.sclab.marvell.com (unknown [10.106.27.217]) by maili.marvell.com (Postfix) with ESMTP id 7C7EB3F7067; Fri, 24 Mar 2023 10:47:13 -0700 (PDT) From: Veerasenareddy Burru To: , , , , CC: , Veerasenareddy Burru , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Subject: [PATCH net-next v5 3/8] octeon_ep: control mailbox for multiple PFs Date: Fri, 24 Mar 2023 10:46:58 -0700 Message-ID: <20230324174704.9752-4-vburru@marvell.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20230324174704.9752-1-vburru@marvell.com> References: <20230324174704.9752-1-vburru@marvell.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: Safqy3egmBpVRJDFpFhXYTk4uVs9qE5S X-Proofpoint-ORIG-GUID: Safqy3egmBpVRJDFpFhXYTk4uVs9qE5S X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-24_11,2023-03-24_01,2023-02-09_01 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add control mailbox support for multiple PFs. Update control mbox base address calculation based on PF function link. Signed-off-by: Veerasenareddy Burru Signed-off-by: Abhijit Ayarekar --- v4 -> v5: * no change v3 -> v4: * resovled review comments https://lore.kernel.org/all/Y+vJkPO1UZPDSFT2@boxer/ - fixed rct violation. v2 -> v3: * no change v1 -> v2: * no change .../ethernet/marvell/octeon_ep/octep_cn9k_pf.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c b/drive= rs/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c index adc2279bc66d..e2503c9bc8a1 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c @@ -13,6 +13,9 @@ #include "octep_main.h" #include "octep_regs_cn9k_pf.h" =20 +#define CTRL_MBOX_MAX_PF 128 +#define CTRL_MBOX_SZ ((size_t)(0x400000 / CTRL_MBOX_MAX_PF)) + /* Names of Hardware non-queue generic interrupts */ static char *cn93_non_ioq_msix_names[] =3D { "epf_ire_rint", @@ -198,7 +201,9 @@ static void octep_init_config_cn93_pf(struct octep_devi= ce *oct) { struct octep_config *conf =3D oct->conf; struct pci_dev *pdev =3D oct->pdev; + u8 link =3D 0; u64 val; + int pos; =20 /* Read ring configuration: * PF ring count, number of VFs and rings per VF supported @@ -234,7 +239,16 @@ static void octep_init_config_cn93_pf(struct octep_dev= ice *oct) conf->msix_cfg.ioq_msix =3D conf->pf_ring_cfg.active_io_rings; conf->msix_cfg.non_ioq_msix_names =3D cn93_non_ioq_msix_names; =20 - conf->ctrl_mbox_cfg.barmem_addr =3D (void __iomem *)oct->mmio[2].hw_addr = + (0x400000ull * 7); + pos =3D pci_find_ext_capability(oct->pdev, PCI_EXT_CAP_ID_SRIOV); + if (pos) { + pci_read_config_byte(oct->pdev, + pos + PCI_SRIOV_FUNC_LINK, + &link); + link =3D PCI_DEVFN(PCI_SLOT(oct->pdev->devfn), link); + } + conf->ctrl_mbox_cfg.barmem_addr =3D (void __iomem *)oct->mmio[2].hw_addr + + (0x400000ull * 7) + + (link * CTRL_MBOX_SZ); } =20 /* Setup registers for a hardware Tx Queue */ --=20 2.36.0 From nobody Sun Apr 28 00:56:27 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26432C6FD20 for ; Fri, 24 Mar 2023 17:48:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232041AbjCXRsE (ORCPT ); Fri, 24 Mar 2023 13:48:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40954 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231990AbjCXRrh (ORCPT ); Fri, 24 Mar 2023 13:47:37 -0400 Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4194C1A4B5; Fri, 24 Mar 2023 10:47:30 -0700 (PDT) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32OHVwQj018470; Fri, 24 Mar 2023 10:47:16 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=MIUFTgPP8Ky4wYmagI18i6Fy+WFkmE6FhbxOOX3Y8vY=; b=TlEQLAPa4Csl5nmqEsjOwSL8I/+L5LjipCZrrucylordGBzGVACh2ZXKN6+kM/ostNkC yF86w0Z5W0u6fWSvRMsdT0H9SueDWbgPqKK89gnGiyx+eVOODX+xPzh8qpLwzVh4b1Lt G6Quig1GQoSCDb2C20pkTuQ8YY+K7CTuf3r4Nd1dOc/gA2j6C6zni8I1p7cbcdV7xMXP RPR6RkzXU11vIrQ/9ICWznoJpSpyWBYVHtqct8tj9aRMQSUZaEz7aR0nkLwcStltPk4g Fi3LuOIU7PM3FtPJjomU2DzSSxswcysafRyqJhLGF4zjJTpijHy3t4Io8RE/4/KENcyE 4A== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3ph6q3td8s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Fri, 24 Mar 2023 10:47:16 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Fri, 24 Mar 2023 10:47:14 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Fri, 24 Mar 2023 10:47:14 -0700 Received: from sburla-PowerEdge-T630.sclab.marvell.com (unknown [10.106.27.217]) by maili.marvell.com (Postfix) with ESMTP id 656A63F7055; Fri, 24 Mar 2023 10:47:14 -0700 (PDT) From: Veerasenareddy Burru To: , , , , CC: , Veerasenareddy Burru , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Subject: [PATCH net-next v5 4/8] octeon_ep: add separate mailbox command and response queues Date: Fri, 24 Mar 2023 10:46:59 -0700 Message-ID: <20230324174704.9752-5-vburru@marvell.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20230324174704.9752-1-vburru@marvell.com> References: <20230324174704.9752-1-vburru@marvell.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: floG012O4_Ai7tW9eWIxPPNaRpBr-7-Z X-Proofpoint-ORIG-GUID: floG012O4_Ai7tW9eWIxPPNaRpBr-7-Z X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-24_11,2023-03-24_01,2023-02-09_01 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Enhance control mailbox protocol to support following - separate command and response queues * command queue to send control commands to firmware. * response queue to receive responses and notifications from firmware. - variable size messages using scatter/gather Signed-off-by: Abhijit Ayarekar Signed-off-by: Veerasenareddy Burru --- v4 -> v5: * no change v3 -> v4: * addressed review comments https://lore.kernel.org/all/Y+0AW3b9No9pyWrr@boxer/ - fixed rct violation. - separated out changes to APIs accepting function ID to work for PF and VFs. Separated changes are included in patch 0005. - modified return types from int to void for functions where. - renamed write_mbox_data() to octep_write_mbox_data() and now returns void. - renamed read_mbox_data() to octep_read_mbox_data() and now returns void. - removed num argument from octep_ctrl_mbox_send/recv APIs. - renamed send_mbox_req() to octep_send_mbox_req(). - octep_ctrl_net_recv_fw_messages() now returns void. v2 -> v3: * no change v1 -> v2: * modified the patch to work with device status "oct->status" removed. .../marvell/octeon_ep/octep_ctrl_mbox.c | 276 ++++++++------- .../marvell/octeon_ep/octep_ctrl_mbox.h | 88 ++--- .../marvell/octeon_ep/octep_ctrl_net.c | 330 ++++++++++++------ .../marvell/octeon_ep/octep_ctrl_net.h | 164 +++++---- .../marvell/octeon_ep/octep_ethtool.c | 6 +- .../ethernet/marvell/octeon_ep/octep_main.c | 76 +--- 6 files changed, 529 insertions(+), 411 deletions(-) diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.c b/dri= vers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.c index 39322e4dd100..a4ee6f3ae354 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.c @@ -24,41 +24,49 @@ /* Time in msecs to wait for message response */ #define OCTEP_CTRL_MBOX_MSG_WAIT_MS 10 =20 -#define OCTEP_CTRL_MBOX_INFO_MAGIC_NUM_OFFSET(m) (m) -#define OCTEP_CTRL_MBOX_INFO_BARMEM_SZ_OFFSET(m) ((m) + 8) -#define OCTEP_CTRL_MBOX_INFO_HOST_STATUS_OFFSET(m) ((m) + 24) -#define OCTEP_CTRL_MBOX_INFO_FW_STATUS_OFFSET(m) ((m) + 144) - -#define OCTEP_CTRL_MBOX_H2FQ_INFO_OFFSET(m) ((m) + OCTEP_CTRL_MBOX_INFO_S= Z) -#define OCTEP_CTRL_MBOX_H2FQ_PROD_OFFSET(m) (OCTEP_CTRL_MBOX_H2FQ_INFO_OF= FSET(m)) -#define OCTEP_CTRL_MBOX_H2FQ_CONS_OFFSET(m) ((OCTEP_CTRL_MBOX_H2FQ_INFO_O= FFSET(m)) + 4) -#define OCTEP_CTRL_MBOX_H2FQ_ELEM_SZ_OFFSET(m) ((OCTEP_CTRL_MBOX_H2FQ_INF= O_OFFSET(m)) + 8) -#define OCTEP_CTRL_MBOX_H2FQ_ELEM_CNT_OFFSET(m) ((OCTEP_CTRL_MBOX_H2FQ_IN= FO_OFFSET(m)) + 12) - -#define OCTEP_CTRL_MBOX_F2HQ_INFO_OFFSET(m) ((m) + \ - OCTEP_CTRL_MBOX_INFO_SZ + \ - OCTEP_CTRL_MBOX_H2FQ_INFO_SZ) -#define OCTEP_CTRL_MBOX_F2HQ_PROD_OFFSET(m) (OCTEP_CTRL_MBOX_F2HQ_INFO_OF= FSET(m)) -#define OCTEP_CTRL_MBOX_F2HQ_CONS_OFFSET(m) ((OCTEP_CTRL_MBOX_F2HQ_INFO_O= FFSET(m)) + 4) -#define OCTEP_CTRL_MBOX_F2HQ_ELEM_SZ_OFFSET(m) ((OCTEP_CTRL_MBOX_F2HQ_INF= O_OFFSET(m)) + 8) -#define OCTEP_CTRL_MBOX_F2HQ_ELEM_CNT_OFFSET(m) ((OCTEP_CTRL_MBOX_F2HQ_IN= FO_OFFSET(m)) + 12) - -#define OCTEP_CTRL_MBOX_Q_OFFSET(m, i) ((m) + \ - (sizeof(struct octep_ctrl_mbox_msg) * (i))) - -static u32 octep_ctrl_mbox_circq_inc(u32 index, u32 mask) +/* Size of mbox info in bytes */ +#define OCTEP_CTRL_MBOX_INFO_SZ 256 +/* Size of mbox host to fw queue info in bytes */ +#define OCTEP_CTRL_MBOX_H2FQ_INFO_SZ 16 +/* Size of mbox fw to host queue info in bytes */ +#define OCTEP_CTRL_MBOX_F2HQ_INFO_SZ 16 + +#define OCTEP_CTRL_MBOX_TOTAL_INFO_SZ (OCTEP_CTRL_MBOX_INFO_SZ + \ + OCTEP_CTRL_MBOX_H2FQ_INFO_SZ + \ + OCTEP_CTRL_MBOX_F2HQ_INFO_SZ) + +#define OCTEP_CTRL_MBOX_INFO_MAGIC_NUM(m) (m) +#define OCTEP_CTRL_MBOX_INFO_BARMEM_SZ(m) ((m) + 8) +#define OCTEP_CTRL_MBOX_INFO_HOST_STATUS(m) ((m) + 24) +#define OCTEP_CTRL_MBOX_INFO_FW_STATUS(m) ((m) + 144) + +#define OCTEP_CTRL_MBOX_H2FQ_INFO(m) ((m) + OCTEP_CTRL_MBOX_INFO_SZ) +#define OCTEP_CTRL_MBOX_H2FQ_PROD(m) (OCTEP_CTRL_MBOX_H2FQ_INFO(m)) +#define OCTEP_CTRL_MBOX_H2FQ_CONS(m) ((OCTEP_CTRL_MBOX_H2FQ_INFO(m)) + 4) +#define OCTEP_CTRL_MBOX_H2FQ_SZ(m) ((OCTEP_CTRL_MBOX_H2FQ_INFO(m)) + 8) + +#define OCTEP_CTRL_MBOX_F2HQ_INFO(m) ((m) + \ + OCTEP_CTRL_MBOX_INFO_SZ + \ + OCTEP_CTRL_MBOX_H2FQ_INFO_SZ) +#define OCTEP_CTRL_MBOX_F2HQ_PROD(m) (OCTEP_CTRL_MBOX_F2HQ_INFO(m)) +#define OCTEP_CTRL_MBOX_F2HQ_CONS(m) ((OCTEP_CTRL_MBOX_F2HQ_INFO(m)) + 4) +#define OCTEP_CTRL_MBOX_F2HQ_SZ(m) ((OCTEP_CTRL_MBOX_F2HQ_INFO(m)) + 8) + +static const u32 mbox_hdr_sz =3D sizeof(union octep_ctrl_mbox_msg_hdr); + +static u32 octep_ctrl_mbox_circq_inc(u32 index, u32 inc, u32 sz) { - return (index + 1) & mask; + return (index + inc) % sz; } =20 -static u32 octep_ctrl_mbox_circq_space(u32 pi, u32 ci, u32 mask) +static u32 octep_ctrl_mbox_circq_space(u32 pi, u32 ci, u32 sz) { - return mask - ((pi - ci) & mask); + return sz - (abs(pi - ci) % sz); } =20 -static u32 octep_ctrl_mbox_circq_depth(u32 pi, u32 ci, u32 mask) +static u32 octep_ctrl_mbox_circq_depth(u32 pi, u32 ci, u32 sz) { - return ((pi - ci) & mask); + return (abs(pi - ci) % sz); } =20 int octep_ctrl_mbox_init(struct octep_ctrl_mbox *mbox) @@ -73,153 +81,170 @@ int octep_ctrl_mbox_init(struct octep_ctrl_mbox *mbox) return -EINVAL; } =20 - magic_num =3D readq(OCTEP_CTRL_MBOX_INFO_MAGIC_NUM_OFFSET(mbox->barmem)); + magic_num =3D readq(OCTEP_CTRL_MBOX_INFO_MAGIC_NUM(mbox->barmem)); if (magic_num !=3D OCTEP_CTRL_MBOX_MAGIC_NUMBER) { pr_info("octep_ctrl_mbox : Invalid magic number %llx\n", magic_num); return -EINVAL; } =20 - status =3D readq(OCTEP_CTRL_MBOX_INFO_FW_STATUS_OFFSET(mbox->barmem)); + status =3D readq(OCTEP_CTRL_MBOX_INFO_FW_STATUS(mbox->barmem)); if (status !=3D OCTEP_CTRL_MBOX_STATUS_READY) { pr_info("octep_ctrl_mbox : Firmware is not ready.\n"); return -EINVAL; } =20 - mbox->barmem_sz =3D readl(OCTEP_CTRL_MBOX_INFO_BARMEM_SZ_OFFSET(mbox->bar= mem)); + mbox->barmem_sz =3D readl(OCTEP_CTRL_MBOX_INFO_BARMEM_SZ(mbox->barmem)); =20 - writeq(OCTEP_CTRL_MBOX_STATUS_INIT, OCTEP_CTRL_MBOX_INFO_HOST_STATUS_OFFS= ET(mbox->barmem)); + writeq(OCTEP_CTRL_MBOX_STATUS_INIT, + OCTEP_CTRL_MBOX_INFO_HOST_STATUS(mbox->barmem)); =20 - mbox->h2fq.elem_cnt =3D readl(OCTEP_CTRL_MBOX_H2FQ_ELEM_CNT_OFFSET(mbox->= barmem)); - mbox->h2fq.elem_sz =3D readl(OCTEP_CTRL_MBOX_H2FQ_ELEM_SZ_OFFSET(mbox->ba= rmem)); - mbox->h2fq.mask =3D (mbox->h2fq.elem_cnt - 1); - mutex_init(&mbox->h2fq_lock); + mbox->h2fq.sz =3D readl(OCTEP_CTRL_MBOX_H2FQ_SZ(mbox->barmem)); + mbox->h2fq.hw_prod =3D OCTEP_CTRL_MBOX_H2FQ_PROD(mbox->barmem); + mbox->h2fq.hw_cons =3D OCTEP_CTRL_MBOX_H2FQ_CONS(mbox->barmem); + mbox->h2fq.hw_q =3D mbox->barmem + OCTEP_CTRL_MBOX_TOTAL_INFO_SZ; =20 - mbox->f2hq.elem_cnt =3D readl(OCTEP_CTRL_MBOX_F2HQ_ELEM_CNT_OFFSET(mbox->= barmem)); - mbox->f2hq.elem_sz =3D readl(OCTEP_CTRL_MBOX_F2HQ_ELEM_SZ_OFFSET(mbox->ba= rmem)); - mbox->f2hq.mask =3D (mbox->f2hq.elem_cnt - 1); - mutex_init(&mbox->f2hq_lock); - - mbox->h2fq.hw_prod =3D OCTEP_CTRL_MBOX_H2FQ_PROD_OFFSET(mbox->barmem); - mbox->h2fq.hw_cons =3D OCTEP_CTRL_MBOX_H2FQ_CONS_OFFSET(mbox->barmem); - mbox->h2fq.hw_q =3D mbox->barmem + - OCTEP_CTRL_MBOX_INFO_SZ + - OCTEP_CTRL_MBOX_H2FQ_INFO_SZ + - OCTEP_CTRL_MBOX_F2HQ_INFO_SZ; - - mbox->f2hq.hw_prod =3D OCTEP_CTRL_MBOX_F2HQ_PROD_OFFSET(mbox->barmem); - mbox->f2hq.hw_cons =3D OCTEP_CTRL_MBOX_F2HQ_CONS_OFFSET(mbox->barmem); - mbox->f2hq.hw_q =3D mbox->h2fq.hw_q + - ((mbox->h2fq.elem_sz + sizeof(union octep_ctrl_mbox_msg_hdr)) * - mbox->h2fq.elem_cnt); + mbox->f2hq.sz =3D readl(OCTEP_CTRL_MBOX_F2HQ_SZ(mbox->barmem)); + mbox->f2hq.hw_prod =3D OCTEP_CTRL_MBOX_F2HQ_PROD(mbox->barmem); + mbox->f2hq.hw_cons =3D OCTEP_CTRL_MBOX_F2HQ_CONS(mbox->barmem); + mbox->f2hq.hw_q =3D mbox->barmem + + OCTEP_CTRL_MBOX_TOTAL_INFO_SZ + + mbox->h2fq.sz; =20 /* ensure ready state is seen after everything is initialized */ wmb(); - writeq(OCTEP_CTRL_MBOX_STATUS_READY, OCTEP_CTRL_MBOX_INFO_HOST_STATUS_OFF= SET(mbox->barmem)); + writeq(OCTEP_CTRL_MBOX_STATUS_READY, + OCTEP_CTRL_MBOX_INFO_HOST_STATUS(mbox->barmem)); =20 pr_info("Octep ctrl mbox : Init successful.\n"); =20 return 0; } =20 +static void +octep_write_mbox_data(struct octep_ctrl_mbox_q *q, u32 *pi, u32 ci, void *= buf, u32 w_sz) +{ + u8 __iomem *qbuf; + u32 cp_sz; + + /* Assumption: Caller has ensured enough write space */ + qbuf =3D (q->hw_q + *pi); + if (*pi < ci) { + /* copy entire w_sz */ + memcpy_toio(qbuf, buf, w_sz); + *pi =3D octep_ctrl_mbox_circq_inc(*pi, w_sz, q->sz); + } else { + /* copy up to end of queue */ + cp_sz =3D min((q->sz - *pi), w_sz); + memcpy_toio(qbuf, buf, cp_sz); + w_sz -=3D cp_sz; + *pi =3D octep_ctrl_mbox_circq_inc(*pi, cp_sz, q->sz); + if (w_sz) { + /* roll over and copy remaining w_sz */ + buf +=3D cp_sz; + qbuf =3D (q->hw_q + *pi); + memcpy_toio(qbuf, buf, w_sz); + *pi =3D octep_ctrl_mbox_circq_inc(*pi, w_sz, q->sz); + } + } +} + int octep_ctrl_mbox_send(struct octep_ctrl_mbox *mbox, struct octep_ctrl_m= box_msg *msg) { - unsigned long timeout =3D msecs_to_jiffies(OCTEP_CTRL_MBOX_MSG_TIMEOUT_MS= ); - unsigned long period =3D msecs_to_jiffies(OCTEP_CTRL_MBOX_MSG_WAIT_MS); + struct octep_ctrl_mbox_msg_buf *sg; struct octep_ctrl_mbox_q *q; - unsigned long expire; - u64 *mbuf, *word0; - u8 __iomem *qidx; - u16 pi, ci; - int i; + u32 pi, ci, buf_sz, w_sz; + int s; =20 if (!mbox || !msg) return -EINVAL; =20 + if (readq(OCTEP_CTRL_MBOX_INFO_FW_STATUS(mbox->barmem)) !=3D OCTEP_CTRL_M= BOX_STATUS_READY) + return -EIO; + + mutex_lock(&mbox->h2fq_lock); q =3D &mbox->h2fq; pi =3D readl(q->hw_prod); ci =3D readl(q->hw_cons); =20 - if (!octep_ctrl_mbox_circq_space(pi, ci, q->mask)) - return -ENOMEM; - - qidx =3D OCTEP_CTRL_MBOX_Q_OFFSET(q->hw_q, pi); - mbuf =3D (u64 *)msg->msg; - word0 =3D &msg->hdr.word0; - - mutex_lock(&mbox->h2fq_lock); - for (i =3D 1; i <=3D msg->hdr.sizew; i++) - writeq(*mbuf++, (qidx + (i * 8))); - - writeq(*word0, qidx); + if (octep_ctrl_mbox_circq_space(pi, ci, q->sz) < (msg->hdr.s.sz + mbox_hd= r_sz)) { + mutex_unlock(&mbox->f2hq_lock); + return -EAGAIN; + } =20 - pi =3D octep_ctrl_mbox_circq_inc(pi, q->mask); + octep_write_mbox_data(q, &pi, ci, (void *)&msg->hdr, mbox_hdr_sz); + buf_sz =3D msg->hdr.s.sz; + for (s =3D 0; ((s < msg->sg_num) && (buf_sz > 0)); s++) { + sg =3D &msg->sg_list[s]; + w_sz =3D (sg->sz <=3D buf_sz) ? sg->sz : buf_sz; + octep_write_mbox_data(q, &pi, ci, sg->msg, w_sz); + buf_sz -=3D w_sz; + } writel(pi, q->hw_prod); mutex_unlock(&mbox->h2fq_lock); =20 - /* don't check for notification response */ - if (msg->hdr.flags & OCTEP_CTRL_MBOX_MSG_HDR_FLAG_NOTIFY) - return 0; - - expire =3D jiffies + timeout; - while (true) { - *word0 =3D readq(qidx); - if (msg->hdr.flags =3D=3D OCTEP_CTRL_MBOX_MSG_HDR_FLAG_RESP) - break; - schedule_timeout_interruptible(period); - if (signal_pending(current) || time_after(jiffies, expire)) { - pr_info("octep_ctrl_mbox: Timed out\n"); - return -EBUSY; + return 0; +} + +static void +octep_read_mbox_data(struct octep_ctrl_mbox_q *q, u32 pi, u32 *ci, void *b= uf, u32 r_sz) +{ + u8 __iomem *qbuf; + u32 cp_sz; + + /* Assumption: Caller has ensured enough read space */ + qbuf =3D (q->hw_q + *ci); + if (*ci < pi) { + /* copy entire r_sz */ + memcpy_fromio(buf, qbuf, r_sz); + *ci =3D octep_ctrl_mbox_circq_inc(*ci, r_sz, q->sz); + } else { + /* copy up to end of queue */ + cp_sz =3D min((q->sz - *ci), r_sz); + memcpy_fromio(buf, qbuf, cp_sz); + r_sz -=3D cp_sz; + *ci =3D octep_ctrl_mbox_circq_inc(*ci, cp_sz, q->sz); + if (r_sz) { + /* roll over and copy remaining r_sz */ + buf +=3D cp_sz; + qbuf =3D (q->hw_q + *ci); + memcpy_fromio(buf, qbuf, r_sz); + *ci =3D octep_ctrl_mbox_circq_inc(*ci, r_sz, q->sz); } } - mbuf =3D (u64 *)msg->msg; - for (i =3D 1; i <=3D msg->hdr.sizew; i++) - *mbuf++ =3D readq(qidx + (i * 8)); - - return 0; } =20 int octep_ctrl_mbox_recv(struct octep_ctrl_mbox *mbox, struct octep_ctrl_m= box_msg *msg) { + struct octep_ctrl_mbox_msg_buf *sg; + u32 pi, ci, r_sz, buf_sz, q_depth; struct octep_ctrl_mbox_q *q; - u32 count, pi, ci; - u8 __iomem *qidx; - u64 *mbuf; - int i; + int s; =20 - if (!mbox || !msg) - return -EINVAL; + if (readq(OCTEP_CTRL_MBOX_INFO_FW_STATUS(mbox->barmem)) !=3D OCTEP_CTRL_M= BOX_STATUS_READY) + return -EIO; =20 + mutex_lock(&mbox->f2hq_lock); q =3D &mbox->f2hq; pi =3D readl(q->hw_prod); ci =3D readl(q->hw_cons); - count =3D octep_ctrl_mbox_circq_depth(pi, ci, q->mask); - if (!count) - return -EAGAIN; - - qidx =3D OCTEP_CTRL_MBOX_Q_OFFSET(q->hw_q, ci); - mbuf =3D (u64 *)msg->msg; =20 - mutex_lock(&mbox->f2hq_lock); - - msg->hdr.word0 =3D readq(qidx); - for (i =3D 1; i <=3D msg->hdr.sizew; i++) - *mbuf++ =3D readq(qidx + (i * 8)); + q_depth =3D octep_ctrl_mbox_circq_depth(pi, ci, q->sz); + if (q_depth < mbox_hdr_sz) { + mutex_unlock(&mbox->f2hq_lock); + return -EAGAIN; + } =20 - ci =3D octep_ctrl_mbox_circq_inc(ci, q->mask); + octep_read_mbox_data(q, pi, &ci, (void *)&msg->hdr, mbox_hdr_sz); + buf_sz =3D msg->hdr.s.sz; + for (s =3D 0; ((s < msg->sg_num) && (buf_sz > 0)); s++) { + sg =3D &msg->sg_list[s]; + r_sz =3D (sg->sz <=3D buf_sz) ? sg->sz : buf_sz; + octep_read_mbox_data(q, pi, &ci, sg->msg, r_sz); + buf_sz -=3D r_sz; + } writel(ci, q->hw_cons); - mutex_unlock(&mbox->f2hq_lock); =20 - if (msg->hdr.flags !=3D OCTEP_CTRL_MBOX_MSG_HDR_FLAG_REQ || !mbox->proces= s_req) - return 0; - - mbox->process_req(mbox->user_ctx, msg); - mbuf =3D (u64 *)msg->msg; - for (i =3D 1; i <=3D msg->hdr.sizew; i++) - writeq(*mbuf++, (qidx + (i * 8))); - - writeq(msg->hdr.word0, qidx); - return 0; } =20 @@ -227,18 +252,17 @@ int octep_ctrl_mbox_uninit(struct octep_ctrl_mbox *mb= ox) { if (!mbox) return -EINVAL; + if (!mbox->barmem) + return -EINVAL; =20 - writeq(OCTEP_CTRL_MBOX_STATUS_UNINIT, - OCTEP_CTRL_MBOX_INFO_HOST_STATUS_OFFSET(mbox->barmem)); + writeq(OCTEP_CTRL_MBOX_STATUS_INVALID, + OCTEP_CTRL_MBOX_INFO_HOST_STATUS(mbox->barmem)); /* ensure uninit state is written before uninitialization */ wmb(); =20 mutex_destroy(&mbox->h2fq_lock); mutex_destroy(&mbox->f2hq_lock); =20 - writeq(OCTEP_CTRL_MBOX_STATUS_INVALID, - OCTEP_CTRL_MBOX_INFO_HOST_STATUS_OFFSET(mbox->barmem)); - pr_info("Octep ctrl mbox : Uninit successful.\n"); =20 return 0; diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.h b/dri= vers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.h index 2dc5753cfec6..9c4ff0fba6a0 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.h +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_mbox.h @@ -27,50 +27,39 @@ * |-------------------------------------------| * |producer index (4 bytes) | * |consumer index (4 bytes) | - * |element size (4 bytes) | - * |element count (4 bytes) | + * |max element size (4 bytes) | + * |reserved (4 bytes) | * |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D| * |Fw to Host Queue info (16 bytes) | * |-------------------------------------------| * |producer index (4 bytes) | * |consumer index (4 bytes) | - * |element size (4 bytes) | - * |element count (4 bytes) | + * |max element size (4 bytes) | + * |reserved (4 bytes) | * |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D| - * |Host to Fw Queue | + * |Host to Fw Queue ((total size-288/2) bytes)| * |-------------------------------------------| - * |((elem_sz + hdr(8 bytes)) * elem_cnt) bytes| + * | | * |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D| * |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D| - * |Fw to Host Queue | + * |Fw to Host Queue ((total size-288/2) bytes)| * |-------------------------------------------| - * |((elem_sz + hdr(8 bytes)) * elem_cnt) bytes| + * | | * |=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D| */ =20 #define OCTEP_CTRL_MBOX_MAGIC_NUMBER 0xdeaddeadbeefbeefull =20 -/* Size of mbox info in bytes */ -#define OCTEP_CTRL_MBOX_INFO_SZ 256 -/* Size of mbox host to target queue info in bytes */ -#define OCTEP_CTRL_MBOX_H2FQ_INFO_SZ 16 -/* Size of mbox target to host queue info in bytes */ -#define OCTEP_CTRL_MBOX_F2HQ_INFO_SZ 16 -/* Size of mbox queue in bytes */ -#define OCTEP_CTRL_MBOX_Q_SZ(sz, cnt) (((sz) + 8) * (cnt)) -/* Size of mbox in bytes */ -#define OCTEP_CTRL_MBOX_SZ(hsz, hcnt, fsz, fcnt) (OCTEP_CTRL_MBOX_INFO_SZ = + \ - OCTEP_CTRL_MBOX_H2FQ_INFO_SZ + \ - OCTEP_CTRL_MBOX_F2HQ_INFO_SZ + \ - OCTEP_CTRL_MBOX_Q_SZ(hsz, hcnt) + \ - OCTEP_CTRL_MBOX_Q_SZ(fsz, fcnt)) - /* Valid request message */ #define OCTEP_CTRL_MBOX_MSG_HDR_FLAG_REQ BIT(0) /* Valid response message */ #define OCTEP_CTRL_MBOX_MSG_HDR_FLAG_RESP BIT(1) /* Valid notification, no response required */ #define OCTEP_CTRL_MBOX_MSG_HDR_FLAG_NOTIFY BIT(2) +/* Valid custom message */ +#define OCTEP_CTRL_MBOX_MSG_HDR_FLAG_CUSTOM BIT(3) + +#define OCTEP_CTRL_MBOX_MSG_DESC_MAX 4 =20 enum octep_ctrl_mbox_status { OCTEP_CTRL_MBOX_STATUS_INVALID =3D 0, @@ -81,31 +70,48 @@ enum octep_ctrl_mbox_status { =20 /* mbox message */ union octep_ctrl_mbox_msg_hdr { - u64 word0; + u64 words[2]; struct { + /* must be 0 */ + u16 reserved1:15; + /* vf_idx is valid if 1 */ + u16 is_vf:1; + /* sender vf index 0-(n-1), 0 if (is_vf=3D=3D0) */ + u16 vf_idx; + /* total size of message excluding header */ + u32 sz; /* OCTEP_CTRL_MBOX_MSG_HDR_FLAG_* */ u32 flags; - /* size of message in words excluding header */ - u32 sizew; - }; + /* identifier to match responses */ + u16 msg_id; + u16 reserved2; + } s; +}; + +/* mbox message buffer */ +struct octep_ctrl_mbox_msg_buf { + u32 reserved1; + u16 reserved2; + /* size of buffer */ + u16 sz; + /* pointer to message buffer */ + void *msg; }; =20 /* mbox message */ struct octep_ctrl_mbox_msg { /* mbox transaction header */ union octep_ctrl_mbox_msg_hdr hdr; - /* pointer to message buffer */ - void *msg; + /* number of sg buffer's */ + int sg_num; + /* message buffer's */ + struct octep_ctrl_mbox_msg_buf sg_list[OCTEP_CTRL_MBOX_MSG_DESC_MAX]; }; =20 /* Mbox queue */ struct octep_ctrl_mbox_q { - /* q element size, should be aligned to unsigned long */ - u16 elem_sz; - /* q element count, should be power of 2 */ - u16 elem_cnt; - /* q mask */ - u16 mask; + /* size of queue buffer */ + u32 sz; /* producer address in bar mem */ u8 __iomem *hw_prod; /* consumer address in bar mem */ @@ -115,16 +121,10 @@ struct octep_ctrl_mbox_q { }; =20 struct octep_ctrl_mbox { - /* host driver version */ - u64 version; /* size of bar memory */ u32 barmem_sz; /* pointer to BAR memory */ u8 __iomem *barmem; - /* user context for callback, can be null */ - void *user_ctx; - /* callback handler for processing request, called from octep_ctrl_mbox_r= ecv */ - int (*process_req)(void *user_ctx, struct octep_ctrl_mbox_msg *msg); /* host-to-fw queue */ struct octep_ctrl_mbox_q h2fq; /* fw-to-host queue */ @@ -146,6 +146,8 @@ int octep_ctrl_mbox_init(struct octep_ctrl_mbox *mbox); /* Send mbox message. * * @param mbox: non-null pointer to struct octep_ctrl_mbox. + * @param msg: non-null pointer to struct octep_ctrl_mbox_msg. + * Caller should fill msg.sz and msg.desc.sz for each message. * * return value: 0 on success, -errno on failure. */ @@ -154,6 +156,8 @@ int octep_ctrl_mbox_send(struct octep_ctrl_mbox *mbox, = struct octep_ctrl_mbox_ms /* Retrieve mbox message. * * @param mbox: non-null pointer to struct octep_ctrl_mbox. + * @param msg: non-null pointer to struct octep_ctrl_mbox_msg. + * Caller should fill msg.sz and msg.desc.sz for each message. * * return value: 0 on success, -errno on failure. */ @@ -161,7 +165,7 @@ int octep_ctrl_mbox_recv(struct octep_ctrl_mbox *mbox, = struct octep_ctrl_mbox_ms =20 /* Uninitialize control mbox. * - * @param ep: non-null pointer to struct octep_ctrl_mbox. + * @param mbox: non-null pointer to struct octep_ctrl_mbox. * * return value: 0 on success, -errno on failure. */ diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c b/driv= ers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c index 7c00c896ab98..8d4d74e18a67 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c @@ -8,134 +8,194 @@ #include #include #include +#include =20 #include "octep_config.h" #include "octep_main.h" #include "octep_ctrl_net.h" =20 -int octep_get_link_status(struct octep_device *oct) +static const u32 req_hdr_sz =3D sizeof(union octep_ctrl_net_req_hdr); +static const u32 mtu_sz =3D sizeof(struct octep_ctrl_net_h2f_req_cmd_mtu); +static const u32 mac_sz =3D sizeof(struct octep_ctrl_net_h2f_req_cmd_mac); +static const u32 state_sz =3D sizeof(struct octep_ctrl_net_h2f_req_cmd_sta= te); +static const u32 link_info_sz =3D sizeof(struct octep_ctrl_net_link_info); +static const u32 get_stats_sz =3D sizeof(struct octep_ctrl_net_h2f_req_cmd= _get_stats); +static atomic_t ctrl_net_msg_id; + +static void init_send_req(struct octep_ctrl_mbox_msg *msg, void *buf, u16 = sz) { - struct octep_ctrl_net_h2f_req req =3D {}; - struct octep_ctrl_net_h2f_resp *resp; - struct octep_ctrl_mbox_msg msg =3D {}; - int err; + msg->hdr.s.flags =3D OCTEP_CTRL_MBOX_MSG_HDR_FLAG_REQ; + msg->hdr.s.msg_id =3D atomic_inc_return(&ctrl_net_msg_id) & + GENMASK(sizeof(msg->hdr.s.msg_id) * BITS_PER_BYTE, 0); + msg->hdr.s.sz =3D req_hdr_sz + sz; + msg->sg_num =3D 1; + msg->sg_list[0].msg =3D buf; + msg->sg_list[0].sz =3D msg->hdr.s.sz; +} =20 - req.hdr.cmd =3D OCTEP_CTRL_NET_H2F_CMD_LINK_STATUS; - req.link.cmd =3D OCTEP_CTRL_NET_CMD_GET; +static int octep_send_mbox_req(struct octep_device *oct, + struct octep_ctrl_net_wait_data *d, + bool wait_for_response) +{ + int err, ret; =20 - msg.hdr.flags =3D OCTEP_CTRL_MBOX_MSG_HDR_FLAG_REQ; - msg.hdr.sizew =3D OCTEP_CTRL_NET_H2F_STATE_REQ_SZW; - msg.msg =3D &req; - err =3D octep_ctrl_mbox_send(&oct->ctrl_mbox, &msg); - if (err) + err =3D octep_ctrl_mbox_send(&oct->ctrl_mbox, &d->msg); + if (err < 0) return err; =20 - resp =3D (struct octep_ctrl_net_h2f_resp *)&req; - return resp->link.state; + if (!wait_for_response) + return 0; + + d->done =3D 0; + INIT_LIST_HEAD(&d->list); + list_add_tail(&d->list, &oct->ctrl_req_wait_list); + ret =3D wait_event_interruptible_timeout(oct->ctrl_req_wait_q, + (d->done !=3D 0), + jiffies + msecs_to_jiffies(500)); + list_del(&d->list); + if (ret =3D=3D 0 || ret =3D=3D 1) + return -EAGAIN; + + /** + * (ret =3D=3D 0) cond =3D false && timeout, return 0 + * (ret < 0) interrupted by signal, return 0 + * (ret =3D=3D 1) cond =3D true && timeout, return 1 + * (ret >=3D 1) cond =3D true && !timeout, return 1 + */ + + if (d->data.resp.hdr.s.reply !=3D OCTEP_CTRL_NET_REPLY_OK) + return -EAGAIN; + + return 0; +} + +int octep_ctrl_net_init(struct octep_device *oct) +{ + struct octep_ctrl_mbox *ctrl_mbox; + struct pci_dev *pdev =3D oct->pdev; + int ret; + + init_waitqueue_head(&oct->ctrl_req_wait_q); + INIT_LIST_HEAD(&oct->ctrl_req_wait_list); + + /* Initialize control mbox */ + ctrl_mbox =3D &oct->ctrl_mbox; + ctrl_mbox->barmem =3D CFG_GET_CTRL_MBOX_MEM_ADDR(oct->conf); + ret =3D octep_ctrl_mbox_init(ctrl_mbox); + if (ret) { + dev_err(&pdev->dev, "Failed to initialize control mbox\n"); + return ret; + } + oct->ctrl_mbox_ifstats_offset =3D ctrl_mbox->barmem_sz; + + return 0; } =20 -void octep_set_link_status(struct octep_device *oct, bool up) +int octep_ctrl_net_get_link_status(struct octep_device *oct) { - struct octep_ctrl_net_h2f_req req =3D {}; - struct octep_ctrl_mbox_msg msg =3D {}; + struct octep_ctrl_net_wait_data d =3D {0}; + struct octep_ctrl_net_h2f_req *req =3D &d.data.req; + int err; =20 - req.hdr.cmd =3D OCTEP_CTRL_NET_H2F_CMD_LINK_STATUS; - req.link.cmd =3D OCTEP_CTRL_NET_CMD_SET; - req.link.state =3D (up) ? OCTEP_CTRL_NET_STATE_UP : OCTEP_CTRL_NET_STATE_= DOWN; + init_send_req(&d.msg, (void *)req, state_sz); + req->hdr.s.cmd =3D OCTEP_CTRL_NET_H2F_CMD_LINK_STATUS; + req->link.cmd =3D OCTEP_CTRL_NET_CMD_GET; + err =3D octep_send_mbox_req(oct, &d, true); + if (err < 0) + return err; =20 - msg.hdr.flags =3D OCTEP_CTRL_MBOX_MSG_HDR_FLAG_REQ; - msg.hdr.sizew =3D OCTEP_CTRL_NET_H2F_STATE_REQ_SZW; - msg.msg =3D &req; - octep_ctrl_mbox_send(&oct->ctrl_mbox, &msg); + return d.data.resp.link.state; } =20 -void octep_set_rx_state(struct octep_device *oct, bool up) +int octep_ctrl_net_set_link_status(struct octep_device *oct, bool up, + bool wait_for_response) { - struct octep_ctrl_net_h2f_req req =3D {}; - struct octep_ctrl_mbox_msg msg =3D {}; + struct octep_ctrl_net_wait_data d =3D {0}; + struct octep_ctrl_net_h2f_req *req =3D &d.data.req; =20 - req.hdr.cmd =3D OCTEP_CTRL_NET_H2F_CMD_RX_STATE; - req.link.cmd =3D OCTEP_CTRL_NET_CMD_SET; - req.link.state =3D (up) ? OCTEP_CTRL_NET_STATE_UP : OCTEP_CTRL_NET_STATE_= DOWN; + init_send_req(&d.msg, req, state_sz); + req->hdr.s.cmd =3D OCTEP_CTRL_NET_H2F_CMD_LINK_STATUS; + req->link.cmd =3D OCTEP_CTRL_NET_CMD_SET; + req->link.state =3D (up) ? OCTEP_CTRL_NET_STATE_UP : + OCTEP_CTRL_NET_STATE_DOWN; =20 - msg.hdr.flags =3D OCTEP_CTRL_MBOX_MSG_HDR_FLAG_REQ; - msg.hdr.sizew =3D OCTEP_CTRL_NET_H2F_STATE_REQ_SZW; - msg.msg =3D &req; - octep_ctrl_mbox_send(&oct->ctrl_mbox, &msg); + return octep_send_mbox_req(oct, &d, wait_for_response); } =20 -int octep_get_mac_addr(struct octep_device *oct, u8 *addr) +int octep_ctrl_net_set_rx_state(struct octep_device *oct, bool up, + bool wait_for_response) { - struct octep_ctrl_net_h2f_req req =3D {}; - struct octep_ctrl_net_h2f_resp *resp; - struct octep_ctrl_mbox_msg msg =3D {}; - int err; + struct octep_ctrl_net_wait_data d =3D {0}; + struct octep_ctrl_net_h2f_req *req =3D &d.data.req; =20 - req.hdr.cmd =3D OCTEP_CTRL_NET_H2F_CMD_MAC; - req.link.cmd =3D OCTEP_CTRL_NET_CMD_GET; + init_send_req(&d.msg, req, state_sz); + req->hdr.s.cmd =3D OCTEP_CTRL_NET_H2F_CMD_RX_STATE; + req->link.cmd =3D OCTEP_CTRL_NET_CMD_SET; + req->link.state =3D (up) ? OCTEP_CTRL_NET_STATE_UP : + OCTEP_CTRL_NET_STATE_DOWN; =20 - msg.hdr.flags =3D OCTEP_CTRL_MBOX_MSG_HDR_FLAG_REQ; - msg.hdr.sizew =3D OCTEP_CTRL_NET_H2F_MAC_REQ_SZW; - msg.msg =3D &req; - err =3D octep_ctrl_mbox_send(&oct->ctrl_mbox, &msg); - if (err) + return octep_send_mbox_req(oct, &d, wait_for_response); +} + +int octep_ctrl_net_get_mac_addr(struct octep_device *oct, u8 *addr) +{ + struct octep_ctrl_net_wait_data d =3D {0}; + struct octep_ctrl_net_h2f_req *req =3D &d.data.req; + int err; + + init_send_req(&d.msg, req, mac_sz); + req->hdr.s.cmd =3D OCTEP_CTRL_NET_H2F_CMD_MAC; + req->link.cmd =3D OCTEP_CTRL_NET_CMD_GET; + err =3D octep_send_mbox_req(oct, &d, true); + if (err < 0) return err; =20 - resp =3D (struct octep_ctrl_net_h2f_resp *)&req; - memcpy(addr, resp->mac.addr, ETH_ALEN); + memcpy(addr, d.data.resp.mac.addr, ETH_ALEN); =20 - return err; + return 0; } =20 -int octep_set_mac_addr(struct octep_device *oct, u8 *addr) +int octep_ctrl_net_set_mac_addr(struct octep_device *oct, u8 *addr, + bool wait_for_response) { - struct octep_ctrl_net_h2f_req req =3D {}; - struct octep_ctrl_mbox_msg msg =3D {}; - - req.hdr.cmd =3D OCTEP_CTRL_NET_H2F_CMD_MAC; - req.mac.cmd =3D OCTEP_CTRL_NET_CMD_SET; - memcpy(&req.mac.addr, addr, ETH_ALEN); + struct octep_ctrl_net_wait_data d =3D {0}; + struct octep_ctrl_net_h2f_req *req =3D &d.data.req; =20 - msg.hdr.flags =3D OCTEP_CTRL_MBOX_MSG_HDR_FLAG_REQ; - msg.hdr.sizew =3D OCTEP_CTRL_NET_H2F_MAC_REQ_SZW; - msg.msg =3D &req; + init_send_req(&d.msg, req, mac_sz); + req->hdr.s.cmd =3D OCTEP_CTRL_NET_H2F_CMD_MAC; + req->mac.cmd =3D OCTEP_CTRL_NET_CMD_SET; + memcpy(&req->mac.addr, addr, ETH_ALEN); =20 - return octep_ctrl_mbox_send(&oct->ctrl_mbox, &msg); + return octep_send_mbox_req(oct, &d, wait_for_response); } =20 -int octep_set_mtu(struct octep_device *oct, int mtu) +int octep_ctrl_net_set_mtu(struct octep_device *oct, int mtu, + bool wait_for_response) { - struct octep_ctrl_net_h2f_req req =3D {}; - struct octep_ctrl_mbox_msg msg =3D {}; + struct octep_ctrl_net_wait_data d =3D {0}; + struct octep_ctrl_net_h2f_req *req =3D &d.data.req; =20 - req.hdr.cmd =3D OCTEP_CTRL_NET_H2F_CMD_MTU; - req.mtu.cmd =3D OCTEP_CTRL_NET_CMD_SET; - req.mtu.val =3D mtu; + init_send_req(&d.msg, req, mtu_sz); + req->hdr.s.cmd =3D OCTEP_CTRL_NET_H2F_CMD_MTU; + req->mtu.cmd =3D OCTEP_CTRL_NET_CMD_SET; + req->mtu.val =3D mtu; =20 - msg.hdr.flags =3D OCTEP_CTRL_MBOX_MSG_HDR_FLAG_REQ; - msg.hdr.sizew =3D OCTEP_CTRL_NET_H2F_MTU_REQ_SZW; - msg.msg =3D &req; - - return octep_ctrl_mbox_send(&oct->ctrl_mbox, &msg); + return octep_send_mbox_req(oct, &d, wait_for_response); } =20 -int octep_get_if_stats(struct octep_device *oct) +int octep_ctrl_net_get_if_stats(struct octep_device *oct) { + struct octep_ctrl_net_wait_data d =3D {0}; + struct octep_ctrl_net_h2f_req *req =3D &d.data.req; void __iomem *iface_rx_stats; void __iomem *iface_tx_stats; - struct octep_ctrl_net_h2f_req req =3D {}; - struct octep_ctrl_mbox_msg msg =3D {}; int err; =20 - req.hdr.cmd =3D OCTEP_CTRL_NET_H2F_CMD_GET_IF_STATS; - req.mac.cmd =3D OCTEP_CTRL_NET_CMD_GET; - req.get_stats.offset =3D oct->ctrl_mbox_ifstats_offset; - - msg.hdr.flags =3D OCTEP_CTRL_MBOX_MSG_HDR_FLAG_REQ; - msg.hdr.sizew =3D OCTEP_CTRL_NET_H2F_GET_STATS_REQ_SZW; - msg.msg =3D &req; - err =3D octep_ctrl_mbox_send(&oct->ctrl_mbox, &msg); - if (err) + init_send_req(&d.msg, req, get_stats_sz); + req->hdr.s.cmd =3D OCTEP_CTRL_NET_H2F_CMD_GET_IF_STATS; + req->get_stats.offset =3D oct->ctrl_mbox_ifstats_offset; + err =3D octep_send_mbox_req(oct, &d, true); + if (err < 0) return err; =20 iface_rx_stats =3D oct->ctrl_mbox.barmem + oct->ctrl_mbox_ifstats_offset; @@ -144,51 +204,101 @@ int octep_get_if_stats(struct octep_device *oct) memcpy_fromio(&oct->iface_rx_stats, iface_rx_stats, sizeof(struct octep_i= face_rx_stats)); memcpy_fromio(&oct->iface_tx_stats, iface_tx_stats, sizeof(struct octep_i= face_tx_stats)); =20 - return err; + return 0; } =20 -int octep_get_link_info(struct octep_device *oct) +int octep_ctrl_net_get_link_info(struct octep_device *oct) { - struct octep_ctrl_net_h2f_req req =3D {}; + struct octep_ctrl_net_wait_data d =3D {0}; + struct octep_ctrl_net_h2f_req *req =3D &d.data.req; struct octep_ctrl_net_h2f_resp *resp; - struct octep_ctrl_mbox_msg msg =3D {}; int err; =20 - req.hdr.cmd =3D OCTEP_CTRL_NET_H2F_CMD_LINK_INFO; - req.mac.cmd =3D OCTEP_CTRL_NET_CMD_GET; - - msg.hdr.flags =3D OCTEP_CTRL_MBOX_MSG_HDR_FLAG_REQ; - msg.hdr.sizew =3D OCTEP_CTRL_NET_H2F_LINK_INFO_REQ_SZW; - msg.msg =3D &req; - err =3D octep_ctrl_mbox_send(&oct->ctrl_mbox, &msg); - if (err) + init_send_req(&d.msg, req, link_info_sz); + req->hdr.s.cmd =3D OCTEP_CTRL_NET_H2F_CMD_LINK_INFO; + req->link_info.cmd =3D OCTEP_CTRL_NET_CMD_GET; + err =3D octep_send_mbox_req(oct, &d, true); + if (err < 0) return err; =20 - resp =3D (struct octep_ctrl_net_h2f_resp *)&req; + resp =3D &d.data.resp; oct->link_info.supported_modes =3D resp->link_info.supported_modes; oct->link_info.advertised_modes =3D resp->link_info.advertised_modes; oct->link_info.autoneg =3D resp->link_info.autoneg; oct->link_info.pause =3D resp->link_info.pause; oct->link_info.speed =3D resp->link_info.speed; =20 - return err; + return 0; +} + +int octep_ctrl_net_set_link_info(struct octep_device *oct, + struct octep_iface_link_info *link_info, + bool wait_for_response) +{ + struct octep_ctrl_net_wait_data d =3D {0}; + struct octep_ctrl_net_h2f_req *req =3D &d.data.req; + + init_send_req(&d.msg, req, link_info_sz); + req->hdr.s.cmd =3D OCTEP_CTRL_NET_H2F_CMD_LINK_INFO; + req->link_info.cmd =3D OCTEP_CTRL_NET_CMD_SET; + req->link_info.info.advertised_modes =3D link_info->advertised_modes; + req->link_info.info.autoneg =3D link_info->autoneg; + req->link_info.info.pause =3D link_info->pause; + req->link_info.info.speed =3D link_info->speed; + + return octep_send_mbox_req(oct, &d, wait_for_response); } =20 -int octep_set_link_info(struct octep_device *oct, struct octep_iface_link_= info *link_info) +static void process_mbox_resp(struct octep_device *oct, + struct octep_ctrl_mbox_msg *msg) { - struct octep_ctrl_net_h2f_req req =3D {}; - struct octep_ctrl_mbox_msg msg =3D {}; + struct octep_ctrl_net_wait_data *pos, *n; + + list_for_each_entry_safe(pos, n, &oct->ctrl_req_wait_list, list) { + if (pos->msg.hdr.s.msg_id =3D=3D msg->hdr.s.msg_id) { + memcpy(&pos->data.resp, + msg->sg_list[0].msg, + msg->hdr.s.sz); + pos->done =3D 1; + wake_up_interruptible_all(&oct->ctrl_req_wait_q); + break; + } + } +} + +void octep_ctrl_net_recv_fw_messages(struct octep_device *oct) +{ + static u16 msg_sz =3D sizeof(union octep_ctrl_net_max_data); + union octep_ctrl_net_max_data data =3D {0}; + struct octep_ctrl_mbox_msg msg =3D {0}; + int ret; + + msg.hdr.s.sz =3D msg_sz; + msg.sg_num =3D 1; + msg.sg_list[0].sz =3D msg_sz; + msg.sg_list[0].msg =3D &data; + while (true) { + /* mbox will overwrite msg.hdr.s.sz so initialize it */ + msg.hdr.s.sz =3D msg_sz; + ret =3D octep_ctrl_mbox_recv(&oct->ctrl_mbox, (struct octep_ctrl_mbox_ms= g *)&msg); + if (ret < 0) + break; + + if (msg.hdr.s.flags & OCTEP_CTRL_MBOX_MSG_HDR_FLAG_RESP) + process_mbox_resp(oct, &msg); + } +} + +int octep_ctrl_net_uninit(struct octep_device *oct) +{ + struct octep_ctrl_net_wait_data *pos, *n; + + list_for_each_entry_safe(pos, n, &oct->ctrl_req_wait_list, list) + pos->done =3D 1; =20 - req.hdr.cmd =3D OCTEP_CTRL_NET_H2F_CMD_LINK_INFO; - req.link_info.cmd =3D OCTEP_CTRL_NET_CMD_SET; - req.link_info.info.advertised_modes =3D link_info->advertised_modes; - req.link_info.info.autoneg =3D link_info->autoneg; - req.link_info.info.pause =3D link_info->pause; - req.link_info.info.speed =3D link_info->speed; + wake_up_interruptible_all(&oct->ctrl_req_wait_q); =20 - msg.hdr.flags =3D OCTEP_CTRL_MBOX_MSG_HDR_FLAG_REQ; - msg.hdr.sizew =3D OCTEP_CTRL_NET_H2F_LINK_INFO_REQ_SZW; - msg.msg =3D &req; + octep_ctrl_mbox_uninit(&oct->ctrl_mbox); =20 - return octep_ctrl_mbox_send(&oct->ctrl_mbox, &msg); + return 0; } diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.h b/driv= ers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.h index f23b58381322..aba373ec28a4 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.h +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.h @@ -45,15 +45,18 @@ enum octep_ctrl_net_f2h_cmd { OCTEP_CTRL_NET_F2H_CMD_LINK_STATUS, }; =20 -struct octep_ctrl_net_req_hdr { - /* sender id */ - u16 sender; - /* receiver id */ - u16 receiver; - /* octep_ctrl_net_h2t_cmd */ - u16 cmd; - /* reserved */ - u16 rsvd0; +union octep_ctrl_net_req_hdr { + u64 words[1]; + struct { + /* sender id */ + u16 sender; + /* receiver id */ + u16 receiver; + /* octep_ctrl_net_h2t_cmd */ + u16 cmd; + /* reserved */ + u16 rsvd0; + } s; }; =20 /* get/set mtu request */ @@ -110,7 +113,7 @@ struct octep_ctrl_net_h2f_req_cmd_link_info { =20 /* Host to fw request data */ struct octep_ctrl_net_h2f_req { - struct octep_ctrl_net_req_hdr hdr; + union octep_ctrl_net_req_hdr hdr; union { struct octep_ctrl_net_h2f_req_cmd_mtu mtu; struct octep_ctrl_net_h2f_req_cmd_mac mac; @@ -121,15 +124,18 @@ struct octep_ctrl_net_h2f_req { }; } __packed; =20 -struct octep_ctrl_net_resp_hdr { - /* sender id */ - u16 sender; - /* receiver id */ - u16 receiver; - /* octep_ctrl_net_h2t_cmd */ - u16 cmd; - /* octep_ctrl_net_reply */ - u16 reply; +union octep_ctrl_net_resp_hdr { + u64 words[1]; + struct { + /* sender id */ + u16 sender; + /* receiver id */ + u16 receiver; + /* octep_ctrl_net_h2t_cmd */ + u16 cmd; + /* octep_ctrl_net_reply */ + u16 reply; + } s; }; =20 /* get mtu response */ @@ -152,7 +158,7 @@ struct octep_ctrl_net_h2f_resp_cmd_state { =20 /* Host to fw response data */ struct octep_ctrl_net_h2f_resp { - struct octep_ctrl_net_resp_hdr hdr; + union octep_ctrl_net_resp_hdr hdr; union { struct octep_ctrl_net_h2f_resp_cmd_mtu mtu; struct octep_ctrl_net_h2f_resp_cmd_mac mac; @@ -170,7 +176,7 @@ struct octep_ctrl_net_f2h_req_cmd_state { =20 /* Fw to host request data */ struct octep_ctrl_net_f2h_req { - struct octep_ctrl_net_req_hdr hdr; + union octep_ctrl_net_req_hdr hdr; union { struct octep_ctrl_net_f2h_req_cmd_state link; }; @@ -178,56 +184,34 @@ struct octep_ctrl_net_f2h_req { =20 /* Fw to host response data */ struct octep_ctrl_net_f2h_resp { - struct octep_ctrl_net_resp_hdr hdr; + union octep_ctrl_net_resp_hdr hdr; }; =20 -/* Size of host to fw octep_ctrl_mbox queue element */ -union octep_ctrl_net_h2f_data_sz { +/* Max data size to be transferred over mbox */ +union octep_ctrl_net_max_data { struct octep_ctrl_net_h2f_req h2f_req; struct octep_ctrl_net_h2f_resp h2f_resp; -}; - -/* Size of fw to host octep_ctrl_mbox queue element */ -union octep_ctrl_net_f2h_data_sz { struct octep_ctrl_net_f2h_req f2h_req; struct octep_ctrl_net_f2h_resp f2h_resp; }; =20 -/* size of host to fw data in words */ -#define OCTEP_CTRL_NET_H2F_DATA_SZW ((sizeof(union octep_ctrl_net_h2f_dat= a_sz)) / \ - (sizeof(unsigned long))) - -/* size of fw to host data in words */ -#define OCTEP_CTRL_NET_F2H_DATA_SZW ((sizeof(union octep_ctrl_net_f2h_dat= a_sz)) / \ - (sizeof(unsigned long))) - -/* size in words of get/set mtu request */ -#define OCTEP_CTRL_NET_H2F_MTU_REQ_SZW 2 -/* size in words of get/set mac request */ -#define OCTEP_CTRL_NET_H2F_MAC_REQ_SZW 2 -/* size in words of get stats request */ -#define OCTEP_CTRL_NET_H2F_GET_STATS_REQ_SZW 2 -/* size in words of get/set state request */ -#define OCTEP_CTRL_NET_H2F_STATE_REQ_SZW 2 -/* size in words of get/set link info request */ -#define OCTEP_CTRL_NET_H2F_LINK_INFO_REQ_SZW 4 - -/* size in words of get mtu response */ -#define OCTEP_CTRL_NET_H2F_GET_MTU_RESP_SZW 2 -/* size in words of set mtu response */ -#define OCTEP_CTRL_NET_H2F_SET_MTU_RESP_SZW 1 -/* size in words of get mac response */ -#define OCTEP_CTRL_NET_H2F_GET_MAC_RESP_SZW 2 -/* size in words of set mac response */ -#define OCTEP_CTRL_NET_H2F_SET_MAC_RESP_SZW 1 -/* size in words of get state request */ -#define OCTEP_CTRL_NET_H2F_GET_STATE_RESP_SZW 2 -/* size in words of set state request */ -#define OCTEP_CTRL_NET_H2F_SET_STATE_RESP_SZW 1 -/* size in words of get link info request */ -#define OCTEP_CTRL_NET_H2F_GET_LINK_INFO_RESP_SZW 4 -/* size in words of set link info request */ -#define OCTEP_CTRL_NET_H2F_SET_LINK_INFO_RESP_SZW 1 +struct octep_ctrl_net_wait_data { + struct list_head list; + int done; + struct octep_ctrl_mbox_msg msg; + union { + struct octep_ctrl_net_h2f_req req; + struct octep_ctrl_net_h2f_resp resp; + } data; +}; + +/** Initialize data for ctrl net. + * + * @param oct: non-null pointer to struct octep_device. + * + * return value: 0 on success, -errno on error. + */ +int octep_ctrl_net_init(struct octep_device *oct); =20 /** Get link status from firmware. * @@ -235,21 +219,29 @@ union octep_ctrl_net_f2h_data_sz { * * return value: link status 0=3Ddown, 1=3Dup. */ -int octep_get_link_status(struct octep_device *oct); +int octep_ctrl_net_get_link_status(struct octep_device *oct); =20 /** Set link status in firmware. * * @param oct: non-null pointer to struct octep_device. * @param up: boolean status. + * @param wait_for_response: poll for response. + * + * return value: 0 on success, -errno on failure */ -void octep_set_link_status(struct octep_device *oct, bool up); +int octep_ctrl_net_set_link_status(struct octep_device *oct, bool up, + bool wait_for_response); =20 /** Set rx state in firmware. * * @param oct: non-null pointer to struct octep_device. * @param up: boolean status. + * @param wait_for_response: poll for response. + * + * return value: 0 on success, -errno on failure. */ -void octep_set_rx_state(struct octep_device *oct, bool up); +int octep_ctrl_net_set_rx_state(struct octep_device *oct, bool up, + bool wait_for_response); =20 /** Get mac address from firmware. * @@ -258,21 +250,29 @@ void octep_set_rx_state(struct octep_device *oct, boo= l up); * * return value: 0 on success, -errno on failure. */ -int octep_get_mac_addr(struct octep_device *oct, u8 *addr); +int octep_ctrl_net_get_mac_addr(struct octep_device *oct, u8 *addr); =20 /** Set mac address in firmware. * * @param oct: non-null pointer to struct octep_device. * @param addr: non-null pointer to mac address. + * @param wait_for_response: poll for response. + * + * return value: 0 on success, -errno on failure. */ -int octep_set_mac_addr(struct octep_device *oct, u8 *addr); +int octep_ctrl_net_set_mac_addr(struct octep_device *oct, u8 *addr, + bool wait_for_response); =20 /** Set mtu in firmware. * * @param oct: non-null pointer to struct octep_device. * @param mtu: mtu. + * @param wait_for_response: poll for response. + * + * return value: 0 on success, -errno on failure. */ -int octep_set_mtu(struct octep_device *oct, int mtu); +int octep_ctrl_net_set_mtu(struct octep_device *oct, int mtu, + bool wait_for_response); =20 /** Get interface statistics from firmware. * @@ -280,7 +280,7 @@ int octep_set_mtu(struct octep_device *oct, int mtu); * * return value: 0 on success, -errno on failure. */ -int octep_get_if_stats(struct octep_device *oct); +int octep_ctrl_net_get_if_stats(struct octep_device *oct); =20 /** Get link info from firmware. * @@ -288,12 +288,32 @@ int octep_get_if_stats(struct octep_device *oct); * * return value: 0 on success, -errno on failure. */ -int octep_get_link_info(struct octep_device *oct); +int octep_ctrl_net_get_link_info(struct octep_device *oct); =20 /** Set link info in firmware. * * @param oct: non-null pointer to struct octep_device. + * @param link_info: non-null pointer to struct octep_iface_link_info. + * @param wait_for_response: poll for response. + * + * return value: 0 on success, -errno on failure. + */ +int octep_ctrl_net_set_link_info(struct octep_device *oct, + struct octep_iface_link_info *link_info, + bool wait_for_response); + +/** Poll for firmware messages and process them. + * + * @param oct: non-null pointer to struct octep_device. + */ +void octep_ctrl_net_recv_fw_messages(struct octep_device *oct); + +/** Uninitialize data for ctrl net. + * + * @param oct: non-null pointer to struct octep_device. + * + * return value: 0 on success, -errno on error. */ -int octep_set_link_info(struct octep_device *oct, struct octep_iface_link_= info *link_info); +int octep_ctrl_net_uninit(struct octep_device *oct); =20 #endif /* __OCTEP_CTRL_NET_H__ */ diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_ethtool.c b/drive= rs/net/ethernet/marvell/octeon_ep/octep_ethtool.c index 87ef129b269a..a1ddb64791f2 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_ethtool.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_ethtool.c @@ -150,7 +150,7 @@ octep_get_ethtool_stats(struct net_device *netdev, rx_packets =3D 0; rx_bytes =3D 0; =20 - octep_get_if_stats(oct); + octep_ctrl_net_get_if_stats(oct); iface_tx_stats =3D &oct->iface_tx_stats; iface_rx_stats =3D &oct->iface_rx_stats; =20 @@ -283,7 +283,7 @@ static int octep_get_link_ksettings(struct net_device *= netdev, ethtool_link_ksettings_zero_link_mode(cmd, supported); ethtool_link_ksettings_zero_link_mode(cmd, advertising); =20 - octep_get_link_info(oct); + octep_ctrl_net_get_link_info(oct); =20 advertised_modes =3D oct->link_info.advertised_modes; supported_modes =3D oct->link_info.supported_modes; @@ -439,7 +439,7 @@ static int octep_set_link_ksettings(struct net_device *= netdev, link_info_new.speed =3D cmd->base.speed; link_info_new.autoneg =3D autoneg; =20 - err =3D octep_set_link_info(oct, &link_info_new); + err =3D octep_ctrl_net_set_link_info(oct, &link_info_new, true); if (err) return err; =20 diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c b/drivers/= net/ethernet/marvell/octeon_ep/octep_main.c index a3e4d9355681..43fff8979854 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c @@ -507,11 +507,8 @@ static int octep_open(struct net_device *netdev) octep_napi_enable(oct); =20 oct->link_info.admin_up =3D 1; - octep_set_rx_state(oct, true); - - ret =3D octep_get_link_status(oct); - if (!ret) - octep_set_link_status(oct, true); + octep_ctrl_net_set_rx_state(oct, true, false); + octep_ctrl_net_set_link_status(oct, true, false); oct->poll_non_ioq_intr =3D false; =20 /* Enable the input and output queues for this Octeon device */ @@ -522,7 +519,7 @@ static int octep_open(struct net_device *netdev) =20 octep_oq_dbell_init(oct); =20 - ret =3D octep_get_link_status(oct); + ret =3D octep_ctrl_net_get_link_status(oct); if (ret > 0) octep_link_up(netdev); =20 @@ -552,14 +549,14 @@ static int octep_stop(struct net_device *netdev) =20 netdev_info(netdev, "Stopping the device ...\n"); =20 + octep_ctrl_net_set_link_status(oct, false, false); + octep_ctrl_net_set_rx_state(oct, false, false); + /* Stop Tx from stack */ netif_tx_stop_all_queues(netdev); netif_carrier_off(netdev); netif_tx_disable(netdev); =20 - octep_set_link_status(oct, false); - octep_set_rx_state(oct, false); - oct->link_info.admin_up =3D 0; oct->link_info.oper_up =3D 0; =20 @@ -761,7 +758,9 @@ static void octep_get_stats64(struct net_device *netdev, struct octep_device *oct =3D netdev_priv(netdev); int q; =20 - octep_get_if_stats(oct); + if (netif_running(netdev)) + octep_ctrl_net_get_if_stats(oct); + tx_packets =3D 0; tx_bytes =3D 0; rx_packets =3D 0; @@ -832,7 +831,7 @@ static int octep_set_mac(struct net_device *netdev, voi= d *p) if (!is_valid_ether_addr(addr->sa_data)) return -EADDRNOTAVAIL; =20 - err =3D octep_set_mac_addr(oct, addr->sa_data); + err =3D octep_ctrl_net_set_mac_addr(oct, addr->sa_data, true); if (err) return err; =20 @@ -852,7 +851,7 @@ static int octep_change_mtu(struct net_device *netdev, = int new_mtu) if (link_info->mtu =3D=3D new_mtu) return 0; =20 - err =3D octep_set_mtu(oct, new_mtu); + err =3D octep_ctrl_net_set_mtu(oct, new_mtu, true); if (!err) { oct->link_info.mtu =3D new_mtu; netdev->mtu =3D new_mtu; @@ -904,34 +903,8 @@ static void octep_ctrl_mbox_task(struct work_struct *w= ork) { struct octep_device *oct =3D container_of(work, struct octep_device, ctrl_mbox_task); - struct net_device *netdev =3D oct->netdev; - struct octep_ctrl_net_f2h_req req =3D {}; - struct octep_ctrl_mbox_msg msg; - int ret =3D 0; - - msg.msg =3D &req; - while (true) { - ret =3D octep_ctrl_mbox_recv(&oct->ctrl_mbox, &msg); - if (ret) - break; - - switch (req.hdr.cmd) { - case OCTEP_CTRL_NET_F2H_CMD_LINK_STATUS: - if (netif_running(netdev)) { - if (req.link.state) { - dev_info(&oct->pdev->dev, "netif_carrier_on\n"); - netif_carrier_on(netdev); - } else { - dev_info(&oct->pdev->dev, "netif_carrier_off\n"); - netif_carrier_off(netdev); - } - } - break; - default: - pr_info("Unknown mbox req : %u\n", req.hdr.cmd); - break; - } - } + + octep_ctrl_net_recv_fw_messages(oct); } =20 static const char *octep_devid_to_str(struct octep_device *oct) @@ -955,9 +928,8 @@ static const char *octep_devid_to_str(struct octep_devi= ce *oct) */ int octep_device_setup(struct octep_device *oct) { - struct octep_ctrl_mbox *ctrl_mbox; struct pci_dev *pdev =3D oct->pdev; - int i, ret; + int i; =20 /* allocate memory for oct->conf */ oct->conf =3D kzalloc(sizeof(*oct->conf), GFP_KERNEL); @@ -992,20 +964,7 @@ int octep_device_setup(struct octep_device *oct) =20 oct->pkind =3D CFG_GET_IQ_PKIND(oct->conf); =20 - /* Initialize control mbox */ - ctrl_mbox =3D &oct->ctrl_mbox; - ctrl_mbox->barmem =3D CFG_GET_CTRL_MBOX_MEM_ADDR(oct->conf); - ret =3D octep_ctrl_mbox_init(ctrl_mbox); - if (ret) { - dev_err(&pdev->dev, "Failed to initialize control mbox\n"); - goto unsupported_dev; - } - oct->ctrl_mbox_ifstats_offset =3D OCTEP_CTRL_MBOX_SZ(ctrl_mbox->h2fq.elem= _sz, - ctrl_mbox->h2fq.elem_cnt, - ctrl_mbox->f2hq.elem_sz, - ctrl_mbox->f2hq.elem_cnt); - - return 0; + return octep_ctrl_net_init(oct); =20 unsupported_dev: for (i =3D 0; i < OCTEP_MMIO_REGIONS; i++) @@ -1033,7 +992,7 @@ static void octep_device_cleanup(struct octep_device *= oct) oct->mbox[i] =3D NULL; } =20 - octep_ctrl_mbox_uninit(&oct->ctrl_mbox); + octep_ctrl_net_uninit(oct); =20 oct->hw_ops.soft_reset(oct); for (i =3D 0; i < OCTEP_MMIO_REGIONS; i++) { @@ -1143,7 +1102,8 @@ static int octep_probe(struct pci_dev *pdev, const st= ruct pci_device_id *ent) netdev->max_mtu =3D OCTEP_MAX_MTU; netdev->mtu =3D OCTEP_DEFAULT_MTU; =20 - err =3D octep_get_mac_addr(octep_dev, octep_dev->mac_addr); + err =3D octep_ctrl_net_get_mac_addr(octep_dev, + octep_dev->mac_addr); if (err) { dev_err(&pdev->dev, "Failed to get mac address\n"); goto register_dev_err; --=20 2.36.0 From nobody Sun Apr 28 00:56:27 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E2C2BC6FD20 for ; Fri, 24 Mar 2023 17:47:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232101AbjCXRrz (ORCPT ); Fri, 24 Mar 2023 13:47:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231925AbjCXRrb (ORCPT ); Fri, 24 Mar 2023 13:47:31 -0400 Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 710D11A4A5; Fri, 24 Mar 2023 10:47:29 -0700 (PDT) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32OHVwQm018470; Fri, 24 Mar 2023 10:47:17 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=64kKopHfhCK7LIAEMZReT3qlQQktwmmhfqes6nucHgA=; b=Vso9wbwYmjYvsORl/azm/p8QfYzKw2HAf3Pj/0D+m4hbwcTUkJi+2dEybaAx3H5bQR5L ynz00FYBoZ6O7N/5P3Mxd+aJLavIsbhZDHHWLNmkwOJ3G4nIwbsvX20e6g6+kmRRP9TT ijnw3xqGuwcRw28FYB/vYBNZKdSznO+b0EZ4a+ZDCBORcXp8RF9wUc/8FUnDeiHUXwzr 6p1qE0lGPDSZq980wgXrsrjYykybtc6yMXQi5smXlRuekci+4/NqmWCRskClq1gySdZj 12TRNyjEausbCcvQflIX9wA/t+Au992ErRRLlzlfybonPJ6LyxBtWwujDR1w7WQtQOvR yA== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3ph6q3td8t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Fri, 24 Mar 2023 10:47:17 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Fri, 24 Mar 2023 10:47:15 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Fri, 24 Mar 2023 10:47:15 -0700 Received: from sburla-PowerEdge-T630.sclab.marvell.com (unknown [10.106.27.217]) by maili.marvell.com (Postfix) with ESMTP id 085523F704A; Fri, 24 Mar 2023 10:47:15 -0700 (PDT) From: Veerasenareddy Burru To: , , , , CC: , Veerasenareddy Burru , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Subject: [PATCH net-next v5 5/8] octeon_ep: include function id in mailbox commands Date: Fri, 24 Mar 2023 10:47:00 -0700 Message-ID: <20230324174704.9752-6-vburru@marvell.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20230324174704.9752-1-vburru@marvell.com> References: <20230324174704.9752-1-vburru@marvell.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: qO4AzfXX8T0iS_cbuJxiv_PG5G7reZLg X-Proofpoint-ORIG-GUID: qO4AzfXX8T0iS_cbuJxiv_PG5G7reZLg X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-24_11,2023-03-24_01,2023-02-09_01 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Extend control command structure to include vfid and update APIs to accept VF ID. Signed-off-by: Abhijit Ayarekar Signed-off-by: Veerasenareddy Burru --- v4 -> v5: * no change v3 -> v4: * address review comments https://lore.kernel.org/all/Y+0AW3b9No9pyWrr@boxer/ * subset of 0004-xxx.patch moved to this new patch. .../marvell/octeon_ep/octep_ctrl_net.c | 43 +++++++++++-------- .../marvell/octeon_ep/octep_ctrl_net.h | 28 ++++++++---- .../marvell/octeon_ep/octep_ethtool.c | 7 +-- .../ethernet/marvell/octeon_ep/octep_main.c | 24 +++++++---- 4 files changed, 63 insertions(+), 39 deletions(-) diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c b/driv= ers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c index 8d4d74e18a67..cef4bc3b1ec0 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c @@ -22,7 +22,8 @@ static const u32 link_info_sz =3D sizeof(struct octep_ctr= l_net_link_info); static const u32 get_stats_sz =3D sizeof(struct octep_ctrl_net_h2f_req_cmd= _get_stats); static atomic_t ctrl_net_msg_id; =20 -static void init_send_req(struct octep_ctrl_mbox_msg *msg, void *buf, u16 = sz) +static void init_send_req(struct octep_ctrl_mbox_msg *msg, void *buf, + u16 sz, int vfid) { msg->hdr.s.flags =3D OCTEP_CTRL_MBOX_MSG_HDR_FLAG_REQ; msg->hdr.s.msg_id =3D atomic_inc_return(&ctrl_net_msg_id) & @@ -31,6 +32,10 @@ static void init_send_req(struct octep_ctrl_mbox_msg *ms= g, void *buf, u16 sz) msg->sg_num =3D 1; msg->sg_list[0].msg =3D buf; msg->sg_list[0].sz =3D msg->hdr.s.sz; + if (vfid !=3D OCTEP_CTRL_NET_INVALID_VFID) { + msg->hdr.s.is_vf =3D 1; + msg->hdr.s.vf_idx =3D vfid; + } } =20 static int octep_send_mbox_req(struct octep_device *oct, @@ -91,13 +96,13 @@ int octep_ctrl_net_init(struct octep_device *oct) return 0; } =20 -int octep_ctrl_net_get_link_status(struct octep_device *oct) +int octep_ctrl_net_get_link_status(struct octep_device *oct, int vfid) { struct octep_ctrl_net_wait_data d =3D {0}; struct octep_ctrl_net_h2f_req *req =3D &d.data.req; int err; =20 - init_send_req(&d.msg, (void *)req, state_sz); + init_send_req(&d.msg, (void *)req, state_sz, vfid); req->hdr.s.cmd =3D OCTEP_CTRL_NET_H2F_CMD_LINK_STATUS; req->link.cmd =3D OCTEP_CTRL_NET_CMD_GET; err =3D octep_send_mbox_req(oct, &d, true); @@ -107,13 +112,13 @@ int octep_ctrl_net_get_link_status(struct octep_devic= e *oct) return d.data.resp.link.state; } =20 -int octep_ctrl_net_set_link_status(struct octep_device *oct, bool up, +int octep_ctrl_net_set_link_status(struct octep_device *oct, int vfid, boo= l up, bool wait_for_response) { struct octep_ctrl_net_wait_data d =3D {0}; struct octep_ctrl_net_h2f_req *req =3D &d.data.req; =20 - init_send_req(&d.msg, req, state_sz); + init_send_req(&d.msg, req, state_sz, vfid); req->hdr.s.cmd =3D OCTEP_CTRL_NET_H2F_CMD_LINK_STATUS; req->link.cmd =3D OCTEP_CTRL_NET_CMD_SET; req->link.state =3D (up) ? OCTEP_CTRL_NET_STATE_UP : @@ -122,13 +127,13 @@ int octep_ctrl_net_set_link_status(struct octep_devic= e *oct, bool up, return octep_send_mbox_req(oct, &d, wait_for_response); } =20 -int octep_ctrl_net_set_rx_state(struct octep_device *oct, bool up, +int octep_ctrl_net_set_rx_state(struct octep_device *oct, int vfid, bool u= p, bool wait_for_response) { struct octep_ctrl_net_wait_data d =3D {0}; struct octep_ctrl_net_h2f_req *req =3D &d.data.req; =20 - init_send_req(&d.msg, req, state_sz); + init_send_req(&d.msg, req, state_sz, vfid); req->hdr.s.cmd =3D OCTEP_CTRL_NET_H2F_CMD_RX_STATE; req->link.cmd =3D OCTEP_CTRL_NET_CMD_SET; req->link.state =3D (up) ? OCTEP_CTRL_NET_STATE_UP : @@ -137,13 +142,13 @@ int octep_ctrl_net_set_rx_state(struct octep_device *= oct, bool up, return octep_send_mbox_req(oct, &d, wait_for_response); } =20 -int octep_ctrl_net_get_mac_addr(struct octep_device *oct, u8 *addr) +int octep_ctrl_net_get_mac_addr(struct octep_device *oct, int vfid, u8 *ad= dr) { struct octep_ctrl_net_wait_data d =3D {0}; struct octep_ctrl_net_h2f_req *req =3D &d.data.req; int err; =20 - init_send_req(&d.msg, req, mac_sz); + init_send_req(&d.msg, req, mac_sz, vfid); req->hdr.s.cmd =3D OCTEP_CTRL_NET_H2F_CMD_MAC; req->link.cmd =3D OCTEP_CTRL_NET_CMD_GET; err =3D octep_send_mbox_req(oct, &d, true); @@ -155,13 +160,13 @@ int octep_ctrl_net_get_mac_addr(struct octep_device *= oct, u8 *addr) return 0; } =20 -int octep_ctrl_net_set_mac_addr(struct octep_device *oct, u8 *addr, +int octep_ctrl_net_set_mac_addr(struct octep_device *oct, int vfid, u8 *ad= dr, bool wait_for_response) { struct octep_ctrl_net_wait_data d =3D {0}; struct octep_ctrl_net_h2f_req *req =3D &d.data.req; =20 - init_send_req(&d.msg, req, mac_sz); + init_send_req(&d.msg, req, mac_sz, vfid); req->hdr.s.cmd =3D OCTEP_CTRL_NET_H2F_CMD_MAC; req->mac.cmd =3D OCTEP_CTRL_NET_CMD_SET; memcpy(&req->mac.addr, addr, ETH_ALEN); @@ -169,13 +174,13 @@ int octep_ctrl_net_set_mac_addr(struct octep_device *= oct, u8 *addr, return octep_send_mbox_req(oct, &d, wait_for_response); } =20 -int octep_ctrl_net_set_mtu(struct octep_device *oct, int mtu, +int octep_ctrl_net_set_mtu(struct octep_device *oct, int vfid, int mtu, bool wait_for_response) { struct octep_ctrl_net_wait_data d =3D {0}; struct octep_ctrl_net_h2f_req *req =3D &d.data.req; =20 - init_send_req(&d.msg, req, mtu_sz); + init_send_req(&d.msg, req, mtu_sz, vfid); req->hdr.s.cmd =3D OCTEP_CTRL_NET_H2F_CMD_MTU; req->mtu.cmd =3D OCTEP_CTRL_NET_CMD_SET; req->mtu.val =3D mtu; @@ -183,7 +188,7 @@ int octep_ctrl_net_set_mtu(struct octep_device *oct, in= t mtu, return octep_send_mbox_req(oct, &d, wait_for_response); } =20 -int octep_ctrl_net_get_if_stats(struct octep_device *oct) +int octep_ctrl_net_get_if_stats(struct octep_device *oct, int vfid) { struct octep_ctrl_net_wait_data d =3D {0}; struct octep_ctrl_net_h2f_req *req =3D &d.data.req; @@ -191,7 +196,7 @@ int octep_ctrl_net_get_if_stats(struct octep_device *oc= t) void __iomem *iface_tx_stats; int err; =20 - init_send_req(&d.msg, req, get_stats_sz); + init_send_req(&d.msg, req, get_stats_sz, vfid); req->hdr.s.cmd =3D OCTEP_CTRL_NET_H2F_CMD_GET_IF_STATS; req->get_stats.offset =3D oct->ctrl_mbox_ifstats_offset; err =3D octep_send_mbox_req(oct, &d, true); @@ -207,14 +212,14 @@ int octep_ctrl_net_get_if_stats(struct octep_device *= oct) return 0; } =20 -int octep_ctrl_net_get_link_info(struct octep_device *oct) +int octep_ctrl_net_get_link_info(struct octep_device *oct, int vfid) { struct octep_ctrl_net_wait_data d =3D {0}; struct octep_ctrl_net_h2f_req *req =3D &d.data.req; struct octep_ctrl_net_h2f_resp *resp; int err; =20 - init_send_req(&d.msg, req, link_info_sz); + init_send_req(&d.msg, req, link_info_sz, vfid); req->hdr.s.cmd =3D OCTEP_CTRL_NET_H2F_CMD_LINK_INFO; req->link_info.cmd =3D OCTEP_CTRL_NET_CMD_GET; err =3D octep_send_mbox_req(oct, &d, true); @@ -231,14 +236,14 @@ int octep_ctrl_net_get_link_info(struct octep_device = *oct) return 0; } =20 -int octep_ctrl_net_set_link_info(struct octep_device *oct, +int octep_ctrl_net_set_link_info(struct octep_device *oct, int vfid, struct octep_iface_link_info *link_info, bool wait_for_response) { struct octep_ctrl_net_wait_data d =3D {0}; struct octep_ctrl_net_h2f_req *req =3D &d.data.req; =20 - init_send_req(&d.msg, req, link_info_sz); + init_send_req(&d.msg, req, link_info_sz, vfid); req->hdr.s.cmd =3D OCTEP_CTRL_NET_H2F_CMD_LINK_INFO; req->link_info.cmd =3D OCTEP_CTRL_NET_CMD_SET; req->link_info.info.advertised_modes =3D link_info->advertised_modes; diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.h b/driv= ers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.h index aba373ec28a4..de0759365f13 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.h +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.h @@ -7,6 +7,8 @@ #ifndef __OCTEP_CTRL_NET_H__ #define __OCTEP_CTRL_NET_H__ =20 +#define OCTEP_CTRL_NET_INVALID_VFID (-1) + /* Supported commands */ enum octep_ctrl_net_cmd { OCTEP_CTRL_NET_CMD_GET =3D 0, @@ -216,89 +218,99 @@ int octep_ctrl_net_init(struct octep_device *oct); /** Get link status from firmware. * * @param oct: non-null pointer to struct octep_device. + * @param vfid: Index of virtual function. * * return value: link status 0=3Ddown, 1=3Dup. */ -int octep_ctrl_net_get_link_status(struct octep_device *oct); +int octep_ctrl_net_get_link_status(struct octep_device *oct, int vfid); =20 /** Set link status in firmware. * * @param oct: non-null pointer to struct octep_device. + * @param vfid: Index of virtual function. * @param up: boolean status. * @param wait_for_response: poll for response. * * return value: 0 on success, -errno on failure */ -int octep_ctrl_net_set_link_status(struct octep_device *oct, bool up, +int octep_ctrl_net_set_link_status(struct octep_device *oct, int vfid, boo= l up, bool wait_for_response); =20 /** Set rx state in firmware. * * @param oct: non-null pointer to struct octep_device. + * @param vfid: Index of virtual function. * @param up: boolean status. * @param wait_for_response: poll for response. * * return value: 0 on success, -errno on failure. */ -int octep_ctrl_net_set_rx_state(struct octep_device *oct, bool up, +int octep_ctrl_net_set_rx_state(struct octep_device *oct, int vfid, bool u= p, bool wait_for_response); =20 /** Get mac address from firmware. * * @param oct: non-null pointer to struct octep_device. + * @param vfid: Index of virtual function. * @param addr: non-null pointer to mac address. * * return value: 0 on success, -errno on failure. */ -int octep_ctrl_net_get_mac_addr(struct octep_device *oct, u8 *addr); +int octep_ctrl_net_get_mac_addr(struct octep_device *oct, int vfid, u8 *ad= dr); =20 /** Set mac address in firmware. * * @param oct: non-null pointer to struct octep_device. + * @param vfid: Index of virtual function. * @param addr: non-null pointer to mac address. * @param wait_for_response: poll for response. * * return value: 0 on success, -errno on failure. */ -int octep_ctrl_net_set_mac_addr(struct octep_device *oct, u8 *addr, +int octep_ctrl_net_set_mac_addr(struct octep_device *oct, int vfid, u8 *ad= dr, bool wait_for_response); =20 /** Set mtu in firmware. * * @param oct: non-null pointer to struct octep_device. + * @param vfid: Index of virtual function. * @param mtu: mtu. * @param wait_for_response: poll for response. * * return value: 0 on success, -errno on failure. */ -int octep_ctrl_net_set_mtu(struct octep_device *oct, int mtu, +int octep_ctrl_net_set_mtu(struct octep_device *oct, int vfid, int mtu, bool wait_for_response); =20 /** Get interface statistics from firmware. * * @param oct: non-null pointer to struct octep_device. + * @param vfid: Index of virtual function. * * return value: 0 on success, -errno on failure. */ -int octep_ctrl_net_get_if_stats(struct octep_device *oct); +int octep_ctrl_net_get_if_stats(struct octep_device *oct, int vfid); =20 /** Get link info from firmware. * * @param oct: non-null pointer to struct octep_device. + * @param vfid: Index of virtual function. * * return value: 0 on success, -errno on failure. */ -int octep_ctrl_net_get_link_info(struct octep_device *oct); +int octep_ctrl_net_get_link_info(struct octep_device *oct, int vfid); =20 /** Set link info in firmware. * * @param oct: non-null pointer to struct octep_device. + * @param vfid: Index of virtual function. * @param link_info: non-null pointer to struct octep_iface_link_info. * @param wait_for_response: poll for response. * * return value: 0 on success, -errno on failure. */ int octep_ctrl_net_set_link_info(struct octep_device *oct, + int vfid, struct octep_iface_link_info *link_info, bool wait_for_response); =20 diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_ethtool.c b/drive= rs/net/ethernet/marvell/octeon_ep/octep_ethtool.c index a1ddb64791f2..389042b57787 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_ethtool.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_ethtool.c @@ -150,7 +150,7 @@ octep_get_ethtool_stats(struct net_device *netdev, rx_packets =3D 0; rx_bytes =3D 0; =20 - octep_ctrl_net_get_if_stats(oct); + octep_ctrl_net_get_if_stats(oct, OCTEP_CTRL_NET_INVALID_VFID); iface_tx_stats =3D &oct->iface_tx_stats; iface_rx_stats =3D &oct->iface_rx_stats; =20 @@ -283,7 +283,7 @@ static int octep_get_link_ksettings(struct net_device *= netdev, ethtool_link_ksettings_zero_link_mode(cmd, supported); ethtool_link_ksettings_zero_link_mode(cmd, advertising); =20 - octep_ctrl_net_get_link_info(oct); + octep_ctrl_net_get_link_info(oct, OCTEP_CTRL_NET_INVALID_VFID); =20 advertised_modes =3D oct->link_info.advertised_modes; supported_modes =3D oct->link_info.supported_modes; @@ -439,7 +439,8 @@ static int octep_set_link_ksettings(struct net_device *= netdev, link_info_new.speed =3D cmd->base.speed; link_info_new.autoneg =3D autoneg; =20 - err =3D octep_ctrl_net_set_link_info(oct, &link_info_new, true); + err =3D octep_ctrl_net_set_link_info(oct, OCTEP_CTRL_NET_INVALID_VFID, + &link_info_new, true); if (err) return err; =20 diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c b/drivers/= net/ethernet/marvell/octeon_ep/octep_main.c index 43fff8979854..112d3825e544 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c @@ -507,8 +507,10 @@ static int octep_open(struct net_device *netdev) octep_napi_enable(oct); =20 oct->link_info.admin_up =3D 1; - octep_ctrl_net_set_rx_state(oct, true, false); - octep_ctrl_net_set_link_status(oct, true, false); + octep_ctrl_net_set_rx_state(oct, OCTEP_CTRL_NET_INVALID_VFID, true, + false); + octep_ctrl_net_set_link_status(oct, OCTEP_CTRL_NET_INVALID_VFID, true, + false); oct->poll_non_ioq_intr =3D false; =20 /* Enable the input and output queues for this Octeon device */ @@ -519,7 +521,7 @@ static int octep_open(struct net_device *netdev) =20 octep_oq_dbell_init(oct); =20 - ret =3D octep_ctrl_net_get_link_status(oct); + ret =3D octep_ctrl_net_get_link_status(oct, OCTEP_CTRL_NET_INVALID_VFID); if (ret > 0) octep_link_up(netdev); =20 @@ -549,8 +551,10 @@ static int octep_stop(struct net_device *netdev) =20 netdev_info(netdev, "Stopping the device ...\n"); =20 - octep_ctrl_net_set_link_status(oct, false, false); - octep_ctrl_net_set_rx_state(oct, false, false); + octep_ctrl_net_set_link_status(oct, OCTEP_CTRL_NET_INVALID_VFID, false, + false); + octep_ctrl_net_set_rx_state(oct, OCTEP_CTRL_NET_INVALID_VFID, false, + false); =20 /* Stop Tx from stack */ netif_tx_stop_all_queues(netdev); @@ -759,7 +763,7 @@ static void octep_get_stats64(struct net_device *netdev, int q; =20 if (netif_running(netdev)) - octep_ctrl_net_get_if_stats(oct); + octep_ctrl_net_get_if_stats(oct, OCTEP_CTRL_NET_INVALID_VFID); =20 tx_packets =3D 0; tx_bytes =3D 0; @@ -831,7 +835,8 @@ static int octep_set_mac(struct net_device *netdev, voi= d *p) if (!is_valid_ether_addr(addr->sa_data)) return -EADDRNOTAVAIL; =20 - err =3D octep_ctrl_net_set_mac_addr(oct, addr->sa_data, true); + err =3D octep_ctrl_net_set_mac_addr(oct, OCTEP_CTRL_NET_INVALID_VFID, + addr->sa_data, true); if (err) return err; =20 @@ -851,7 +856,8 @@ static int octep_change_mtu(struct net_device *netdev, = int new_mtu) if (link_info->mtu =3D=3D new_mtu) return 0; =20 - err =3D octep_ctrl_net_set_mtu(oct, new_mtu, true); + err =3D octep_ctrl_net_set_mtu(oct, OCTEP_CTRL_NET_INVALID_VFID, new_mtu, + true); if (!err) { oct->link_info.mtu =3D new_mtu; netdev->mtu =3D new_mtu; @@ -1102,7 +1108,7 @@ static int octep_probe(struct pci_dev *pdev, const st= ruct pci_device_id *ent) netdev->max_mtu =3D OCTEP_MAX_MTU; netdev->mtu =3D OCTEP_DEFAULT_MTU; =20 - err =3D octep_ctrl_net_get_mac_addr(octep_dev, + err =3D octep_ctrl_net_get_mac_addr(octep_dev, OCTEP_CTRL_NET_INVALID_VFI= D, octep_dev->mac_addr); if (err) { dev_err(&pdev->dev, "Failed to get mac address\n"); --=20 2.36.0 From nobody Sun Apr 28 00:56:27 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C6FEEC6FD1C for ; Fri, 24 Mar 2023 17:47:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232058AbjCXRrr (ORCPT ); Fri, 24 Mar 2023 13:47:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40560 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231910AbjCXRr3 (ORCPT ); Fri, 24 Mar 2023 13:47:29 -0400 Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 63C1E199E3; Fri, 24 Mar 2023 10:47:28 -0700 (PDT) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32OHVwQn018470; Fri, 24 Mar 2023 10:47:18 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=pwu8nKOgZfG0gRZ/hteADACC/gSz1pqVQhGE43XUkAU=; b=AIC5FZtngcIT7SKOhVL2JmR5kzAV240hpPAc+t2o9M8wJUhk0SAM7V+cedqcAm0Nb4du fNyoo/4oTDd/jIJz55IeDeDHM7yNIG5IeW9v+052hLhyaAhfPVlf/3DJIZ6VHADpZpIh LdH3w+HaOdAIjO+TQyM/pueN0cDIycjwmsXY59Vijv0OdR3AriW845aDDQv4iOy38IT9 CyuXHcAv+lhxjTDSPqmkBfrFYVGhKzHZxFK0oyt7MGTlldTrEvgakjmG/WHr0bb2j5XT uxoCvdfHHibZVeBExEFgql6gseOda4iIt/w+FhjNGswTrXrt5nqtM0VXP0XMD1gkOwVj GA== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3ph6q3td8t-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Fri, 24 Mar 2023 10:47:17 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Fri, 24 Mar 2023 10:47:15 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Fri, 24 Mar 2023 10:47:15 -0700 Received: from sburla-PowerEdge-T630.sclab.marvell.com (unknown [10.106.27.217]) by maili.marvell.com (Postfix) with ESMTP id 64C813F7051; Fri, 24 Mar 2023 10:47:15 -0700 (PDT) From: Veerasenareddy Burru To: , , , , CC: , Veerasenareddy Burru , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Subject: [PATCH net-next v5 6/8] octeon_ep: support asynchronous notifications Date: Fri, 24 Mar 2023 10:47:01 -0700 Message-ID: <20230324174704.9752-7-vburru@marvell.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20230324174704.9752-1-vburru@marvell.com> References: <20230324174704.9752-1-vburru@marvell.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: TYDqBa9O_r3n-hh1S3vvmQs6GMuuFpgx X-Proofpoint-ORIG-GUID: TYDqBa9O_r3n-hh1S3vvmQs6GMuuFpgx X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-24_11,2023-03-24_01,2023-02-09_01 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add asynchronous notification support to the control mailbox. Signed-off-by: Veerasenareddy Burru Signed-off-by: Abhijit Ayarekar --- v4 -> v5: * no change v3 -> v4: * 0005-xxx.patch in v3 is 0006-xxx.patch in v4. * addressed review comments https://lore.kernel.org/all/Y+0J94sowllCe5Gs@boxer/ - fixed rct violation. - process_mbox_notify() now returns void. v2 -> v3: * no change v1 -> v2: * no change .../marvell/octeon_ep/octep_ctrl_net.c | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c b/driv= ers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c index cef4bc3b1ec0..465eef2824e3 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c @@ -271,6 +271,33 @@ static void process_mbox_resp(struct octep_device *oct, } } =20 +static int process_mbox_notify(struct octep_device *oct, + struct octep_ctrl_mbox_msg *msg) +{ + struct net_device *netdev =3D oct->netdev; + struct octep_ctrl_net_f2h_req *req; + + req =3D (struct octep_ctrl_net_f2h_req *)msg->sg_list[0].msg; + switch (req->hdr.s.cmd) { + case OCTEP_CTRL_NET_F2H_CMD_LINK_STATUS: + if (netif_running(netdev)) { + if (req->link.state) { + dev_info(&oct->pdev->dev, "netif_carrier_on\n"); + netif_carrier_on(netdev); + } else { + dev_info(&oct->pdev->dev, "netif_carrier_off\n"); + netif_carrier_off(netdev); + } + } + break; + default: + pr_info("Unknown mbox req : %u\n", req->hdr.s.cmd); + break; + } + + return 0; +} + void octep_ctrl_net_recv_fw_messages(struct octep_device *oct) { static u16 msg_sz =3D sizeof(union octep_ctrl_net_max_data); @@ -291,6 +318,8 @@ void octep_ctrl_net_recv_fw_messages(struct octep_devic= e *oct) =20 if (msg.hdr.s.flags & OCTEP_CTRL_MBOX_MSG_HDR_FLAG_RESP) process_mbox_resp(oct, &msg); + else if (msg.hdr.s.flags & OCTEP_CTRL_MBOX_MSG_HDR_FLAG_NOTIFY) + process_mbox_notify(oct, &msg); } } =20 --=20 2.36.0 From nobody Sun Apr 28 00:56:27 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0A942C76195 for ; Fri, 24 Mar 2023 17:47:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232038AbjCXRro (ORCPT ); Fri, 24 Mar 2023 13:47:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40546 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231797AbjCXRr1 (ORCPT ); Fri, 24 Mar 2023 13:47:27 -0400 Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7122C1A494; Fri, 24 Mar 2023 10:47:25 -0700 (PDT) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32OH2e8s001024; Fri, 24 Mar 2023 10:47:18 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=fKQ9AlezHJ939j0y5+PygqD2CxDQraZBT2F9Dur/6bM=; b=f/0IWH1JHExTCueok2zEujwMX1gGE/zp3kCuS/77+OmkpaG+IKslypQvzeEui0nKcae9 9b2A2LIeHEpw9Ox0aFkr/K5FxhaHdl4J+BgklxpKxKtowHKN7x7CT0Fh28ETfYjEf7Qj bDukZ2GRPdUtEDLfjoHm/aQKE+S825wqO1Ia8mBVpjyfYtdh1SQjb5FVLuLXFrzq4b4M +rYcUHnhFmEVUTRi8Yyo76qBesaCclRBir5cpK0l8BqcQyoKZzcMax+TBzCe76r1d5C1 2nLGPmJyT4ja6iocYl4sSDw6xosTzm3jXto5H3/D9XfHJaJXdyrdZRceQa/d66IVjhXo Ow== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3pgxmfkdpe-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Fri, 24 Mar 2023 10:47:18 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Fri, 24 Mar 2023 10:47:16 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Fri, 24 Mar 2023 10:47:16 -0700 Received: from sburla-PowerEdge-T630.sclab.marvell.com (unknown [10.106.27.217]) by maili.marvell.com (Postfix) with ESMTP id 13EF73F7040; Fri, 24 Mar 2023 10:47:16 -0700 (PDT) From: Veerasenareddy Burru To: , , , , CC: , Veerasenareddy Burru , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Subject: [PATCH net-next v5 7/8] octeon_ep: function id in link info and stats mailbox commands Date: Fri, 24 Mar 2023 10:47:02 -0700 Message-ID: <20230324174704.9752-8-vburru@marvell.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20230324174704.9752-1-vburru@marvell.com> References: <20230324174704.9752-1-vburru@marvell.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: o1x2LOlncRwpt_4wv76P0_YOXyeceGpj X-Proofpoint-ORIG-GUID: o1x2LOlncRwpt_4wv76P0_YOXyeceGpj X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-24_11,2023-03-24_01,2023-02-09_01 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Update control mailbox API to include function id in get stats and link info. Signed-off-by: Veerasenareddy Burru Signed-off-by: Abhijit Ayarekar --- v4 -> v5: * no change v3 -> v4: * 0006-xxx.patch in v3 is 0007-xxx.patch in v4. v2 -> v3: * no change v1 -> v2: * no change .../marvell/octeon_ep/octep_ctrl_net.c | 33 +++++++++---------- .../marvell/octeon_ep/octep_ctrl_net.h | 24 +++++++++----- .../marvell/octeon_ep/octep_ethtool.c | 9 +++-- .../ethernet/marvell/octeon_ep/octep_main.c | 5 ++- 4 files changed, 40 insertions(+), 31 deletions(-) diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c b/driv= ers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c index 465eef2824e3..1cc6af2feb38 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.c @@ -19,7 +19,6 @@ static const u32 mtu_sz =3D sizeof(struct octep_ctrl_net_= h2f_req_cmd_mtu); static const u32 mac_sz =3D sizeof(struct octep_ctrl_net_h2f_req_cmd_mac); static const u32 state_sz =3D sizeof(struct octep_ctrl_net_h2f_req_cmd_sta= te); static const u32 link_info_sz =3D sizeof(struct octep_ctrl_net_link_info); -static const u32 get_stats_sz =3D sizeof(struct octep_ctrl_net_h2f_req_cmd= _get_stats); static atomic_t ctrl_net_msg_id; =20 static void init_send_req(struct octep_ctrl_mbox_msg *msg, void *buf, @@ -188,31 +187,29 @@ int octep_ctrl_net_set_mtu(struct octep_device *oct, = int vfid, int mtu, return octep_send_mbox_req(oct, &d, wait_for_response); } =20 -int octep_ctrl_net_get_if_stats(struct octep_device *oct, int vfid) +int octep_ctrl_net_get_if_stats(struct octep_device *oct, int vfid, + struct octep_iface_rx_stats *rx_stats, + struct octep_iface_tx_stats *tx_stats) { struct octep_ctrl_net_wait_data d =3D {0}; struct octep_ctrl_net_h2f_req *req =3D &d.data.req; - void __iomem *iface_rx_stats; - void __iomem *iface_tx_stats; + struct octep_ctrl_net_h2f_resp *resp; int err; =20 - init_send_req(&d.msg, req, get_stats_sz, vfid); + init_send_req(&d.msg, req, 0, vfid); req->hdr.s.cmd =3D OCTEP_CTRL_NET_H2F_CMD_GET_IF_STATS; - req->get_stats.offset =3D oct->ctrl_mbox_ifstats_offset; err =3D octep_send_mbox_req(oct, &d, true); if (err < 0) return err; =20 - iface_rx_stats =3D oct->ctrl_mbox.barmem + oct->ctrl_mbox_ifstats_offset; - iface_tx_stats =3D oct->ctrl_mbox.barmem + oct->ctrl_mbox_ifstats_offset + - sizeof(struct octep_iface_rx_stats); - memcpy_fromio(&oct->iface_rx_stats, iface_rx_stats, sizeof(struct octep_i= face_rx_stats)); - memcpy_fromio(&oct->iface_tx_stats, iface_tx_stats, sizeof(struct octep_i= face_tx_stats)); - + resp =3D &d.data.resp; + memcpy(rx_stats, &resp->if_stats.rx_stats, sizeof(struct octep_iface_rx_s= tats)); + memcpy(tx_stats, &resp->if_stats.tx_stats, sizeof(struct octep_iface_tx_s= tats)); return 0; } =20 -int octep_ctrl_net_get_link_info(struct octep_device *oct, int vfid) +int octep_ctrl_net_get_link_info(struct octep_device *oct, int vfid, + struct octep_iface_link_info *link_info) { struct octep_ctrl_net_wait_data d =3D {0}; struct octep_ctrl_net_h2f_req *req =3D &d.data.req; @@ -227,11 +224,11 @@ int octep_ctrl_net_get_link_info(struct octep_device = *oct, int vfid) return err; =20 resp =3D &d.data.resp; - oct->link_info.supported_modes =3D resp->link_info.supported_modes; - oct->link_info.advertised_modes =3D resp->link_info.advertised_modes; - oct->link_info.autoneg =3D resp->link_info.autoneg; - oct->link_info.pause =3D resp->link_info.pause; - oct->link_info.speed =3D resp->link_info.speed; + link_info->supported_modes =3D resp->link_info.supported_modes; + link_info->advertised_modes =3D resp->link_info.advertised_modes; + link_info->autoneg =3D resp->link_info.autoneg; + link_info->pause =3D resp->link_info.pause; + link_info->speed =3D resp->link_info.speed; =20 return 0; } diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.h b/driv= ers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.h index de0759365f13..37880dd79116 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.h +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_ctrl_net.h @@ -77,12 +77,6 @@ struct octep_ctrl_net_h2f_req_cmd_mac { u8 addr[ETH_ALEN]; }; =20 -/* get if_stats, xstats, q_stats request */ -struct octep_ctrl_net_h2f_req_cmd_get_stats { - /* offset into barmem where fw should copy over stats */ - u32 offset; -}; - /* get/set link state, rx state */ struct octep_ctrl_net_h2f_req_cmd_state { /* enum octep_ctrl_net_cmd */ @@ -119,7 +113,6 @@ struct octep_ctrl_net_h2f_req { union { struct octep_ctrl_net_h2f_req_cmd_mtu mtu; struct octep_ctrl_net_h2f_req_cmd_mac mac; - struct octep_ctrl_net_h2f_req_cmd_get_stats get_stats; struct octep_ctrl_net_h2f_req_cmd_state link; struct octep_ctrl_net_h2f_req_cmd_state rx; struct octep_ctrl_net_h2f_req_cmd_link_info link_info; @@ -152,6 +145,12 @@ struct octep_ctrl_net_h2f_resp_cmd_mac { u8 addr[ETH_ALEN]; }; =20 +/* get if_stats, xstats, q_stats request */ +struct octep_ctrl_net_h2f_resp_cmd_get_stats { + struct octep_iface_rx_stats rx_stats; + struct octep_iface_tx_stats tx_stats; +}; + /* get link state, rx state response */ struct octep_ctrl_net_h2f_resp_cmd_state { /* enum octep_ctrl_net_state */ @@ -164,6 +163,7 @@ struct octep_ctrl_net_h2f_resp { union { struct octep_ctrl_net_h2f_resp_cmd_mtu mtu; struct octep_ctrl_net_h2f_resp_cmd_mac mac; + struct octep_ctrl_net_h2f_resp_cmd_get_stats if_stats; struct octep_ctrl_net_h2f_resp_cmd_state link; struct octep_ctrl_net_h2f_resp_cmd_state rx; struct octep_ctrl_net_link_info link_info; @@ -286,19 +286,25 @@ int octep_ctrl_net_set_mtu(struct octep_device *oct, = int vfid, int mtu, * * @param oct: non-null pointer to struct octep_device. * @param vfid: Index of virtual function. + * @param rx_stats: non-null pointer struct octep_iface_rx_stats. + * @param tx_stats: non-null pointer struct octep_iface_tx_stats. * * return value: 0 on success, -errno on failure. */ -int octep_ctrl_net_get_if_stats(struct octep_device *oct, int vfid); +int octep_ctrl_net_get_if_stats(struct octep_device *oct, int vfid, + struct octep_iface_rx_stats *rx_stats, + struct octep_iface_tx_stats *tx_stats); =20 /** Get link info from firmware. * * @param oct: non-null pointer to struct octep_device. * @param vfid: Index of virtual function. + * @param link_info: non-null pointer to struct octep_iface_link_info. * * return value: 0 on success, -errno on failure. */ -int octep_ctrl_net_get_link_info(struct octep_device *oct, int vfid); +int octep_ctrl_net_get_link_info(struct octep_device *oct, int vfid, + struct octep_iface_link_info *link_info); =20 /** Set link info in firmware. * diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_ethtool.c b/drive= rs/net/ethernet/marvell/octeon_ep/octep_ethtool.c index 389042b57787..7d0124b283da 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_ethtool.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_ethtool.c @@ -150,9 +150,12 @@ octep_get_ethtool_stats(struct net_device *netdev, rx_packets =3D 0; rx_bytes =3D 0; =20 - octep_ctrl_net_get_if_stats(oct, OCTEP_CTRL_NET_INVALID_VFID); iface_tx_stats =3D &oct->iface_tx_stats; iface_rx_stats =3D &oct->iface_rx_stats; + octep_ctrl_net_get_if_stats(oct, + OCTEP_CTRL_NET_INVALID_VFID, + iface_rx_stats, + iface_tx_stats); =20 for (q =3D 0; q < oct->num_oqs; q++) { struct octep_iq *iq =3D oct->iq[q]; @@ -283,11 +286,11 @@ static int octep_get_link_ksettings(struct net_device= *netdev, ethtool_link_ksettings_zero_link_mode(cmd, supported); ethtool_link_ksettings_zero_link_mode(cmd, advertising); =20 - octep_ctrl_net_get_link_info(oct, OCTEP_CTRL_NET_INVALID_VFID); + link_info =3D &oct->link_info; + octep_ctrl_net_get_link_info(oct, OCTEP_CTRL_NET_INVALID_VFID, link_info); =20 advertised_modes =3D oct->link_info.advertised_modes; supported_modes =3D oct->link_info.supported_modes; - link_info =3D &oct->link_info; =20 OCTEP_SET_ETHTOOL_LINK_MODES_BITMAP(supported_modes, cmd, supported); OCTEP_SET_ETHTOOL_LINK_MODES_BITMAP(advertised_modes, cmd, advertising); diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c b/drivers/= net/ethernet/marvell/octeon_ep/octep_main.c index 112d3825e544..ba0d5fe3081d 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c @@ -763,7 +763,10 @@ static void octep_get_stats64(struct net_device *netde= v, int q; =20 if (netif_running(netdev)) - octep_ctrl_net_get_if_stats(oct, OCTEP_CTRL_NET_INVALID_VFID); + octep_ctrl_net_get_if_stats(oct, + OCTEP_CTRL_NET_INVALID_VFID, + &oct->iface_rx_stats, + &oct->iface_tx_stats); =20 tx_packets =3D 0; tx_bytes =3D 0; --=20 2.36.0 From nobody Sun Apr 28 00:56:27 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3616FC6FD1C for ; Fri, 24 Mar 2023 17:47:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232069AbjCXRrv (ORCPT ); Fri, 24 Mar 2023 13:47:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231926AbjCXRrc (ORCPT ); Fri, 24 Mar 2023 13:47:32 -0400 Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64B961A642; Fri, 24 Mar 2023 10:47:30 -0700 (PDT) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 32O6YnnP018491; Fri, 24 Mar 2023 10:47:20 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=uH5AQ127J05jo5wHUrOJ7gmx4Cr0E7Xf+KpPQbVUzv4=; b=aJBej71IRg57GiILzlbYpd5p2L31GOPLovGBebYEjwJ6kuUGIQzgI66pK1CqC4hQH1HL Ia28oACfvvfrq0i0NarfnWB8EVWp9Fn+9G4jgzuL1IShHyzMVEj4iANgf7/GUgiKGl5J UZ2vfYLwR+XcEExnAfSRLCMyoJhk8w5gt9cCbYdA+tK6A75jIyLZHKJot490ohmdvNFv w52gwhQV0UwfP30fzaPrzEq4MHp/5Ctq0KwQExbNawDBTK0w0FHM6Xwp1+azqVm/M1eV XbbIcZhjfP/iV62esMMRjAjoZoFZpEgjMDGqmQdrnazf3DMFHmgRpmk72uVwECBPrgfP TA== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3ph6q3td8v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Fri, 24 Mar 2023 10:47:19 -0700 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Fri, 24 Mar 2023 10:47:18 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Fri, 24 Mar 2023 10:47:18 -0700 Received: from sburla-PowerEdge-T630.sclab.marvell.com (unknown [10.106.27.217]) by maili.marvell.com (Postfix) with ESMTP id A811F3F70A5; Fri, 24 Mar 2023 10:47:16 -0700 (PDT) From: Veerasenareddy Burru To: , , , , CC: , Veerasenareddy Burru , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Subject: [PATCH net-next v5 8/8] octeon_ep: add heartbeat monitor Date: Fri, 24 Mar 2023 10:47:03 -0700 Message-ID: <20230324174704.9752-9-vburru@marvell.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20230324174704.9752-1-vburru@marvell.com> References: <20230324174704.9752-1-vburru@marvell.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Proofpoint-GUID: sFxZjEAb-hMgVMtNkFr2iBDcX3JnlMPE X-Proofpoint-ORIG-GUID: sFxZjEAb-hMgVMtNkFr2iBDcX3JnlMPE X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-03-24_11,2023-03-24_01,2023-02-09_01 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Monitor periodic heartbeat messages from device firmware. Presence of heartbeat indicates the device is active and running. If the heartbeat is missed for configured interval indicates firmware has crashed and device is unusable; in this case, PF driver stops and uninitialize the device. Signed-off-by: Veerasenareddy Burru Signed-off-by: Abhijit Ayarekar --- v4 -> v5: - addressed review comments https://lore.kernel.org/all/20230323104703.GD36557@unreal/ replaced atomic_inc() + atomic_read() with atomic_inc_return(). v3 -> v4: * 0007-xxx.patch in v3 is 0008-xxx.patch in v4. v2 -> v3: * 0009-xxx.patch in v2 is now 0007-xxx.patch in v3 due to 0007 and 0008.patch from v2 are removed in v3. v1 -> v2: * no change .../marvell/octeon_ep/octep_cn9k_pf.c | 9 ++++ .../ethernet/marvell/octeon_ep/octep_config.h | 6 +++ .../ethernet/marvell/octeon_ep/octep_main.c | 44 ++++++++++++++++++- .../ethernet/marvell/octeon_ep/octep_main.h | 7 +++ .../marvell/octeon_ep/octep_regs_cn9k_pf.h | 2 + 5 files changed, 66 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c b/drive= rs/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c index e2503c9bc8a1..90c3a419932d 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c @@ -16,6 +16,9 @@ #define CTRL_MBOX_MAX_PF 128 #define CTRL_MBOX_SZ ((size_t)(0x400000 / CTRL_MBOX_MAX_PF)) =20 +#define FW_HB_INTERVAL_IN_SECS 1 +#define FW_HB_MISS_COUNT 10 + /* Names of Hardware non-queue generic interrupts */ static char *cn93_non_ioq_msix_names[] =3D { "epf_ire_rint", @@ -249,6 +252,10 @@ static void octep_init_config_cn93_pf(struct octep_dev= ice *oct) conf->ctrl_mbox_cfg.barmem_addr =3D (void __iomem *)oct->mmio[2].hw_addr + (0x400000ull * 7) + (link * CTRL_MBOX_SZ); + + conf->hb_interval =3D FW_HB_INTERVAL_IN_SECS; + conf->max_hb_miss_cnt =3D FW_HB_MISS_COUNT; + } =20 /* Setup registers for a hardware Tx Queue */ @@ -383,6 +390,8 @@ static bool octep_poll_non_ioq_interrupts_cn93_pf(struc= t octep_device *oct) octep_write_csr64(oct, CN93_SDP_EPF_OEI_RINT, reg0); if (reg0 & CN93_SDP_EPF_OEI_RINT_DATA_BIT_MBOX) queue_work(octep_wq, &oct->ctrl_mbox_task); + else if (reg0 & CN93_SDP_EPF_OEI_RINT_DATA_BIT_HBEAT) + atomic_set(&oct->hb_miss_cnt, 0); =20 handled =3D true; } diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_config.h b/driver= s/net/ethernet/marvell/octeon_ep/octep_config.h index f208f3f9a447..df7cd39d9fce 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_config.h +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_config.h @@ -200,5 +200,11 @@ struct octep_config { =20 /* ctrl mbox config */ struct octep_ctrl_mbox_config ctrl_mbox_cfg; + + /* Configured maximum heartbeat miss count */ + u32 max_hb_miss_cnt; + + /* Configured firmware heartbeat interval in secs */ + u32 hb_interval; }; #endif /* _OCTEP_CONFIG_H_ */ diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c b/drivers/= net/ethernet/marvell/octeon_ep/octep_main.c index ba0d5fe3081d..e1853da280f9 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c @@ -901,6 +901,37 @@ static void octep_intr_poll_task(struct work_struct *w= ork) msecs_to_jiffies(OCTEP_INTR_POLL_TIME_MSECS)); } =20 +/** + * octep_hb_timeout_task - work queue task to check firmware heartbeat. + * + * @work: pointer to hb work_struct + * + * Check for heartbeat miss count. Uninitialize oct device if miss count + * exceeds configured max heartbeat miss count. + * + **/ +static void octep_hb_timeout_task(struct work_struct *work) +{ + struct octep_device *oct =3D container_of(work, struct octep_device, + hb_task.work); + + int miss_cnt; + + miss_cnt =3D atomic_inc_return(&oct->hb_miss_cnt); + if (miss_cnt < oct->conf->max_hb_miss_cnt) { + queue_delayed_work(octep_wq, &oct->hb_task, + msecs_to_jiffies(oct->conf->hb_interval * 1000)); + return; + } + + dev_err(&oct->pdev->dev, "Missed %u heartbeats. Uninitializing\n", + miss_cnt); + rtnl_lock(); + if (netif_running(oct->netdev)) + octep_stop(oct->netdev); + rtnl_unlock(); +} + /** * octep_ctrl_mbox_task - work queue task to handle ctrl mbox messages. * @@ -938,7 +969,7 @@ static const char *octep_devid_to_str(struct octep_devi= ce *oct) int octep_device_setup(struct octep_device *oct) { struct pci_dev *pdev =3D oct->pdev; - int i; + int i, ret; =20 /* allocate memory for oct->conf */ oct->conf =3D kzalloc(sizeof(*oct->conf), GFP_KERNEL); @@ -973,7 +1004,15 @@ int octep_device_setup(struct octep_device *oct) =20 oct->pkind =3D CFG_GET_IQ_PKIND(oct->conf); =20 - return octep_ctrl_net_init(oct); + ret =3D octep_ctrl_net_init(oct); + if (ret) + return ret; + + atomic_set(&oct->hb_miss_cnt, 0); + INIT_DELAYED_WORK(&oct->hb_task, octep_hb_timeout_task); + queue_delayed_work(octep_wq, &oct->hb_task, + msecs_to_jiffies(oct->conf->hb_interval * 1000)); + return 0; =20 unsupported_dev: for (i =3D 0; i < OCTEP_MMIO_REGIONS; i++) @@ -1002,6 +1041,7 @@ static void octep_device_cleanup(struct octep_device = *oct) } =20 octep_ctrl_net_uninit(oct); + cancel_delayed_work_sync(&oct->hb_task); =20 oct->hw_ops.soft_reset(oct); for (i =3D 0; i < OCTEP_MMIO_REGIONS; i++) { diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.h b/drivers/= net/ethernet/marvell/octeon_ep/octep_main.h index 836d990ba3fa..e0907a719133 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.h +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.h @@ -280,6 +280,13 @@ struct octep_device { bool poll_non_ioq_intr; /* Work entry to poll non-ioq interrupts */ struct delayed_work intr_poll_task; + + /* Firmware heartbeat timer */ + struct timer_list hb_timer; + /* Firmware heartbeat miss count tracked by timer */ + atomic_t hb_miss_cnt; + /* Task to reset device on heartbeat miss */ + struct delayed_work hb_task; }; =20 static inline u16 OCTEP_MAJOR_REV(struct octep_device *oct) diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_regs_cn9k_pf.h b/= drivers/net/ethernet/marvell/octeon_ep/octep_regs_cn9k_pf.h index 0466fd9a002d..b25c3093dc7b 100644 --- a/drivers/net/ethernet/marvell/octeon_ep/octep_regs_cn9k_pf.h +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_regs_cn9k_pf.h @@ -367,5 +367,7 @@ =20 /* bit 0 for control mbox interrupt */ #define CN93_SDP_EPF_OEI_RINT_DATA_BIT_MBOX BIT_ULL(0) +/* bit 1 for firmware heartbeat interrupt */ +#define CN93_SDP_EPF_OEI_RINT_DATA_BIT_HBEAT BIT_ULL(1) =20 #endif /* _OCTEP_REGS_CN9K_PF_H_ */ --=20 2.36.0