|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [PATCH 2/4] stubdom: remove pciutils
Hello,
Juergen Gross, le lun. 17 août 2026 09:18:41 +0200, a ecrit:
> There is no user of libpci left in stubdoms.
>
> Remove libpci from the stubdom build system.
Wouldn't it be useful to keep this for anybody who would want to drive a
PCI card from a stubdomain?
I mean, in the zlib case, it's really a mere question of build & link,
so we don't need to ship it, people can do it themselves easily like for
any other library.
But here there is actual porting work, that we'd better not lose but
keep shipping.
Samuel
> ---- pciutils-2.2.9.orig/lib/minios.c 1970-01-01 01:00:00.000000000 +0100
> -+++ pciutils-2.2.9/lib/minios.c 2008-07-01 12:31:40.554260000 +0100
> -@@ -0,0 +1,106 @@
> -+/*
> -+ * The PCI Library -- MiniOS PCI frontend access
> -+ *
> -+ * Samuel Thibault <samuel.thibault@xxxxxxxxxxxxx>, 2008
> -+ *
> -+ * Can be freely distributed and used under the terms of the GNU GPL.
> -+ */
> -+
> -+#include <os.h>
> -+#include <pcifront.h>
> -+#include <xenbus.h>
> -+#include "internal.h"
> -+
> -+static int
> -+minios_detect(struct pci_access *a)
> -+{
> -+ return 1;
> -+}
> -+
> -+static void
> -+minios_init(struct pci_access *a)
> -+{
> -+}
> -+
> -+static void
> -+minios_cleanup(struct pci_access *a)
> -+{
> -+ shutdown_pcifront(NULL);
> -+}
> -+
> -+static void
> -+minios_scan(struct pci_access *a)
> -+{
> -+ void func(unsigned int domain, unsigned int bus, unsigned int slot,
> unsigned int fun)
> -+ {
> -+ struct pci_dev *d = pci_alloc_dev(a);
> -+
> -+ d->domain = domain;
> -+ d->bus = bus;
> -+ d->dev = slot;
> -+ d->func = fun;
> -+
> -+ pci_link_dev(a, d);
> -+ }
> -+
> -+ pcifront_scan(NULL, func);
> -+}
> -+
> -+static int
> -+minios_read(struct pci_dev *d, int pos, byte *buf, int len)
> -+{
> -+ unsigned int val;
> -+ switch (len) {
> -+ case 1:
> -+ if (pcifront_conf_read(NULL, d->domain, d->bus, d->dev, d->func, pos,
> len, &val))
> -+ return 0;
> -+ * buf = val;
> -+ return 1;
> -+ case 2:
> -+ if (pcifront_conf_read(NULL, d->domain, d->bus, d->dev, d->func, pos,
> len, &val))
> -+ return 0;
> -+ *(u16 *) buf = cpu_to_le16((u16) val);
> -+ return 1;
> -+ case 4:
> -+ if (pcifront_conf_read(NULL, d->domain, d->bus, d->dev, d->func, pos,
> len, &val))
> -+ return 0;
> -+ *(u32 *) buf = cpu_to_le32((u32) val);
> -+ return 1;
> -+ default:
> -+ return pci_generic_block_read(d, pos, buf, len);
> -+ }
> -+}
> -+
> -+static int
> -+minios_write(struct pci_dev *d, int pos, byte *buf, int len)
> -+{
> -+ unsigned int val;
> -+ switch (len) {
> -+ case 1:
> -+ val = * buf;
> -+ break;
> -+ case 2:
> -+ val = le16_to_cpu(*(u16 *) buf);
> -+ break;
> -+ case 4:
> -+ val = le32_to_cpu(*(u32 *) buf);
> -+ break;
> -+ default:
> -+ return pci_generic_block_write(d, pos, buf, len);
> -+ }
> -+ return !pcifront_conf_write(NULL, d->domain, d->bus, d->dev, d->func,
> pos, len, val);
> -+}
> -+
> -+struct pci_methods pm_minios = {
> -+ "MiniOS-device",
> -+ NULL, /* config */
> -+ minios_detect,
> -+ minios_init,
> -+ minios_cleanup,
> -+ minios_scan,
> -+ pci_generic_fill_info,
> -+ minios_read,
> -+ minios_write,
> -+ NULL, /* dev_init */
> -+ NULL /* dev_cleanup */
> -+};
> ---- pciutils-2.2.9/lib/generic.c 2007-02-06 12:00:05.000000000 +0000
> -+++ pciutils-2.2.9-mine/lib/generic.c 2008-07-01 19:13:52.289949000
> +0100
> -@@ -74,6 +74,19 @@
> - pci_generic_scan_bus(a, busmap, 0);
> - }
> -
> -+static u32 pci_size(u32 base, u32 maxbase, u32 mask)
> -+{
> -+ u32 size = mask & maxbase;
> -+ if (!size)
> -+ return 0;
> -+ size = (size & ~(size-1)) - 1;
> -+
> -+ if (base == maxbase && ((base | size) & mask) != mask)
> -+ return 0;
> -+
> -+ return size + 1;
> -+}
> -+
> - int
> - pci_generic_fill_info(struct pci_dev *d, int flags)
> - {
> -@@ -114,23 +127,61 @@
> - if (!x || x == (u32) ~0)
> - continue;
> - if ((x & PCI_BASE_ADDRESS_SPACE) == PCI_BASE_ADDRESS_SPACE_IO)
> -- d->base_addr[i] = x;
> -- else
> -+ {
> -+ d->base_addr[i] = x & PCI_BASE_ADDRESS_IO_MASK;
> -+ if (flags & PCI_FILL_SIZES)
> -+ {
> -+ u32 size;
> -+ pci_write_long(d, PCI_BASE_ADDRESS_0 + i*4, ~0);
> -+ d->size[i] = pci_size(x, pci_read_long(d,
> PCI_BASE_ADDRESS_0 + i*4), PCI_BASE_ADDRESS_IO_MASK);
> -+ pci_write_long(d, PCI_BASE_ADDRESS_0 + i*4, x);
> -+ }
> -+ }
> -+ else
> - {
> - if ((x & PCI_BASE_ADDRESS_MEM_TYPE_MASK) !=
> PCI_BASE_ADDRESS_MEM_TYPE_64)
> -- d->base_addr[i] = x;
> -+ {
> -+ d->base_addr[i] = x & PCI_BASE_ADDRESS_MEM_MASK;
> -+ if (flags & PCI_FILL_SIZES)
> -+ {
> -+ u32 size;
> -+ pci_write_long(d, PCI_BASE_ADDRESS_0 + i*4, ~0);
> -+ d->size[i] = pci_read_long(d, PCI_BASE_ADDRESS_0
> + i*4);
> -+ d->size[i] = pci_size(x, pci_read_long(d,
> PCI_BASE_ADDRESS_0 + i*4), PCI_BASE_ADDRESS_MEM_MASK);
> -+ pci_write_long(d, PCI_BASE_ADDRESS_0 + i*4, x);
> -+ }
> -+ }
> - else if (i >= cnt-1)
> - a->warning("%04x:%02x:%02x.%d: Invalid 64-bit address seen
> for BAR %d.", d->domain, d->bus, d->dev, d->func, i);
> - else
> - {
> - u32 y = pci_read_long(d, PCI_BASE_ADDRESS_0 + (++i)*4);
> - #ifdef PCI_HAVE_64BIT_ADDRESS
> -- d->base_addr[i-1] = x | (((pciaddr_t) y) << 32);
> -+ d->base_addr[i-1] = (x | (((pciaddr_t) y) << 32)) &
> PCI_BASE_ADDRESS_MEM_MASK;
> -+ if (flags & PCI_FILL_SIZES)
> -+ {
> -+ u32 size;
> -+ pci_write_long(d, PCI_BASE_ADDRESS_0 + (i-1)*4,
> ~0);
> -+ pci_write_long(d, PCI_BASE_ADDRESS_0 + i*4, ~0);
> -+ d->size[i-1] = pci_size(y, pci_read_long(d,
> PCI_BASE_ADDRESS_0 + (i-1)*4) |
> -+ pci_read_long(d,
> PCI_BASE_ADDRESS_0 + i*4), 0xffffffff );
> -+ pci_write_long(d, PCI_BASE_ADDRESS_0 + (i-1)*4,
> x);
> -+ pci_write_long(d, PCI_BASE_ADDRESS_0 + i*4, y);
> -+ }
> - #else
> - if (y)
> - a->warning("%04x:%02x:%02x.%d 64-bit device address
> ignored.", d->domain, d->bus, d->dev, d->func);
> - else
> -- d->base_addr[i-1] = x;
> -+ {
> -+ d->base_addr[i-1] = x & PCI_BASE_ADDRESS_MEM_MASK;
> -+ if (flags & PCI_FILL_SIZES)
> -+ {
> -+ u32 size;
> -+ pci_write_long(d, PCI_BASE_ADDRESS_0 +
> (i-1)*4, ~0);
> -+ d->size[i-1] = pci_size(x, pci_read_long(d,
> PCI_BASE_ADDRESS_0 + (i-1)*4), PCI_BASE_ADDRESS_MEM_MASK);
> -+ pci_write_long(d, PCI_BASE_ADDRESS_0 +
> (i-1)*4, x);
> -+ }
> -+ }
> - #endif
> - }
> - }
> -@@ -154,10 +205,19 @@
> - {
> - u32 u = pci_read_long(d, reg);
> - if (u != 0xffffffff)
> -- d->rom_base_addr = u;
> -+ {
> -+ d->rom_base_addr = u;
> -+ if (flags & PCI_FILL_SIZES)
> -+ {
> -+ u32 size;
> -+ pci_write_long(d, reg, ~0);
> -+ d->rom_size = pci_read_long(d, reg);
> -+ pci_write_long(d, reg, u);
> -+ }
> -+ }
> - }
> - }
> -- return flags & ~PCI_FILL_SIZES;
> -+ return flags;
> - }
> -
> - static int
> -diff -uNpbE -uNpbEr pciutils-2.2.9.orig/lib/sysdep.h
> pciutils-2.2.9/lib/sysdep.h
> ---- pciutils-2.2.9.orig/lib/sysdep.h 2007-02-06 12:00:18.000000000 +0000
> -+++ pciutils-2.2.9/lib/sysdep.h 2009-07-22 16:26:30.000000000 +0100
> -@@ -32,6 +32,10 @@ typedef u16 word;
> -
> - #else
> -
> -+#ifdef PCI_OS_MINIOS
> -+#include <machine/endian.h>
> -+#endif
> -+
> - #ifdef PCI_OS_LINUX
> - #include <endian.h>
> - #define BYTE_ORDER __BYTE_ORDER
> --
> 2.55.0
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |