svn commit: r360249 - head/sys/dev/pci

Andrew Turner andrew at FreeBSD.org
Fri Apr 24 11:03:15 UTC 2020


Author: andrew
Date: Fri Apr 24 11:03:15 2020
New Revision: 360249
URL: https://svnweb.freebsd.org/changeset/base/360249

Log:
  Remove PCI_IO_WINDOW_OFFSET from the pci host generic fdt attachment.
  
  It doesn't seem to be needed, and breaks booting under bhyve/arm64.
  
  Discussed with:	br
  MFC after:	2 weeks
  Sponsored by:	Innovate UK

Modified:
  head/sys/dev/pci/pci_host_generic_fdt.c

Modified: head/sys/dev/pci/pci_host_generic_fdt.c
==============================================================================
--- head/sys/dev/pci/pci_host_generic_fdt.c	Fri Apr 24 10:20:54 2020	(r360248)
+++ head/sys/dev/pci/pci_host_generic_fdt.c	Fri Apr 24 11:03:15 2020	(r360249)
@@ -65,8 +65,6 @@ __FBSDID("$FreeBSD$");
 
 #include "pcib_if.h"
 
-#define	PCI_IO_WINDOW_OFFSET	0x1000
-
 #define	SPACE_CODE_SHIFT	24
 #define	SPACE_CODE_MASK		0x3
 #define	SPACE_CODE_IO_SPACE	0x1
@@ -170,8 +168,7 @@ pci_host_generic_attach(device_t dev)
 			    pci_base, pci_base + size - 1);
 		} else if (sc->base.ranges[tuple].flags & FLAG_IO) {
 			error = rman_manage_region(&sc->base.io_rman,
-			    pci_base + PCI_IO_WINDOW_OFFSET,
-			    pci_base + PCI_IO_WINDOW_OFFSET + size - 1);
+			    pci_base, pci_base + size - 1);
 		} else
 			continue;
 		if (error) {


More information about the svn-src-head mailing list