kernel: massive pci code rewrite

The new pci code is moved to port/pci.[hc] and shared by
all ports.

Each port has its own PCI controller implementation,
providing the pcicfgrw*() functions for low level pci
config space access. The locking for pcicfgrw*() is now
done by the caller (only port/pci.c).

Device drivers now need to include "../port/pci.h" in
addition to "io.h".

The new code now checks bridge windows and membars,
while enumerating the bus, giving the pc driver a chance
to re-assign them. This is needed because some UEFI
implementations fail to assign the bars for some devices,
so we need to do it outselfs. (See pcireservemem()).

While working on this, it was discovered that the pci
code assimed the smallest I/O bar size is 16 (pcibarsize()),
which is wrong. I/O bars can be as small as 4 bytes.
Bit 1 in an I/O bar is also reserved and should be masked off,
making the port mask: port = bar & ~3;

3 files changed, 15 insertions, 35 deletions

diff --git a/sys/src/9/pc64/fns.h b/sys/src/9/pc64/fns.h
index 2bbd3ffd8..39afc4864 100644
--- a/sys/src/9/pc64/fns.h
+++ b/sys/src/9/pc64/fns.h
@@ -124,32 +124,10 @@ void	outl(int, ulong);
 void	outsl(int, void*, int);
 uintptr	paddr(void*);
 void	patwc(void*, int);
-ulong	pcibarsize(Pcidev*, int);
-void	pcibussize(Pcidev*, uvlong*, ulong*);
-int	pcicfgr8(Pcidev*, int);
-int	pcicfgr16(Pcidev*, int);
-int	pcicfgr32(Pcidev*, int);
-void	pcicfgw8(Pcidev*, int, int);
-void	pcicfgw16(Pcidev*, int, int);
-void	pcicfgw32(Pcidev*, int, int);
-void	pciclrbme(Pcidev*);
-void	pciclrioe(Pcidev*);
-void	pciclrmwi(Pcidev*);
-int	pcigetpms(Pcidev*);
-void	pcihinv(Pcidev*);
-uchar	pciipin(Pcidev*, uchar);
-Pcidev* pcimatch(Pcidev*, int, int);
-Pcidev* pcimatchtbdf(int);
-int	pcicap(Pcidev*, int);
-int	pcihtcap(Pcidev*, int);
-void	pcireset(void);
-int	pciscan(int, Pcidev**);
-void	pcisetbme(Pcidev*);
-void	pcisetioe(Pcidev*);
-void	pcisetmwi(Pcidev*);
-int	pcisetpms(Pcidev*, int);
-void	pcienable(Pcidev*);
-void	pcidisable(Pcidev*);
+void	pcicfginit(void);
+int	(*pcicfgrw8)(int, int, int, int);
+int	(*pcicfgrw16)(int, int, int, int);
+int	(*pcicfgrw32)(int, int, int, int);
 void	pcmcisread(PCMslot*);
 int	pcmcistuple(int, int, int, void*, int);
 PCMmap*	pcmmap(int, ulong, int, int);
@@ -192,6 +170,7 @@ uvlong	tscticks(uvlong*);
 ulong	umballoc(ulong, ulong, ulong);
 void	umbfree(ulong, ulong);
 uvlong	upaalloc(uvlong, ulong, ulong);
+uvlong	upaallocwin(uvlong, ulong, ulong, ulong);
 void	upafree(uvlong, ulong);
 void	vectortable(void);
 void	vmxprocrestore(Proc *);
diff --git a/sys/src/9/pc64/main.c b/sys/src/9/pc64/main.c
index 83f770587..50649d724 100644
--- a/sys/src/9/pc64/main.c
+++ b/sys/src/9/pc64/main.c
@@ -190,6 +190,7 @@ main(void)
 	ramdiskinit();
 	confinit();
 	xinit();
+	pcicfginit();
 	bootscreeninit();
 	if(i8237alloc != nil)
 		i8237alloc();
@@ -207,7 +208,6 @@ main(void)
 	initseg();
 	if(delaylink){
 		bootlinks();
-		pcimatch(0, 0, 0);
 	}else
 		links();
 	chandevreset();
diff --git a/sys/src/9/pc64/pc64 b/sys/src/9/pc64/pc64
index 6e03dc00e..c5ef1fbbe 100644
--- a/sys/src/9/pc64/pc64
+++ b/sys/src/9/pc64/pc64
@@ -26,7 +26,7 @@ dev
 	draw		screen vga vgax vgasoft
 	mouse		mouse
 	kbd
-	vga
+	vga		pci
 
 	sd
 #	floppy		dma
@@ -44,9 +44,9 @@ dev
 	dtracy
 
 link
-#	devpccard
+#	devpccard	pci
 #	devi82365
-	cputemp
+	cputemp		pci
 #	ether2000	ether8390
 #	ether2114x	pci
 #	ether589	etherelnk3
@@ -82,16 +82,17 @@ link
 #	pcmciamodem
 	netdevmedium
 	loopbackmedium
-	usbuhci
-	usbohci
-	usbehci		usbehcipc
+	usbuhci		pci
+	usbohci		pci
+	usbehci		pci usbehcipc
 	usbxhci		pci
 
 #	audiosb16	dma
-#	audioac97	audioac97mix
-	audiohda
+#	audioac97	pci audioac97mix
+	audiohda	pci
 
 misc
+	pci		pcipc
 	archacpi	mp apic squidboy ec
 	archmp		mp apic squidboy
 	mtrr