From patchwork Tue Nov 29 13:09:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Veerasenareddy Burru X-Patchwork-Id: 27222 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp327645wrr; Tue, 29 Nov 2022 05:13:06 -0800 (PST) X-Google-Smtp-Source: AA0mqf6WEOfHB9V2PHYbmvU8udMnCExXOWogqR6c+WD5x909kjb24Op0JcZJRjpklMN+wxfaBJcn X-Received: by 2002:a17:906:ca18:b0:781:c97c:84d1 with SMTP id jt24-20020a170906ca1800b00781c97c84d1mr47523875ejb.147.1669727586214; Tue, 29 Nov 2022 05:13:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669727586; cv=none; d=google.com; s=arc-20160816; b=TK7tPe+rqYwlYesr2Zwv3oIJgZ11sJPw7EmiMmxDYbq90owzOHl4Yd7xFKz35X+1dm IcfR0kLUYCWYQF3rv63lIArUYuqVoLAZw5TLOEhWg9LkmHLsITAa2/8IebmM8dVoQ1Z8 usriJeiA0s+QeYWcpuX5TMVlUqRlXg7JSPoTdDsi9p7SpkqpFhNiRqV58VwWyXTy6Rbn kwIVRYxcKRaM2TtTJpBU9V6OyYbiJ+iDRzoxjd3mH4FO3siMaDoui/PnIExi1GP8DAw1 NhKU2LQ3VaGLgd7c8WlaXTIR56kDBxYS+q36VMYbHI4mdnoydksbyGYm+GBxC/jjvMhJ C9/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=d5Cmq6NjnC3mbJUZGLiFJpEuCPO/ckDDocQX/+wDCz4=; b=bYVPwDbXXWdAsZa2376g3Jxzn44NhxgT7X/V2lHycWjYFn88d3whXyfVQkLWE6cgS+ r0bBYzZon73cbNjMTpKfkiWjYV2aZ4Lh9ckCYeuGPCtQr8I/K3BuGT9MPdxsWg3Gfu4o O27gFRumDMeVWPyezYv4NnxsIsF2NxZFqmCj1BkfsOcMCOCUbSvMzY0eqQ/Gy35yvax9 wri3NKhPFF26LJCZVxXd20gv5BiXvQfFRB4Ck1D+r9LEc8nEbgv7qF6veEf6Rc6k5fs+ ii+eJUV5v4z4smdo/PxpP0AZQ5WtOkBkzecUKovAjHQNYNNSHhMYQIlMtJr///mmVsn3 BLhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=JMfVvqXa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=REJECT dis=NONE) header.from=marvell.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ht22-20020a170907609600b007c0889e324esi1464220ejc.366.2022.11.29.05.12.37; Tue, 29 Nov 2022 05:13:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@marvell.com header.s=pfpt0220 header.b=JMfVvqXa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=REJECT dis=NONE) header.from=marvell.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232134AbiK2NJy (ORCPT + 99 others); Tue, 29 Nov 2022 08:09:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50282 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229445AbiK2NJx (ORCPT ); Tue, 29 Nov 2022 08:09:53 -0500 Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BCA302F2; Tue, 29 Nov 2022 05:09:52 -0800 (PST) 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 2ATBxieW022509; Tue, 29 Nov 2022 05:09:44 -0800 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=d5Cmq6NjnC3mbJUZGLiFJpEuCPO/ckDDocQX/+wDCz4=; b=JMfVvqXatAlMipGqi74Y9EMOgfGV/v2+M/yXJoFSUTyet8BFwNVW/+VrVg+TjeH14Vvz +EfusUP4OQKwNKGr1jkhRAhSDR8f5XuiJzI/AAPkqcqyeeQSRiuZHBA9ivqHnlBw/IWN nrIcQ0usB1rJxuE86zgLF0uzLm0PLvo5tWHln6WSt6qgp2HPFFA00hAxpQ82Jkyqm391 jXf4/8+ZhmM+0vOuEgpSZWhR6VvJ45cslnJtUc2nheHR2CjaHZUYH4MalQfyShyIYtcH y2fyo9g9ercbMamQtRwQ0z6fGDPGpVit9GAepiDOJTJtH+bvO3pyJbhA8+Qh0ZYVmKEe Yg== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3m3k6wbcnq-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 29 Nov 2022 05:09:44 -0800 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.18; Tue, 29 Nov 2022 05:09:41 -0800 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.2 via Frontend Transport; Tue, 29 Nov 2022 05:09:41 -0800 Received: from sburla-PowerEdge-T630.caveonetworks.com (unknown [10.106.27.217]) by maili.marvell.com (Postfix) with ESMTP id 88E1F3F7087; Tue, 29 Nov 2022 05:09:41 -0800 (PST) From: Veerasenareddy Burru To: , , , , , CC: , Veerasenareddy Burru , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Subject: [PATCH net-next v2 3/9] octeon_ep: control mailbox for multiple PFs Date: Tue, 29 Nov 2022 05:09:26 -0800 Message-ID: <20221129130933.25231-4-vburru@marvell.com> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20221129130933.25231-1-vburru@marvell.com> References: <20221129130933.25231-1-vburru@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: RZBwNfZLqvsjTxQE2PSPX2GhzPU9rMDR X-Proofpoint-ORIG-GUID: RZBwNfZLqvsjTxQE2PSPX2GhzPU9rMDR X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.895,Hydra:6.0.545,FMLib:17.11.122.1 definitions=2022-11-29_08,2022-11-29_01,2022-06-22_01 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750836273043205544?= X-GMAIL-MSGID: =?utf-8?q?1750836273043205544?= 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 --- 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/drivers/net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c index ace2dfd1e918..e307bae62673 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" +#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[] = { "epf_ire_rint", @@ -199,6 +202,8 @@ static void octep_init_config_cn93_pf(struct octep_device *oct) struct octep_config *conf = oct->conf; struct pci_dev *pdev = oct->pdev; u64 val; + int pos; + u8 link = 0; /* 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_device *oct) conf->msix_cfg.ioq_msix = conf->pf_ring_cfg.active_io_rings; conf->msix_cfg.non_ioq_msix_names = cn93_non_ioq_msix_names; - conf->ctrl_mbox_cfg.barmem_addr = (void __iomem *)oct->mmio[2].hw_addr + (0x400000ull * 7); + pos = 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 = PCI_DEVFN(PCI_SLOT(oct->pdev->devfn), link); + } + conf->ctrl_mbox_cfg.barmem_addr = (void __iomem *)oct->mmio[2].hw_addr + + (0x400000ull * 8) + + (link * CTRL_MBOX_SZ); } /* Setup registers for a hardware Tx Queue */