rpm/s390-tools
SHA256
1
0
Fork 0
forked from pool/s390-tools
Code Pull Requests Activity

Accepting request 664200 from home:markkp:branches:Base:System

Browse Source 
- Added s390-tools-sles15sp1-qethqoat-add-OSA-Express7S-support.patch
  qethqoat: add OSA-Express7S support
  (Fate#326805, bsc#1121222)

OBS-URL: https://build.opensuse.org/request/show/664200
OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=65
This commit is contained in:
Mark Post 2019-01-09 23:44:56 +00:00 committed by Git OBS Bridge
parent abb3f04920
commit 2ffa16183f
3 changed files with 75 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
s390-tools-sles15sp1-qethqoat-add-OSA-Express7S-support.patch Normal file
View File

@ -0,0 +1,65 @@
Subject: [PATCH] [FEAT NET1711] qethqoat: add OSA-Express7S support
From: Julian Wiedmann <jwi@linux.ibm.com>
Summary: qethqoat: add OSA-Express7S support
Description: Add the missing identifiers to report the correct card name and
link speed.
Upstream-ID: 20145b6d06debd47944bff0a471d17e5eba07010
Problem-ID: NET1711
Upstream-Description:
qethqoat: add OSA-Express7S support
Add the missing identifiers to report the card name and link speed.
Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
---
qethqoat/qethqoat.c | 6 ++++++
qethqoat/qethqoat.h | 2 ++
2 files changed, 8 insertions(+)
--- a/qethqoat/qethqoat.c
+++ b/qethqoat/qethqoat.c
@@ -208,6 +208,9 @@ static void print_physical(struct qeth_q
case OAT_OSA_GEN_OSAE6S:
osagen = "OSA-Express6S";
break;
+ case OAT_OSA_GEN_OSAE7S:
+ osagen = "OSA-Express7S";
+ break;
default:
sprintf(tmp, "unknown (0x%x)", phdr->osa_gen);
osagen = tmp;
@@ -239,6 +242,9 @@ static void print_physical(struct qeth_q
case OAT_PORT_SPEED_10gbs_full:
speed = "10 Gb/s / full duplex";
break;
+ case OAT_PORT_SPEED_25gbs_full:
+ speed = "25 Gb/s / full duplex";
+ break;
case OAT_PORT_SPEED_UNKNOWN:
speed = "unknown / unknown";
break;
--- a/qethqoat/qethqoat.h
+++ b/qethqoat/qethqoat.h
@@ -58,6 +58,7 @@ struct qeth_qoat_physical {
#define OAT_OSA_GEN_OSAE4S 0x02
#define OAT_OSA_GEN_OSAE5S 0x03
#define OAT_OSA_GEN_OSAE6S 0x04
+#define OAT_OSA_GEN_OSAE7S 0x05
__u8 osa_gen;
#define OAT_PORT_SPEED_UNKNOWN 0x00
#define OAT_PORT_SPEED_10mbs_half 0x01
@@ -68,6 +69,7 @@ struct qeth_qoat_physical {
#define OAT_PORT_SPEED_1000mbs_full 0x06
#define OAT_PORT_SPEED_NA 0x07
#define OAT_PORT_SPEED_10gbs_full 0x08
+#define OAT_PORT_SPEED_25gbs_full 0x0A
__u8 port_speed;
#define OAT_PORT_MEDIA_COPPER 0x01
#define OAT_PORT_MEDIA_MULTI_MODE 0x02

7
s390-tools.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jan 9 23:17:22 UTC 2019 - mpost@suse.com
- Added s390-tools-sles15sp1-qethqoat-add-OSA-Express7S-support.patch
qethqoat: add OSA-Express7S support
(Fate#326805, bsc#1121222)
-------------------------------------------------------------------
Thu Dec 6 21:03:08 UTC 2018 - mpost@suse.com

4
s390-tools.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package s390-tools
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -206,6 +206,7 @@ Patch94: s390-tools-sles15sp1-09-zdev-Implement-internal-device-attribute
Patch95: s390-tools-sles15sp1-10-zdev-Implement-support-for-early-device-configuratio.patch
Patch96: s390-tools-sles15sp1-11-zdev-Do-not-call-zipl-on-initrd-update.patch
Patch97: s390-tools-sles15sp1-zdev-fix-qeth-BridgePort-and-VNICC-conflict-checking.patch
Patch98: s390-tools-sles15sp1-qethqoat-add-OSA-Express7S-support.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: s390x
@ -359,6 +360,7 @@ to list files and directories.
%patch95 -p1
%patch96 -p1
%patch97 -p1
%patch98 -p1
cp -vi %{S:22} CAUTION