Commit 6608b952 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'add-aarch64-support-for-fbnic' 

Dimitri Daskalakis says:

====================
Add aarch64 support for FBNIC

We need to support aarch64 with 64K PAGE_SIZE, and I uncovered an issue
during testing.
====================

Link: https://patch.msgid.link/20251013211449.1377054-1-dimitri.daskalakis1@gmail.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents cb85ca4c 75b35083

drivers/net/ethernet/meta/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ if NET_VENDOR_META 


config FBNIC

	tristate "Meta Platforms Host Network Interface"

	depends on X86_64 || COMPILE_TEST

	depends on 64BIT || COMPILE_TEST

	depends on !S390

	depends on MAX_SKB_FRAGS < 22

	depends on PCI_MSI

drivers/net/ethernet/meta/fbnic/fbnic_txrx.c

+1 −0
Original line number Diff line number Diff line
@@ -887,6 +887,7 @@ static void fbnic_bd_prep(struct fbnic_ring *bdq, u16 id, netmem_ref netmem) 
		*bdq_desc = cpu_to_le64(bd);

		bd += FIELD_PREP(FBNIC_BD_DESC_ADDR_MASK, 1) |

		      FIELD_PREP(FBNIC_BD_DESC_ID_MASK, 1);

		bdq_desc++;

	} while (--i);

}