[PATCH 0/3] net: marvell: prestera: pci: add support for AC5X family devices

public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed

* [PATCH 0/3] net: marvell: prestera: pci: add support for AC5X family devices
@ 2022-11-09 22:25 Oleksandr Mazur
  2022-11-09 22:25 ` [PATCH 1/3] net: marvell: prestera: pci: use device-id defines Oleksandr Mazur
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Oleksandr Mazur @ 2022-11-09 22:25 UTC (permalink / raw)
  To: netdev
  Cc: linux-kernel, edumazet, davem, kuba, pabeni, maksym.glubokiy,
	vadym.kochan, tchornyi, mickeyr, oleksandr.mazur

This patch series introduces a support for AC5X family devices.
AC5X devices utilize arm64 CPUs, and thus require a new FW (arm64-one)
to be loaded. The new FW-image for AC5X devices has been introduces in
the linux-firmware repo under the following commit:

60310c2deb8c ("Merge branch 'prestera-v4.1' of
https://github.com/PLVision/linux-firmware")

Maksym Glubokiy (1):
  net: marvell: prestera: pci: add support for AC5X family devices

Oleksandr Mazur (2):
  net: marvell: prestera: pci: use device-id defines
  net: marvell: prestera: pci: bump supported FW min version

 .../ethernet/marvell/prestera/prestera_pci.c  | 119 +++++++++++++++---
 1 file changed, 105 insertions(+), 14 deletions(-)

-- 
2.17.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

* [PATCH 1/3] net: marvell: prestera: pci: use device-id defines
  2022-11-09 22:25 [PATCH 0/3] net: marvell: prestera: pci: add support for AC5X family devices Oleksandr Mazur
@ 2022-11-09 22:25 ` Oleksandr Mazur
  2022-11-09 22:25 ` [PATCH 2/3] net: marvell: prestera: pci: add support for AC5X family devices Oleksandr Mazur
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Oleksandr Mazur @ 2022-11-09 22:25 UTC (permalink / raw)
  To: netdev
  Cc: linux-kernel, edumazet, davem, kuba, pabeni, maksym.glubokiy,
	vadym.kochan, tchornyi, mickeyr, oleksandr.mazur

Use defines with proper device names instead of device-id in pci-devices
listing.

Signed-off-by: Oleksandr Mazur <oleksandr.mazur@plvision.eu>
---
 drivers/net/ethernet/marvell/prestera/prestera_pci.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/net/ethernet/marvell/prestera/prestera_pci.c b/drivers/net/ethernet/marvell/prestera/prestera_pci.c
index 59470d99f522..14639966e53e 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_pci.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_pci.c
@@ -184,6 +184,10 @@ struct prestera_fw_regs {
 #define PRESTERA_FW_CMD_DEFAULT_WAIT_MS	30000
 #define PRESTERA_FW_READY_WAIT_MS	20000
 
+#define PRESTERA_DEV_ID_AC3X_98DX_55	0xC804
+#define PRESTERA_DEV_ID_AC3X_98DX_65	0xC80C
+#define PRESTERA_DEV_ID_ALDRIN2		0xCC1E
+
 struct prestera_fw_evtq {
 	u8 __iomem *addr;
 	size_t len;
@@ -870,9 +874,9 @@ static void prestera_pci_remove(struct pci_dev *pdev)
 }
 
 static const struct pci_device_id prestera_pci_devices[] = {
-	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0xC804) },
-	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0xC80C) },
-	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, 0xCC1E) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, PRESTERA_DEV_ID_AC3X_98DX_55) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, PRESTERA_DEV_ID_AC3X_98DX_65) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, PRESTERA_DEV_ID_ALDRIN2) },
 	{ }
 };
 MODULE_DEVICE_TABLE(pci, prestera_pci_devices);
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH 2/3] net: marvell: prestera: pci: add support for AC5X family devices
  2022-11-09 22:25 [PATCH 0/3] net: marvell: prestera: pci: add support for AC5X family devices Oleksandr Mazur
  2022-11-09 22:25 ` [PATCH 1/3] net: marvell: prestera: pci: use device-id defines Oleksandr Mazur
@ 2022-11-09 22:25 ` Oleksandr Mazur
  2022-11-09 22:25 ` [PATCH 3/3] net: marvell: prestera: pci: bump supported FW min version Oleksandr Mazur
  2022-11-11 11:00 ` [PATCH 0/3] net: marvell: prestera: pci: add support for AC5X family devices patchwork-bot+netdevbpf
  3 siblings, 0 replies; 5+ messages in thread
From: Oleksandr Mazur @ 2022-11-09 22:25 UTC (permalink / raw)
  To: netdev
  Cc: linux-kernel, edumazet, davem, kuba, pabeni, maksym.glubokiy,
	vadym.kochan, tchornyi, mickeyr, oleksandr.mazur

From: Maksym Glubokiy <maksym.glubokiy@plvision.eu>

Add support for the following AC5x Marvell Prestera PP family devices:
  98DX7312M (12x25G / 8x25G + 1x100G);
  98DX3500  (24x1G + 6x25G);
  98DX3501  (16x1G + 6x10G);
  98DX3510  (48x1G + 6x25G);
  98DX3520  (24x2.5G + 6x25G);

Known issues:
- FW reload doesn't work (rmmod/modprobe sequence).

Co-developed-by: Vadym Kochan <vadym.kochan@plvision.eu>
Signed-off-by: Vadym Kochan <vadym.kochan@plvision.eu>
Signed-off-by: Maksym Glubokiy <maksym.glubokiy@plvision.eu>
Signed-off-by: Oleksandr Mazur <oleksandr.mazur@plvision.eu>
---
 .../ethernet/marvell/prestera/prestera_pci.c  | 107 ++++++++++++++++--
 1 file changed, 97 insertions(+), 10 deletions(-)

diff --git a/drivers/net/ethernet/marvell/prestera/prestera_pci.c b/drivers/net/ethernet/marvell/prestera/prestera_pci.c
index 14639966e53e..9475499069e6 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_pci.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_pci.c
@@ -21,6 +21,7 @@
 #define PRESTERA_PREV_FW_MIN_VER	0
 
 #define PRESTERA_FW_PATH_FMT	"mrvl/prestera/mvsw_prestera_fw-v%u.%u.img"
+#define PRESTERA_FW_ARM64_PATH_FMT "mrvl/prestera/mvsw_prestera_fw_arm64-v%u.%u.img"
 
 #define PRESTERA_FW_HDR_MAGIC		0x351D9D06
 #define PRESTERA_FW_DL_TIMEOUT_MS	50000
@@ -187,6 +188,11 @@ struct prestera_fw_regs {
 #define PRESTERA_DEV_ID_AC3X_98DX_55	0xC804
 #define PRESTERA_DEV_ID_AC3X_98DX_65	0xC80C
 #define PRESTERA_DEV_ID_ALDRIN2		0xCC1E
+#define PRESTERA_DEV_ID_98DX7312M	0x981F
+#define PRESTERA_DEV_ID_98DX3500	0x9820
+#define PRESTERA_DEV_ID_98DX3501	0x9826
+#define PRESTERA_DEV_ID_98DX3510	0x9821
+#define PRESTERA_DEV_ID_98DX3520	0x9822
 
 struct prestera_fw_evtq {
 	u8 __iomem *addr;
@@ -205,6 +211,7 @@ struct prestera_fw {
 	const struct firmware *bin;
 	struct workqueue_struct *wq;
 	struct prestera_device dev;
+	struct pci_dev *pci_dev;
 	u8 __iomem *ldr_regs;
 	u8 __iomem *ldr_ring_buf;
 	u32 ldr_buf_len;
@@ -693,6 +700,20 @@ static int prestera_fw_hdr_parse(struct prestera_fw *fw)
 	return prestera_fw_rev_check(fw);
 }
 
+static const char *prestera_fw_path_fmt_get(struct prestera_fw *fw)
+{
+	switch (fw->pci_dev->device) {
+	case PRESTERA_DEV_ID_98DX3500:
+	case PRESTERA_DEV_ID_98DX3501:
+	case PRESTERA_DEV_ID_98DX3510:
+	case PRESTERA_DEV_ID_98DX3520:
+		return PRESTERA_FW_ARM64_PATH_FMT;
+
+	default:
+		return PRESTERA_FW_PATH_FMT;
+	}
+}
+
 static int prestera_fw_get(struct prestera_fw *fw)
 {
 	int ver_maj = PRESTERA_SUPP_FW_MAJ_VER;
@@ -701,7 +722,7 @@ static int prestera_fw_get(struct prestera_fw *fw)
 	int err;
 
 pick_fw_ver:
-	snprintf(fw_path, sizeof(fw_path), PRESTERA_FW_PATH_FMT,
+	snprintf(fw_path, sizeof(fw_path), prestera_fw_path_fmt_get(fw),
 		 ver_maj, ver_min);
 
 	err = request_firmware_direct(&fw->bin, fw_path, fw->dev.dev);
@@ -778,22 +799,56 @@ static int prestera_fw_load(struct prestera_fw *fw)
 	return err;
 }
 
+static bool prestera_pci_pp_use_bar2(struct pci_dev *pdev)
+{
+	switch (pdev->device) {
+	case PRESTERA_DEV_ID_98DX7312M:
+	case PRESTERA_DEV_ID_98DX3500:
+	case PRESTERA_DEV_ID_98DX3501:
+	case PRESTERA_DEV_ID_98DX3510:
+	case PRESTERA_DEV_ID_98DX3520:
+		return true;
+
+	default:
+		return false;
+	}
+}
+
+static u32 prestera_pci_pp_bar2_offs(struct pci_dev *pdev)
+{
+	if (pci_resource_len(pdev, 2) == 0x1000000)
+		return 0x0;
+	else
+		return (pci_resource_len(pdev, 2) / 2);
+}
+
+static u32 prestera_pci_fw_bar2_offs(struct pci_dev *pdev)
+{
+	if (pci_resource_len(pdev, 2) == 0x1000000)
+		return 0x400000;
+	else
+		return 0x0;
+}
+
 static int prestera_pci_probe(struct pci_dev *pdev,
 			      const struct pci_device_id *id)
 {
 	const char *driver_name = dev_driver_string(&pdev->dev);
+	u8 __iomem *mem_addr, *pp_addr = NULL;
 	struct prestera_fw *fw;
 	int err;
 
 	err = pcim_enable_device(pdev);
-	if (err)
-		return err;
+	if (err) {
+		dev_err(&pdev->dev, "pci_enable_device failed\n");
+		goto err_pci_enable_device;
+	}
 
-	err = pcim_iomap_regions(pdev, BIT(PRESTERA_PCI_BAR_FW) |
-				 BIT(PRESTERA_PCI_BAR_PP),
-				 pci_name(pdev));
-	if (err)
-		return err;
+	err = pci_request_regions(pdev, driver_name);
+	if (err) {
+		dev_err(&pdev->dev, "pci_request_regions failed\n");
+		goto err_pci_request_regions;
+	}
 
 	err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(30));
 	if (err) {
@@ -801,6 +856,26 @@ static int prestera_pci_probe(struct pci_dev *pdev,
 		goto err_dma_mask;
 	}
 
+	mem_addr = pcim_iomap(pdev, 2, 0);
+	if (!mem_addr) {
+		dev_err(&pdev->dev, "pci mem ioremap failed\n");
+		err = -EIO;
+		goto err_mem_ioremap;
+	}
+
+	/* AC5X devices use second half of BAR2 */
+	if (prestera_pci_pp_use_bar2(pdev)) {
+		pp_addr = mem_addr + prestera_pci_pp_bar2_offs(pdev);
+		mem_addr = mem_addr + prestera_pci_fw_bar2_offs(pdev);
+	} else {
+		pp_addr = pcim_iomap(pdev, 4, 0);
+		if (!pp_addr) {
+			dev_err(&pdev->dev, "pp regs ioremap failed\n");
+			err = -EIO;
+			goto err_pp_ioremap;
+		}
+	}
+
 	pci_set_master(pdev);
 
 	fw = devm_kzalloc(&pdev->dev, sizeof(*fw), GFP_KERNEL);
@@ -809,8 +884,9 @@ static int prestera_pci_probe(struct pci_dev *pdev,
 		goto err_pci_dev_alloc;
 	}
 
-	fw->dev.ctl_regs = pcim_iomap_table(pdev)[PRESTERA_PCI_BAR_FW];
-	fw->dev.pp_regs = pcim_iomap_table(pdev)[PRESTERA_PCI_BAR_PP];
+	fw->pci_dev = pdev;
+	fw->dev.ctl_regs = mem_addr;
+	fw->dev.pp_regs = pp_addr;
 	fw->dev.dev = &pdev->dev;
 
 	pci_set_drvdata(pdev, fw);
@@ -858,7 +934,12 @@ static int prestera_pci_probe(struct pci_dev *pdev,
 	prestera_fw_uninit(fw);
 err_prestera_fw_init:
 err_pci_dev_alloc:
+err_pp_ioremap:
+err_mem_ioremap:
 err_dma_mask:
+	pci_release_regions(pdev);
+err_pci_request_regions:
+err_pci_enable_device:
 	return err;
 }
 
@@ -871,12 +952,18 @@ static void prestera_pci_remove(struct pci_dev *pdev)
 	pci_free_irq_vectors(pdev);
 	destroy_workqueue(fw->wq);
 	prestera_fw_uninit(fw);
+	pci_release_regions(pdev);
 }
 
 static const struct pci_device_id prestera_pci_devices[] = {
 	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, PRESTERA_DEV_ID_AC3X_98DX_55) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, PRESTERA_DEV_ID_AC3X_98DX_65) },
 	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, PRESTERA_DEV_ID_ALDRIN2) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, PRESTERA_DEV_ID_98DX7312M) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, PRESTERA_DEV_ID_98DX3500) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, PRESTERA_DEV_ID_98DX3501) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, PRESTERA_DEV_ID_98DX3510) },
+	{ PCI_DEVICE(PCI_VENDOR_ID_MARVELL, PRESTERA_DEV_ID_98DX3520) },
 	{ }
 };
 MODULE_DEVICE_TABLE(pci, prestera_pci_devices);
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [PATCH 3/3] net: marvell: prestera: pci: bump supported FW min version
  2022-11-09 22:25 [PATCH 0/3] net: marvell: prestera: pci: add support for AC5X family devices Oleksandr Mazur
  2022-11-09 22:25 ` [PATCH 1/3] net: marvell: prestera: pci: use device-id defines Oleksandr Mazur
  2022-11-09 22:25 ` [PATCH 2/3] net: marvell: prestera: pci: add support for AC5X family devices Oleksandr Mazur
@ 2022-11-09 22:25 ` Oleksandr Mazur
  2022-11-11 11:00 ` [PATCH 0/3] net: marvell: prestera: pci: add support for AC5X family devices patchwork-bot+netdevbpf
  3 siblings, 0 replies; 5+ messages in thread
From: Oleksandr Mazur @ 2022-11-09 22:25 UTC (permalink / raw)
  To: netdev
  Cc: linux-kernel, edumazet, davem, kuba, pabeni, maksym.glubokiy,
	vadym.kochan, tchornyi, mickeyr, oleksandr.mazur

Bump MIN version to reflect support of new platform (AC5X family devices).

Signed-off-by: Oleksandr Mazur <oleksandr.mazur@plvision.eu>
---
 drivers/net/ethernet/marvell/prestera/prestera_pci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/marvell/prestera/prestera_pci.c b/drivers/net/ethernet/marvell/prestera/prestera_pci.c
index 9475499069e6..f328d957b2db 100644
--- a/drivers/net/ethernet/marvell/prestera/prestera_pci.c
+++ b/drivers/net/ethernet/marvell/prestera/prestera_pci.c
@@ -15,7 +15,7 @@
 #define PRESTERA_MSG_MAX_SIZE 1500
 
 #define PRESTERA_SUPP_FW_MAJ_VER	4
-#define PRESTERA_SUPP_FW_MIN_VER	0
+#define PRESTERA_SUPP_FW_MIN_VER	1
 
 #define PRESTERA_PREV_FW_MAJ_VER	4
 #define PRESTERA_PREV_FW_MIN_VER	0
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* Re: [PATCH 0/3] net: marvell: prestera: pci: add support for AC5X family devices
  2022-11-09 22:25 [PATCH 0/3] net: marvell: prestera: pci: add support for AC5X family devices Oleksandr Mazur
                   ` (2 preceding siblings ...)
  2022-11-09 22:25 ` [PATCH 3/3] net: marvell: prestera: pci: bump supported FW min version Oleksandr Mazur
@ 2022-11-11 11:00 ` patchwork-bot+netdevbpf
  3 siblings, 0 replies; 5+ messages in thread
From: patchwork-bot+netdevbpf @ 2022-11-11 11:00 UTC (permalink / raw)
  To: Oleksandr Mazur
  Cc: netdev, linux-kernel, edumazet, davem, kuba, pabeni,
	maksym.glubokiy, vadym.kochan, tchornyi, mickeyr

Hello:

This series was applied to netdev/net-next.git (master)
by David S. Miller <davem@davemloft.net>:

On Thu, 10 Nov 2022 00:25:19 +0200 you wrote:
> This patch series introduces a support for AC5X family devices.
> AC5X devices utilize arm64 CPUs, and thus require a new FW (arm64-one)
> to be loaded. The new FW-image for AC5X devices has been introduces in
> the linux-firmware repo under the following commit:
> 
> 60310c2deb8c ("Merge branch 'prestera-v4.1' of
> https://github.com/PLVision/linux-firmware")
> 
> [...]

Here is the summary with links:
  - [1/3] net: marvell: prestera: pci: use device-id defines
    https://git.kernel.org/netdev/net-next/c/c334ac6461d5
  - [2/3] net: marvell: prestera: pci: add support for AC5X family devices
    https://git.kernel.org/netdev/net-next/c/075c881be29b
  - [3/3] net: marvell: prestera: pci: bump supported FW min version
    https://git.kernel.org/netdev/net-next/c/a35608ed8cfd

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html



^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2022-11-11 11:00 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-09 22:25 [PATCH 0/3] net: marvell: prestera: pci: add support for AC5X family devices Oleksandr Mazur
2022-11-09 22:25 ` [PATCH 1/3] net: marvell: prestera: pci: use device-id defines Oleksandr Mazur
2022-11-09 22:25 ` [PATCH 2/3] net: marvell: prestera: pci: add support for AC5X family devices Oleksandr Mazur
2022-11-09 22:25 ` [PATCH 3/3] net: marvell: prestera: pci: bump supported FW min version Oleksandr Mazur
2022-11-11 11:00 ` [PATCH 0/3] net: marvell: prestera: pci: add support for AC5X family devices patchwork-bot+netdevbpf

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox