Merge pull request #85 from PaulSelles/devel

Fixed misaligned MMIO data member for ARM64 support
Microsemi · Jul 27, 2020 · 59e500a · 59e500a
2 parents 32953b3 + 1fb4444
commit 59e500a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/linux/switchtec.h b/linux/switchtec.h
@@ -301,7 +301,8 @@ struct ntb_info_regs {
 	u8  partition_count;
 	u8  partition_id;
 	u16 reserved1;
-	u64 ep_map;
+	u32 ep_map_low;
+	u32 ep_map_high;
 	u16 requester_id;
 	u16 reserved2;
 	u32 reserved3[4];

diff --git a/ntb_hw_switchtec.c b/ntb_hw_switchtec.c
@@ -904,7 +904,9 @@ static int switchtec_ntb_init_sndev(struct switchtec_ntb *sndev)
 	tpart_vec <<= 32;
 	tpart_vec |= ioread32(&sndev->mmio_ntb->ntp_info[self].target_part_low);
 
-	part_map = ioread64(&sndev->mmio_ntb->ep_map);
+	part_map = ioread32(&sndev->mmio_ntb->ep_map_high);
+	part_map <<= 32;
+	part_map |= ioread32(&sndev->mmio_ntb->ep_map_low);
 	tpart_vec &= part_map;
 	part_map &= ~(1 << sndev->self_partition);