pci: Add bare metal HW.PCI.Dev implementation
Add a HW.PCI.Dev implementation that assumes direct hardware access,
i.e. its Map() implementations just returns the physical address of
a resource.
Change-Id: I055a05a17e207e8b43aa02d1b39023b027f94f6c
Signed-off-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/20551
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
diff --git a/common/Makefile.inc b/common/Makefile.inc
index d6ec728..a8e7712 100644
--- a/common/Makefile.inc
+++ b/common/Makefile.inc
@@ -14,6 +14,9 @@
hw-$(CONFIG_HWBASE_POSIX_FILE) += hw-file.ads
+hw-$(CONFIG_HWBASE_DIRECT_PCIDEV) += direct/hw-pci-dev.adb
+hw-$(CONFIG_HWBASE_DIRECT_PCIDEV) += hw-pci-dev.ads
+
hw-config-ads := $(subst //,/,$(call src-to-obj,,$(dir)/hw-config).ads)
$(hw-config-ads): $(dir)/hw-config.ads.template $(cnf)
printf " GENERATE $(patsubst /%,%,$(subst $(obj)/,,$@))\n"
diff --git a/common/direct/hw-pci-dev.adb b/common/direct/hw-pci-dev.adb
new file mode 100644
index 0000000..9bd7d1d
--- /dev/null
+++ b/common/direct/hw-pci-dev.adb
@@ -0,0 +1,115 @@
+--
+-- Copyright (C) 2017 Nico Huber <nico.h@gmx.de>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+
+with HW.Config;
+with HW.PCI.MMConf;
+
+with HW.MMIO_Range;
+pragma Elaborate_All (HW.MMIO_Range);
+
+package body HW.PCI.Dev
+with
+ Refined_State =>
+ (Address_State => MM.Address_State,
+ PCI_State => MM.PCI_State)
+is
+
+ package MM is new HW.PCI.MMConf (Dev);
+
+ procedure Read8 (Value : out Word8; Offset : Index) renames MM.Read8;
+ procedure Read16 (Value : out Word16; Offset : Index) renames MM.Read16;
+ procedure Read32 (Value : out Word32; Offset : Index) renames MM.Read32;
+
+ procedure Write8 (Offset : Index; Value : Word8) renames MM.Write8;
+ procedure Write16 (Offset : Index; Value : Word16) renames MM.Write16;
+ procedure Write32 (Offset : Index; Value : Word32) renames MM.Write32;
+
+ procedure Map
+ (Addr : out Word64;
+ Res : in Resource;
+ Length : in Natural := 0;
+ Offset : in Natural := 0;
+ WC : in Boolean := False)
+ is
+ use type HW.Word8;
+ use type HW.Word32;
+
+ Header_Type : Word8;
+ Reg32 : Word32;
+ begin
+ Addr := 0;
+ Read8 (Header_Type, PCI.Header_Type);
+ if (Header_Type and Header_Type_Mask) = Header_Type_Normal then
+ Read32 (Reg32, Base_Address (Res));
+ if (Reg32 and Base_Address_Space_Mask) = Base_Address_Space_Mem then
+ case Reg32 and Base_Address_Mem_Type_Mask is
+ when Base_Address_Mem_Type_64 =>
+ if Res < Res5 then
+ Addr := Word64 (Reg32 and Base_Address_Mem_Mask);
+ Read32 (Reg32, Base_Address (Resource'Succ (Res)));
+ Addr := Addr or Shift_Left (Word64 (Reg32), 32);
+ end if;
+ when others =>
+ Addr := Word64 (Reg32 and Base_Address_Mem_Mask);
+ end case;
+ end if;
+ end if;
+ if Addr /= 0 then
+ if Length = 0 or else
+ Addr <= Word64'Last - Word64 (Length) - Word64 (Offset) + 1
+ then
+ Addr := Addr + Word64 (Offset);
+ else
+ Addr := 0;
+ end if;
+ end if;
+ end Map;
+
+ procedure Resource_Size (Length : out Natural; Res : Resource)
+ is
+ use Type HW.Word16;
+ use Type HW.Word32;
+
+ Cmd : Word16;
+ Base, Backup : Word32;
+ begin
+ Length := 0;
+
+ Read16 (Cmd, PCI.Command);
+ Write16 (PCI.Command, Cmd and not PCI.Command_Memory);
+
+ Read32 (Backup, Base_Address (Res));
+ if (Backup and Base_Address_Space_Mask) = Base_Address_Space_Mem then
+ Write32 (Base_Address (Res), 16#ffff_ffff#);
+ Read32 (Base, Base_Address (Res));
+ Base := not (Base and Base_Address_Mem_Mask) + 1;
+ if Base <= Word32 (Natural'Last) then
+ Length := Natural (Base);
+ end if;
+ Write32 (Base_Address (Res), Backup);
+ end if;
+
+ Write16 (PCI.Command, Cmd);
+ end Resource_Size;
+
+ procedure Initialize (Success : out Boolean; MMConf_Base : Word64 := 0)
+ is
+ begin
+ if MMConf_Base /= 0 then
+ MM.Set_Base_Address (MMConf_Base);
+ end if;
+ Success := MMConf_Base /= 0 or Config.Default_MMConf_Base_Set;
+ end Initialize;
+
+end HW.PCI.Dev;
diff --git a/common/hw-config.ads.template b/common/hw-config.ads.template
index a55b230..a45c849 100644
--- a/common/hw-config.ads.template
+++ b/common/hw-config.ads.template
@@ -19,4 +19,8 @@
Default_MMConf_Base : constant := <<DEFAULT_MMCONF_BASE>>;
+ ----------------------------------------------------------------------------
+
+ Default_MMConf_Base_Set : constant Boolean := Default_MMConf_Base /= 0;
+
end HW.Config;
diff --git a/common/hw-pci-dev.ads b/common/hw-pci-dev.ads
index b08f9ab..90ed9e5 100644
--- a/common/hw-pci-dev.ads
+++ b/common/hw-pci-dev.ads
@@ -36,12 +36,15 @@
with
Pre => Offset mod 4 = 0;
+ pragma Warnings (GNATprove, Off, "unused variable ""WC""*",
+ Reason => "Used for a common interface");
procedure Map
(Addr : out Word64;
Res : in Resource;
Length : in Natural := 0;
Offset : in Natural := 0;
WC : in Boolean := False);
+ pragma Warnings (GNATprove, On, "unused variable ""WC""*");
procedure Resource_Size (Length : out Natural; Res : Resource);
diff --git a/configs/defconfig b/configs/defconfig
index c47e560..57a7017 100644
--- a/configs/defconfig
+++ b/configs/defconfig
@@ -6,3 +6,4 @@
CONFIG_HWBASE_TIMER_MUTIME =
CONFIG_HWBASE_POSIX_FILE =
CONFIG_HWBASE_DEFAULT_MMCONF = 16\#f000_0000\#
+CONFIG_HWBASE_DIRECT_PCIDEV = y
diff --git a/configs/posix b/configs/posix
index f75f6e7..be1163e 100644
--- a/configs/posix
+++ b/configs/posix
@@ -6,3 +6,4 @@
CONFIG_HWBASE_TIMER_MUTIME =
CONFIG_HWBASE_POSIX_FILE = y
CONFIG_HWBASE_DEFAULT_MMCONF = 0
+CONFIG_HWBASE_DIRECT_PCIDEV =
diff --git a/proof/Makefile.inc b/proof/Makefile.inc
index dae0b0d..9e8ec9b 100644
--- a/proof/Makefile.inc
+++ b/proof/Makefile.inc
@@ -1 +1,2 @@
hw-proof-y += hw-mmio_range.adb
+hw-proof-$(CONFIG_HWBASE_DIRECT_PCIDEV) += hw-pci-devinst.ads
diff --git a/proof/hw-pci-devinst.ads b/proof/hw-pci-devinst.ads
new file mode 100644
index 0000000..0b84fb9
--- /dev/null
+++ b/proof/hw-pci-devinst.ads
@@ -0,0 +1,17 @@
+--
+-- Copyright (C) 2017 Nico Huber <nico.h@gmx.de>
+--
+-- This program is free software; you can redistribute it and/or modify
+-- it under the terms of the GNU General Public License as published by
+-- the Free Software Foundation; either version 2 of the License, or
+-- (at your option) any later version.
+--
+-- This program is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+-- GNU General Public License for more details.
+--
+
+with HW.PCI.Dev;
+
+package HW.PCI.Devinst is new HW.PCI.Dev;