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

Paolo Abeni · Paolo Abeni · commit 6608b952ae8f · 2025-10-16T11:36:32.000+02:00
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: Paolo Abeni <pabeni@redhat.com>
diff --git a/drivers/net/ethernet/meta/Kconfig b/drivers/net/ethernet/meta/Kconfig
@@ -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
diff --git a/drivers/net/ethernet/meta/fbnic/fbnic_txrx.c b/drivers/net/ethernet/meta/fbnic/fbnic_txrx.c
@@ -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);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -887,6 +887,7 @@ static void fbnic_bd_prep(struct fbnic_ring *bdq, u16 id, netmem_ref netmem)`
`887`	`887`	`*bdq_desc = cpu_to_le64(bd);`
`888`	`888`	`bd += FIELD_PREP(FBNIC_BD_DESC_ADDR_MASK, 1) \|`
`889`	`889`	`FIELD_PREP(FBNIC_BD_DESC_ID_MASK, 1);`
	`890`	`+ bdq_desc++;`
`890`	`891`	`} while (--i);`
`891`	`892`	`}`
`892`	`893`