From: Kevin Traynor <ktraynor@redhat.com>
To: stable@dpdk.org
Cc: Abhishek.Marathe@microsoft.com, bluca@debian.org,
Kevin Traynor <ktraynor@redhat.com>
Subject: [dpdk-stable] [PATCH 18.11 1/2] kni: fix build error on openSUSE 15.2 - pci clearing
Date: Fri, 25 Sep 2020 14:01:12 +0100 [thread overview]
Message-ID: <20200925130113.13877-1-ktraynor@redhat.com> (raw)
Similar to
commit 8c70f4af0f40 ("kni: fix ethtool build error on kernel 5.7")
openSUSE LEAP 15.2 also needs to use the new
pci_aer_clear_nonfatal_status() function instead of
pci_cleanup_aer_uncorrect_error_status().
Add macros for openSUSE 15.2 and extend compatibility.
Reported-by: Abhishek Marathe <Abhishek.Marathe@microsoft.com>
Signed-off-by: Kevin Traynor <ktraynor@redhat.com>
---
kernel/linux/kni/compat.h | 5 ++++-
kernel/linux/kni/ethtool/igb/kcompat.h | 8 ++++++--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h
index 3c3855dcfa..bf5e6e2b17 100644
--- a/kernel/linux/kni/compat.h
+++ b/kernel/linux/kni/compat.h
@@ -15,5 +15,8 @@
#endif
#ifdef CONFIG_SUSE_KERNEL
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 57))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 18))
+/* SLES15 SP2 is 5.3.18 based */
+#define SLE_VERSION_CODE SLE_VERSION(15, 2, 0)
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 57))
/* SLES12SP3 is at least 4.4.57+ based */
#define SLE_VERSION_CODE SLE_VERSION(12, 3, 0)
diff --git a/kernel/linux/kni/ethtool/igb/kcompat.h b/kernel/linux/kni/ethtool/igb/kcompat.h
index f74038b3eb..459fda3dad 100644
--- a/kernel/linux/kni/ethtool/igb/kcompat.h
+++ b/kernel/linux/kni/ethtool/igb/kcompat.h
@@ -685,5 +685,8 @@ struct _kc_ethtool_pauseparam {
#endif
#ifdef CONFIG_SUSE_KERNEL
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 57))
+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 3, 18))
+/* SLES15 SP2 is 5.3.18 based */
+#define SLE_VERSION_CODE SLE_VERSION(15, 2, 0)
+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 57))
/* SLES12SP3 is at least 4.4.57+ based */
#define SLE_VERSION_CODE SLE_VERSION(12, 3, 0)
@@ -3965,5 +3968,6 @@ skb_set_hash(struct sk_buff *skb, __u32 hash, __always_unused int type)
#endif
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5, 7, 0))
+#if ((LINUX_VERSION_CODE >= KERNEL_VERSION(5, 7, 0)) \
+ || (SLE_VERSION_CODE && SLE_VERSION_CODE >= SLE_VERSION(15, 2, 0)))
#define pci_cleanup_aer_uncorrect_error_status \
pci_aer_clear_nonfatal_status
--
2.26.2
next reply other threads:[~2020-09-25 13:01 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-25 13:01 Kevin Traynor [this message]
2020-09-25 13:01 ` [dpdk-stable] [PATCH 18.11 2/2] kni: fix build error on openSuse 15.2 - skb_frag_t to bio_vec Kevin Traynor
2020-09-25 13:09 ` Luca Boccassi
2020-09-28 9:05 ` Kevin Traynor
2020-09-25 13:09 ` [dpdk-stable] [PATCH 18.11 1/2] kni: fix build error on openSUSE 15.2 - pci clearing Luca Boccassi
2020-09-28 9:05 ` Kevin Traynor
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=20200925130113.13877-1-ktraynor@redhat.com \
--to=ktraynor@redhat.com \
--cc=Abhishek.Marathe@microsoft.com \
--cc=bluca@debian.org \
--cc=stable@dpdk.org \
/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;
as well as URLs for NNTP newsgroup(s).