Upstream fixes, added support for Linux kernel >= 5.12, build on Debian bullseye too #2

DataHoarder · 2021-08-04T02:32:34Z

DataHoarder commented

2021-08-04 02:32:34 +00:00

No description provided.

DataHoarder added the

bug

enhancement

labels 2021-08-04 02:32:34 +00:00

DataHoarder added 5 commits 2021-08-04 02:32:35 +00:00

continuous-integration/drone/push Build is failing

Details

991ddf05f2 Add debian bullseye to build targets

397b5258ed fm10k: Fix fall-through warnings for Clang

In preparation to enable -Wimplicit-fallthrough for Clang, fix multiple
warnings by explicitly adding a couple of break statements instead of
just letting the code fall through to the next case.

Link: https://github.com/KSPP/linux/issues/115
Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

9221eea3b0 fm10k: move error check

The error check and set_bit are placed in such a way that sparse (C=2)
warns:
.../fm10k_pci.c:1395:9: warning: context imbalance in 'fm10k_msix_mbx_pf' - different lock contexts for basic block

Which seems a little odd, but the code can obviously be moved
to where the variable is being set without changing functionality
at all, and it even seems to make a bit more sense with the check
closer to the set.

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

279ad02edf fm10k: Fix an error handling path in 'fm10k_probe()'

If an error occurs after a 'pci_enable_pcie_error_reporting()' call, it
must be undone by a corresponding 'pci_disable_pcie_error_reporting()'
call, as already done in the remove function.

Fixes: 19ae1b3fb99c ("fm10k: Add support for PCI power management and error handling")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>

continuous-integration/drone/push Build was killed

Details

continuous-integration/drone/pr Build was killed

Details

d701c1f0c7 fm10k: convert to new udp_tunnel_nic infra (support kernel >= 5.12.0)

Straightforward conversion to new infra. Driver restores info
after close/open cycle by calling its internal restore function
so just use that, no need for udp_tunnel_nic_reset_ntf() here.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

Based off linux commit f7529b4ba3c98470b0e367ba447ad0da84dc308c

DataHoarder reviewed 2021-08-04 02:34:22 +00:00

src/kcompat.h

					
				@ -5264,2 +5264,4 @@

				#endif /* 4.8.0 */

				#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,12,0))

				#define HAVE_UDP_TUNNEL_NIC

DataHoarder commented

2021-08-04 02:34:22 +00:00

New flag was required due to the scope of the additions/removals needed all around the code to support older kernels as well.

DataHoarder added 1 commit 2021-08-04 02:40:22 +00:00

continuous-integration/drone/push Build is passing

Details

continuous-integration/drone/pr Build is passing

Details

bcbbdc162b Change DRV_VERSION to 0.27.1-gs-patched to indicate driver is not vanilla

DataHoarder merged commit bf148b5d8a into master

2021-08-04 04:18:39 +00:00

DataHoarder referenced this pull request from a commit

2021-08-04 04:18:39 +00:00

Merge pull request 'Upstream fixes, added support for Linux kernel >= 5.12, build on Debian bullseye too' (#2) from test-debian-bullseye into master

DataHoarder deleted branch test-debian-bullseye

2021-08-04 04:18:48 +00:00

Sign in to join this conversation.

No reviewers

No labels

No milestone

No project

No assignees

1 participant

Notifications

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: FM10K/fm10k#2