From: Veerasenareddy Burru <vburru@marvell.com>
To: <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
<aayarekar@marvell.com>, <sedara@marvell.com>,
<sburla@marvell.com>
Cc: <linux-doc@vger.kernel.org>,
Veerasenareddy Burru <vburru@marvell.com>,
"David S. Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
Jakub Kicinski <kuba@kernel.org>, Paolo Abeni <pabeni@redhat.com>
Subject: [PATCH net-next v5 3/8] octeon_ep: control mailbox for multiple PFs
Date: Fri, 24 Mar 2023 10:46:58 -0700 [thread overview]
Message-ID: <20230324174704.9752-4-vburru@marvell.com> (raw)
In-Reply-To: <20230324174704.9752-1-vburru@marvell.com>
Add control mailbox support for multiple PFs.
Update control mbox base address calculation based on PF function link.
Signed-off-by: Veerasenareddy Burru <vburru@marvell.com>
Signed-off-by: Abhijit Ayarekar <aayarekar@marvell.com>
---
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/drivers/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"
+#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",
@@ -198,7 +201,9 @@ static void octep_init_config_cn93_pf(struct octep_device *oct)
{
struct octep_config *conf = oct->conf;
struct pci_dev *pdev = oct->pdev;
+ u8 link = 0;
u64 val;
+ int pos;
/* 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 * 7) +
+ (link * CTRL_MBOX_SZ);
}
/* Setup registers for a hardware Tx Queue */
--
2.36.0
next prev parent reply other threads:[~2023-03-24 17:47 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-24 17:46 [PATCH net-next v5 0/8] octeon_ep: deferred probe and mailbox Veerasenareddy Burru
2023-03-24 17:46 ` [PATCH net-next v5 1/8] octeon_ep: defer probe if firmware not ready Veerasenareddy Burru
2023-03-24 17:46 ` [PATCH net-next v5 2/8] octeon_ep: poll for control messages Veerasenareddy Burru
2023-03-24 17:46 ` Veerasenareddy Burru [this message]
2023-03-24 17:46 ` [PATCH net-next v5 4/8] octeon_ep: add separate mailbox command and response queues Veerasenareddy Burru
2023-03-24 17:47 ` [PATCH net-next v5 5/8] octeon_ep: include function id in mailbox commands Veerasenareddy Burru
2023-03-24 17:47 ` [PATCH net-next v5 6/8] octeon_ep: support asynchronous notifications Veerasenareddy Burru
2023-03-24 17:47 ` [PATCH net-next v5 7/8] octeon_ep: function id in link info and stats mailbox commands Veerasenareddy Burru
2023-03-24 17:47 ` [PATCH net-next v5 8/8] octeon_ep: add heartbeat monitor Veerasenareddy Burru
2023-03-27 7:40 ` [PATCH net-next v5 0/8] octeon_ep: deferred probe and mailbox patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230324174704.9752-4-vburru@marvell.com \
--to=vburru@marvell.com \
--cc=aayarekar@marvell.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kuba@kernel.org \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=sburla@marvell.com \
--cc=sedara@marvell.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox