patches/PAE: Fix 64bit build of PAE support

2 files changed, 33 insertions, 20 deletions

diff --git a/debian/changelog b/debian/changelog
index fb37c7a8..27dbd35f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+rumpkernel (0~20211031+repack-4) UNRELEASED; urgency=medium
+
+  * patches/PAE: Fix 64bit build of PAE support.
+
+ -- Samuel Thibault <sthibault@debian.org>  Tue, 19 Sep 2023 18:29:43 +0200
+
 rumpkernel (0~20211031+repack-3) unreleased; urgency=medium
 
   * rules: Pass -fno-omit-frame-pointer to get traces from gnumach.
diff --git a/debian/patches/PAE b/debian/patches/PAE
index 6b430bd6..0ef22ac8 100644
--- a/debian/patches/PAE
+++ b/debian/patches/PAE
@@ -1,7 +1,13 @@
-Index: rumpkernel/pci-userspace/src-gnu/pci_user-gnu.c
-===================================================================
---- rumpkernel.orig/pci-userspace/src-gnu/pci_user-gnu.c
-+++ rumpkernel/pci-userspace/src-gnu/pci_user-gnu.c
+---
+ buildrump.sh/src/sys/rump/dev/lib/libpci/pci_user.h        |    6 
+ buildrump.sh/src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c |   14 +-
+ buildrump.sh/src/sys/rump/include/sys/bus.h                |    2 
+ pci-userspace/src-gnu/pci_user-gnu.c                       |   82 +++++++++----
+ pci-userspace/src-linux-uio/pci_user-uio_linux.c           |    6 
+ 5 files changed, 71 insertions(+), 39 deletions(-)
+
+--- a/pci-userspace/src-gnu/pci_user-gnu.c
++++ b/pci-userspace/src-gnu/pci_user-gnu.c
 @@ -446,7 +446,7 @@ rumpcomp_pci_irq_establish(unsigned cook
   */
  int
@@ -121,10 +127,8 @@ Index: rumpkernel/pci-userspace/src-gnu/pci_user-gnu.c
  
  	if (paddr == 0){
  		MACH_PRINT("rumpcomp_pci_virt_to_mach\n");
-Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci/pci_user.h
-===================================================================
---- rumpkernel.orig/buildrump.sh/src/sys/rump/dev/lib/libpci/pci_user.h
-+++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci/pci_user.h
+--- a/buildrump.sh/src/sys/rump/dev/lib/libpci/pci_user.h
++++ b/buildrump.sh/src/sys/rump/dev/lib/libpci/pci_user.h
 @@ -20,20 +20,20 @@ int rumpcomp_pci_irq_map(unsigned, unsig
  void *rumpcomp_pci_irq_establish(unsigned, int (*)(void *), void *);
  
@@ -149,10 +153,8 @@ Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci/pci_user.h
  
  #ifdef RUMPCOMP_USERFEATURE_PCI_IOSPACE
  int rumpcomp_pci_iospace_init(void);
-Index: rumpkernel/buildrump.sh/src/sys/rump/include/sys/bus.h
-===================================================================
---- rumpkernel.orig/buildrump.sh/src/sys/rump/include/sys/bus.h
-+++ rumpkernel/buildrump.sh/src/sys/rump/include/sys/bus.h
+--- a/buildrump.sh/src/sys/rump/include/sys/bus.h
++++ b/buildrump.sh/src/sys/rump/include/sys/bus.h
 @@ -45,7 +45,7 @@ typedef void *bus_dma_tag_t;
  #define BUS_DMA_TAG_VALID(_tag_) ((_tag_) != NULL)
  
@@ -162,10 +164,8 @@ Index: rumpkernel/buildrump.sh/src/sys/rump/include/sys/bus.h
  	bus_size_t	ds_len;
  	vaddr_t		_ds_vacookie;
  	bus_size_t	_ds_sizecookie;
-Index: rumpkernel/pci-userspace/src-linux-uio/pci_user-uio_linux.c
-===================================================================
---- rumpkernel.orig/pci-userspace/src-linux-uio/pci_user-uio_linux.c
-+++ rumpkernel/pci-userspace/src-linux-uio/pci_user-uio_linux.c
+--- a/pci-userspace/src-linux-uio/pci_user-uio_linux.c
++++ b/pci-userspace/src-linux-uio/pci_user-uio_linux.c
 @@ -293,7 +293,7 @@ rumpcomp_pci_irq_establish(unsigned cook
   */
  int
@@ -189,10 +189,8 @@ Index: rumpkernel/pci-userspace/src-linux-uio/pci_user-uio_linux.c
  	int pagesize, offset;
  
  	(void)*(volatile int *)virt;
-Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c
-===================================================================
---- rumpkernel.orig/buildrump.sh/src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c
-+++ rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c
+--- a/buildrump.sh/src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c
++++ b/buildrump.sh/src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c
 @@ -84,8 +84,8 @@ __KERNEL_RCSID(0, "$NetBSD: rumpdev_bus_
  
  #define	EIEIO	membar_sync()
@@ -240,3 +238,12 @@ Index: rumpkernel/buildrump.sh/src/sys/rump/dev/lib/libpci/rumpdev_bus_dma.c
  	int seg, i, error, first;
  	bus_size_t minlen, resid;
  	struct iovec *iov;
+@@ -514,7 +514,7 @@ bus_dmamem_alloc(bus_dma_tag_t t, bus_si
+ 	bus_size_t boundary, bus_dma_segment_t *segs, int nsegs, int *rsegs,
+ 	int flags)
+ {
+-	paddr_t curaddr, lastaddr, pa;
++	unsigned long long curaddr, lastaddr, pa;
+ 	vaddr_t vacookie;
+ 	size_t sizecookie;
+ 	int curseg, error;