hrev54418 adds 2 changesets to branch 'master'
old head: 733e150b7457eab9713bed18f45410cb07be1ab1
new head: b0a3a5c9bcae85979cf27827b40ed46a74cad6b2
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=b0a3a5c9bcae+%5E733e150b7457
----------------------------------------------------------------------------
8827bb6d8900: freebsd_network: Apply empty size and type check to IO ports.
Factor out the conversion to BAR index and hand the pci_info to both
memory and IO port allocation functions. Then apply the same checks
in the IO port case as are done for memory.
This aligns with what is done on FreeBSD.
Change-Id: Ib4bd28fd861959a467ba676de22efb1f97e5a27c
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3025
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
b0a3a5c9bcae: freebsd_network: Handle 64 bit memory BARs.
This adds the upper 32 bits for address and size.
Change-Id: I2f776c7b8b72ecefca9f3b93d9c42912666a41e2
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3026
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
[ Michael Lotz <mmlr@xxxxxxxx> ]
----------------------------------------------------------------------------
1 file changed, 52 insertions(+), 22 deletions(-)
src/libs/compat/freebsd_network/bus.cpp | 74 ++++++++++++++++++++---------
############################################################################
Commit: 8827bb6d8900b92090ba79b2db13b88f7500c276
URL: https://git.haiku-os.org/haiku/commit/?id=8827bb6d8900
Author: Michael Lotz <mmlr@xxxxxxxx>
Date: Sat Jul 11 21:05:22 2020 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Sat Jul 11 23:31:06 2020 UTC
freebsd_network: Apply empty size and type check to IO ports.
Factor out the conversion to BAR index and hand the pci_info to both
memory and IO port allocation functions. Then apply the same checks
in the IO port case as are done for memory.
This aligns with what is done on FreeBSD.
Change-Id: Ib4bd28fd861959a467ba676de22efb1f97e5a27c
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3025
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/libs/compat/freebsd_network/bus.cpp
b/src/libs/compat/freebsd_network/bus.cpp
index fd696b4b9c..506f8937ac 100644
--- a/src/libs/compat/freebsd_network/bus.cpp
+++ b/src/libs/compat/freebsd_network/bus.cpp
@@ -110,29 +110,19 @@ bus_alloc_irq_resource(device_t dev, struct resource *res)
static int
-bus_alloc_mem_resource(device_t dev, struct resource *res, int regid)
+bus_alloc_mem_resource(device_t dev, struct resource *res, pci_info *info,
+ int bar_index)
{
- pci_info *info = &((struct root_device_softc
*)dev->root->softc)->pci_info;
-
- // check the offset really is of a BAR
- if (regid < PCI_base_registers || (regid % sizeof(uint32) != 0)
- || (regid >= PCI_base_registers + 6 * (int)sizeof(uint32)))
- return -1;
-
- // turn offset into array index
- regid -= PCI_base_registers;
- regid /= sizeof(uint32);
-
- uint32 addr = info->u.h0.base_registers[regid];
- uint32 size = info->u.h0.base_register_sizes[regid];
- uchar flags = info->u.h0.base_register_flags[regid];
+ uint32 addr = info->u.h0.base_registers[bar_index];
+ uint32 size = info->u.h0.base_register_sizes[bar_index];
+ uchar flags = info->u.h0.base_register_flags[bar_index];
// reject empty regions
if (size == 0)
return -1;
// reject I/O space
- if (flags & PCI_address_space)
+ if ((flags & PCI_address_space) != 0)
return -1;
// TODO: check flags & PCI_address_prefetchable ?
@@ -155,18 +145,46 @@ bus_alloc_mem_resource(device_t dev, struct resource
*res, int regid)
static int
-bus_alloc_ioport_resource(device_t dev, struct resource *res, int regid)
+bus_alloc_ioport_resource(device_t dev, struct resource *res, pci_info *info,
+ int bar_index)
{
+ uint32 size = info->u.h0.base_register_sizes[bar_index];
+ uchar flags = info->u.h0.base_register_flags[bar_index];
+
+ // reject empty regions
+ if (size == 0)
+ return -1;
+
+ // reject memory space
+ if ((flags & PCI_address_space) == 0)
+ return -1;
+
// enable this I/O resource
if (pci_enable_io(dev, SYS_RES_IOPORT) != 0)
return -1;
res->r_bustag = X86_BUS_SPACE_IO;
- res->r_bushandle = pci_read_config(dev, regid, 4) & PCI_address_io_mask;
+ res->r_bushandle = info->u.h0.base_registers[bar_index];
return 0;
}
+static int
+bus_register_to_bar_index(pci_info *info, int regid)
+{
+ // check the offset really is of a BAR
+ if (regid < PCI_base_registers || (regid % sizeof(uint32) != 0)
+ || (regid >= PCI_base_registers + 6 * (int)sizeof(uint32))) {
+ return -1;
+ }
+
+ // turn offset into array index
+ regid -= PCI_base_registers;
+ regid /= sizeof(uint32);
+ return regid;
+}
+
+
struct resource *
bus_alloc_resource(device_t dev, int type, int *rid, unsigned long start,
unsigned long end, unsigned long count, uint32 flags)
@@ -198,10 +216,17 @@ bus_alloc_resource(device_t dev, int type, int *rid,
unsigned long start,
res->r_bushandle = info->u.h0.interrupt_line + *rid - 1;
result = 0;
}
- } else if (type == SYS_RES_MEMORY)
- result = bus_alloc_mem_resource(dev, res, *rid);
- else if (type == SYS_RES_IOPORT)
- result = bus_alloc_ioport_resource(dev, res, *rid);
+ } else if (type == SYS_RES_MEMORY || type == SYS_RES_IOPORT) {
+ pci_info *info
+ = &((struct root_device_softc
*)dev->root->softc)->pci_info;
+ int bar_index = bus_register_to_bar_index(info, *rid);
+ if (bar_index >= 0) {
+ if (type == SYS_RES_MEMORY)
+ result = bus_alloc_mem_resource(dev, res, info,
bar_index);
+ else
+ result = bus_alloc_ioport_resource(dev, res,
info, bar_index);
+ }
+ }
if (result < 0) {
free(res);
############################################################################
Revision: hrev54418
Commit: b0a3a5c9bcae85979cf27827b40ed46a74cad6b2
URL: https://git.haiku-os.org/haiku/commit/?id=b0a3a5c9bcae
Author: Michael Lotz <mmlr@xxxxxxxx>
Date: Sat Jul 11 21:49:55 2020 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Sat Jul 11 23:31:06 2020 UTC
freebsd_network: Handle 64 bit memory BARs.
This adds the upper 32 bits for address and size.
Change-Id: I2f776c7b8b72ecefca9f3b93d9c42912666a41e2
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3026
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
----------------------------------------------------------------------------
diff --git a/src/libs/compat/freebsd_network/bus.cpp
b/src/libs/compat/freebsd_network/bus.cpp
index 506f8937ac..eedd8e6686 100644
--- a/src/libs/compat/freebsd_network/bus.cpp
+++ b/src/libs/compat/freebsd_network/bus.cpp
@@ -113,8 +113,8 @@ static int
bus_alloc_mem_resource(device_t dev, struct resource *res, pci_info *info,
int bar_index)
{
- uint32 addr = info->u.h0.base_registers[bar_index];
- uint32 size = info->u.h0.base_register_sizes[bar_index];
+ phys_addr_t addr = info->u.h0.base_registers[bar_index];
+ uint64 size = info->u.h0.base_register_sizes[bar_index];
uchar flags = info->u.h0.base_register_flags[bar_index];
// reject empty regions
@@ -127,6 +127,11 @@ bus_alloc_mem_resource(device_t dev, struct resource *res,
pci_info *info,
// TODO: check flags & PCI_address_prefetchable ?
+ if ((flags & PCI_address_type) == PCI_address_type_64) {
+ addr |= (uint64)info->u.h0.base_registers[bar_index + 1] << 32;
+ size |= (uint64)info->u.h0.base_register_sizes[bar_index + 1]
<< 32;
+ }
+
// enable this I/O resource
if (pci_enable_io(dev, SYS_RES_MEMORY) != 0)
return -1;
