starlingx/kernel
Code Issues Proposed changes

Upversion Octeon-ep to 11.23.04 for Marvell Octeon based PCIe cards

Browse Source 
Octeon-ep debian package includes PF, VF and virtual PHC device drivers.
These drivers are loaded as part of octeon operator deployment.
This commit includes release 11.23.04.

Test Plan:
Pass: build-pkgs -p octeon-ep
Pass: build-image

Tested and verified on hardware.

Story: 2010047
Task: 48033
Change-Id: Id505d96e190dd95e9200d2134142a17174712b64
Signed-off-by: Shinas Rasheed <srasheed@marvell.com>
This commit is contained in:
Shinas Rasheed 2023-05-16 03:04:48 -07:00
parent eaff902150
commit 3d0ea9f6be
6 changed files with 51 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kernel-modules/octeon_ep/debian/deb_folder/changelog
View File

@ -1,3 +1,9 @@
octeon-ep (112304-1) unstable; urgency=medium
* Updated PF, VF and PHC driver for Octeon PCIe NIC
-- Shinas Rasheed <srasheed@marvell.com> Tue, May 16 2023 03:07:20 -0700
octeon-ep (112301-1) unstable; urgency=medium
* PF, VF and PHC driver for Octeon PCIe NIC

2
kernel-modules/octeon_ep/debian/deb_folder/copyright
View File

@ -2,7 +2,7 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: octeon_ep
Upstream-Contact: Marvell Semiconductors
Source: https://sourceforge.net/projects/octeon-ep/files/octeon_ep-112301.tar.gz/download
Source: https://sourceforge.net/projects/octeon-ep/files/octeon_ep-112304.tar.gz/download
Files: * except host/Makefile
Copyright: Copyright 2023 Marvell Corporation.
License: GPL-2

12
kernel-modules/octeon_ep/debian/deb_folder/patches/0001-octeon_ep-print-firmware-ready-status-only-once.patch
View File

@ -1,4 +1,4 @@
From c3a97b11a797825a78d394ccd54612b313e210d2 Mon Sep 17 00:00:00 2001
From 1a2e4baf10a7b8d80371780dae09ff6f82102170 Mon Sep 17 00:00:00 2001
From: Veerasenareddy Burru <vburru@marvell.com>
Date: Mon, 20 Feb 2023 22:28:58 -0800
Subject: [PATCH] octeon_ep: print firmware ready status only once
@ -8,15 +8,17 @@ ready). log only once when firmware is not ready and once when
firmware is ready.
Signed-off-by: Veerasenareddy Burru <vburru@marvell.com>
[SR: Refreshed patch for SDK 11.23.04]
Signed-off-by: Shinas Rasheed <srasheed@marvell.com>
---
host/drivers/octeon_ep/octep_main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/host/drivers/octeon_ep/octep_main.c b/host/drivers/octeon_ep/octep_main.c
index cad1208..f8a5fe4 100644
index d28b4c3..55bdd25 100644
--- a/host/drivers/octeon_ep/octep_main.c
+++ b/host/drivers/octeon_ep/octep_main.c
@@ -1206,8 +1206,7 @@ static u8 get_fw_ready_status(struct octep_device *oct)
@@ -1468,8 +1468,7 @@ static u8 get_fw_ready_status(struct octep_device *oct)
#define FW_STATUS_VSEC_ID 0xA3
if (vsec_id == FW_STATUS_VSEC_ID) {
pci_read_config_byte(oct->pdev, (pos + 8), &status);
@ -26,7 +28,7 @@ index cad1208..f8a5fe4 100644
return status;
}
}
@@ -1247,6 +1246,7 @@ static void octep_dev_setup_task(struct work_struct *work)
@@ -1509,6 +1508,7 @@ static void octep_dev_setup_task(struct work_struct *work)
return;
}
}
@ -35,5 +37,5 @@ index cad1208..f8a5fe4 100644
/* Do not free resources on failure. driver unload will
* lead to freeing resources.
--
2.34.1
2.25.1

31
kernel-modules/octeon_ep/debian/deb_folder/patches/0002-phc-print-firmware-ready-status-only-once.patch Normal file
View File

@ -0,0 +1,31 @@
From f4f63a14ca379c9e0254019154e9c4db57e9325b Mon Sep 17 00:00:00 2001
From: Shinas Rasheed <srasheed@marvell.com>
Date: Thu, 25 May 2023 03:02:09 -0700
Subject: [PATCH] phc: print firmware ready status only once
Do not log every time when firmware ready status is read as 0 (not ready).
Log only once when firmware is not ready and once when firmware is ready.
Signed-off-by: Shinas Rasheed <srasheed@marvell.com>
---
host/drivers/phc/ep_phc.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/host/drivers/phc/ep_phc.c b/host/drivers/phc/ep_phc.c
index 3776bba..0df50d6 100644
--- a/host/drivers/phc/ep_phc.c
+++ b/host/drivers/phc/ep_phc.c
@@ -301,8 +301,8 @@ static u8 oct_get_fw_ready_status(octeon_device_t *oct_dev)
pci_read_config_word(oct_dev->pci_dev, pos + 4, &vsec_id);
if (vsec_id == FW_STATUS_VSEC_ID) {
pci_read_config_byte(oct_dev->pci_dev, (pos + 8), &status);
- dev_info(&oct_dev->pci_dev->dev, "OCT_PHC[%d]:fw ready status %u\n",
- oct_dev->octeon_id, status);
+ dev_info_once(&oct_dev->pci_dev->dev, "OCT_PHC[%d]:fw ready status %u\n",
+ oct_dev->octeon_id, status);
return status;
}
}
--
2.34.1

1
kernel-modules/octeon_ep/debian/deb_folder/patches/series
View File

@ -1 +1,2 @@
0001-octeon_ep-print-firmware-ready-status-only-once.patch
0002-phc-print-firmware-ready-status-only-once.patch

10
kernel-modules/octeon_ep/debian/meta_data.yaml
View File

@ -1,13 +1,13 @@
---
debver: 112301
debver: 112304
debname: octeon-ep
dl_path:
name: octeon_ep-112301.tar.gz
name: octeon_ep-112304.tar.gz
url: "https://sourceforge.net/projects/octeon-ep/files/\
octeon_ep-112301.tar.gz/download"
sha256sum: 729777a68dbe17e17773672752e9dc0e307c49ead2c488089854f87c11ed4772
octeon_ep-112304.tar.gz/download"
sha256sum: 7250da17d9829738b010496b1950689725058bd31dd49a95a588a4f823ee883f
revision:
dist: $STX_DIST
GITREVCOUNT:
BASE_SRCREV: c73c2272c5bb0ef8bd7b5e706ad4f6bfa781c245
BASE_SRCREV: eaff9021509f0348a59f14bd784c0391a5c70760
SRC_DIR: ${MY_REPO}/stx/kernel/kernel-modules/octeon_ep