From: Jan Kiszka <jan.kiszka@siemens.com>
To: Xenomai <xenomai@lists.linux.dev>
Subject: [PATCH] drivers/net: Avoid enabling/disabling AER explicitly on newer kernels
Date: Sat, 23 Sep 2023 11:52:35 +0200 [thread overview]
Message-ID: <16c73c36-f278-467f-903e-8579232ce16f@siemens.com> (raw)
From: Jan Kiszka <jan.kiszka@siemens.com>
This is now done automatically, and recent kernels even stopped
exporting the original functions.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
kernel/drivers/net/drivers/e1000e/netdev.c | 4 ++++
kernel/drivers/net/drivers/igb/igb_main.c | 4 ++++
kernel/drivers/net/drivers/igc/igc_main.c | 4 ++++
3 files changed, 12 insertions(+)
diff --git a/kernel/drivers/net/drivers/e1000e/netdev.c b/kernel/drivers/net/drivers/e1000e/netdev.c
index acb8dbdafa..ea2f65d129 100644
--- a/kernel/drivers/net/drivers/e1000e/netdev.c
+++ b/kernel/drivers/net/drivers/e1000e/netdev.c
@@ -3931,8 +3931,10 @@ static int e1000_probe(struct pci_dev *pdev,
if (err)
goto err_pci_reg;
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(6,0,0)
/* AER (Advanced Error Reporting) hooks */
pci_enable_pcie_error_reporting(pdev);
+#endif
pci_set_master(pdev);
/* PCI config space info */
@@ -4257,8 +4259,10 @@ static void e1000_remove(struct pci_dev *pdev)
rtdev_free(netdev);
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(6,0,0)
/* AER disable */
pci_disable_pcie_error_reporting(pdev);
+#endif
pci_disable_device(pdev);
}
diff --git a/kernel/drivers/net/drivers/igb/igb_main.c b/kernel/drivers/net/drivers/igb/igb_main.c
index d0f647c63e..15a4e9591f 100644
--- a/kernel/drivers/net/drivers/igb/igb_main.c
+++ b/kernel/drivers/net/drivers/igb/igb_main.c
@@ -2029,7 +2029,9 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (err)
goto err_pci_reg;
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(6,0,0)
pci_enable_pcie_error_reporting(pdev);
+#endif
pci_set_master(pdev);
pci_save_state(pdev);
@@ -2465,7 +2467,9 @@ static void igb_remove(struct pci_dev *pdev)
kfree(adapter->shadow_vfta);
rtdev_free(netdev);
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(6,0,0)
pci_disable_pcie_error_reporting(pdev);
+#endif
pci_disable_device(pdev);
}
diff --git a/kernel/drivers/net/drivers/igc/igc_main.c b/kernel/drivers/net/drivers/igc/igc_main.c
index 5b11228b05..1373412287 100644
--- a/kernel/drivers/net/drivers/igc/igc_main.c
+++ b/kernel/drivers/net/drivers/igc/igc_main.c
@@ -3692,7 +3692,9 @@ static int igc_probe(struct pci_dev *pdev,
if (err)
goto err_pci_reg;
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(6,0,0)
pci_enable_pcie_error_reporting(pdev);
+#endif
pci_set_master(pdev);
@@ -3922,7 +3924,9 @@ static void igc_remove(struct pci_dev *pdev)
rtdev_free(netdev);
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(6,0,0)
pci_disable_pcie_error_reporting(pdev);
+#endif
pci_disable_device(pdev);
}
--
2.35.3
reply other threads:[~2023-09-23 9:52 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=16c73c36-f278-467f-903e-8579232ce16f@siemens.com \
--to=jan.kiszka@siemens.com \
--cc=xenomai@lists.linux.dev \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).