Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 3 Nov 2015 00:21:23 +0000 (UTC)
From:      Justin Hibbits <jhibbits@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r290317 - head/sys/powerpc/mpc85xx
Message-ID:  <201511030021.tA30LNqc016276@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: jhibbits
Date: Tue Nov  3 00:21:23 2015
New Revision: 290317
URL: https://svnweb.freebsd.org/changeset/base/290317

Log:
  Use the correct space (PCI addresses) for the I/O and memory ranges.
  
  PCIR_IOBASE/IOLIMIT/... all use PCI-space addresses, not host addresses.

Modified:
  head/sys/powerpc/mpc85xx/pci_mpc85xx.c

Modified: head/sys/powerpc/mpc85xx/pci_mpc85xx.c
==============================================================================
--- head/sys/powerpc/mpc85xx/pci_mpc85xx.c	Mon Nov  2 23:37:19 2015	(r290316)
+++ head/sys/powerpc/mpc85xx/pci_mpc85xx.c	Tue Nov  3 00:21:23 2015	(r290317)
@@ -782,9 +782,9 @@ fsl_pcib_decode_win(phandle_t node, stru
 			    sc->pci_sc.sc_range[i].host,
 			    sc->pci_sc.sc_range[i].size,
 			    sc->pci_sc.sc_range[i].pci);
-			sc->sc_ioport_start = sc->pci_sc.sc_range[i].host;
-			sc->sc_ioport_end = sc->pci_sc.sc_range[i].host +
-			    sc->pci_sc.sc_range[i].size;
+			sc->sc_ioport_start = sc->pci_sc.sc_range[i].pci;
+			sc->sc_ioport_end = sc->pci_sc.sc_range[i].pci +
+			    sc->pci_sc.sc_range[i].size - 1;
 			sc->sc_ioport_alloc = 0x1000 + sc->pci_sc.sc_range[i].pci;
 			break;
 		case OFW_PCI_PHYS_HI_SPACE_MEM32:
@@ -794,9 +794,9 @@ fsl_pcib_decode_win(phandle_t node, stru
 			    sc->pci_sc.sc_range[i].host,
 			    sc->pci_sc.sc_range[i].size,
 			    sc->pci_sc.sc_range[i].pci);
-			sc->sc_iomem_start = sc->pci_sc.sc_range[i].host;
-			sc->sc_iomem_end = sc->pci_sc.sc_range[i].host +
-			    sc->pci_sc.sc_range[i].size;
+			sc->sc_iomem_start = sc->pci_sc.sc_range[i].pci;
+			sc->sc_iomem_end = sc->pci_sc.sc_range[i].pci +
+			    sc->pci_sc.sc_range[i].size - 1;
 			sc->sc_iomem_alloc = sc->pci_sc.sc_range[i].pci;
 			break;
 		default:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201511030021.tA30LNqc016276>