-efibootmgr (0.4.9-0.sarge.2) testing; urgency=high
-
- * Base dependencies are frozen; this release reverts the portion of the
- test4 changes that added a dependency on pciutils. Thanks to Dann Frazier
- for figuring this out and providing a suitable patch. Closes: #268490
-
- -- Bdale Garbee <bdale@gag.com> Fri, 27 Aug 2004 23:12:38 -0600
-
-efibootmgr (0.4.9-0.sarge.1) testing; urgency=high
-
- * build 0.4.9-1 in testing chroot for sarge
- * new upstream version. This is actually 0.5.0-test4, renumbered to avoid
- nastiness when 0.5.0 is released. Upstream says 0.5.0 will be this code
- with a documentation change. Closes: #258838, #235227
- * add pciutils-dev to build dependencies since we need libpci now
- * hack in a typedef to get a u64 definition for ethtool.h
- * urgency high because previous version fails with current 2.6 kernels
-
- -- Bdale Garbee <bdale@gag.com> Wed, 18 Aug 2004 09:47:21 -0600
-
efibootmgr (0.4.9-1) unstable; urgency=high
* new upstream version. This is actually 0.5.0-test4, renumbered to avoid
#include <sys/ioctl.h>
#include <linux/sockios.h>
#include <net/if.h>
-
-typedef unsigned long long u64; /* hack, so we may include kernel's ethtool.h */
-typedef __uint32_t u32; /* ditto */
-typedef __uint16_t u16; /* ditto */
-typedef __uint8_t u8; /* ditto */
-
+#include <pci/pci.h>
+typedef __u64 u64;
#include <linux/ethtool.h>
#include "efi.h"
#include "efichar.h"
#include "efibootmgr.h"
#include "efivars_procfs.h"
#include "efivars_sysfs.h"
+#include "list.h"
static struct efivar_kernel_calls *fs_kernel_calls;
return p.length;
}
+struct device
+{
+ struct pci_dev *pci_dev;
+ struct list_head node;
+};
+
+static struct device *
+is_parent_bridge(struct pci_dev *p, unsigned int target_bus)
+{
+ struct device *d;
+ unsigned int primary, secondary;
+
+ if ( (pci_read_word(p, PCI_HEADER_TYPE) & 0x7f) != PCI_HEADER_TYPE_BRIDGE)
+ return NULL;
+
+ primary=pci_read_byte(p, PCI_PRIMARY_BUS);
+ secondary=pci_read_byte(p, PCI_SECONDARY_BUS);
+
+
+ if (secondary != target_bus)
+ return NULL;
+
+ d = malloc(sizeof(struct device));
+ if (!d)
+ return NULL;
+ memset(d, 0, sizeof(*d));
+ INIT_LIST_HEAD(&d->node);
+
+ d->pci_dev = p;
+
+ return d;
+}
+
+static struct device *
+find_parent(struct pci_access *pacc, unsigned int target_bus)
+{
+ struct device *dev;
+ struct pci_dev *p;
+
+ for (p=pacc->devices; p; p=p->next) {
+ dev = is_parent_bridge(p, target_bus);
+ if (dev)
+ return dev;
+ }
+ return NULL;
+}
+
static uint16_t
-make_pci_device_path(void *dest, uint8_t device, uint8_t function)
+make_one_pci_device_path(void *dest, uint8_t device, uint8_t function)
{
PCI_DEVICE_PATH p;
memset(&p, 0, sizeof(p));
return p.length;
}
+static uint16_t
+make_pci_device_path(void *dest, uint8_t bus, uint8_t device, uint8_t function)
+{
+ struct device *dev;
+ struct pci_access *pacc;
+ struct list_head *pos, *n;
+ LIST_HEAD(pci_parent_list);
+ char *p = dest;
+
+ pacc = pci_alloc();
+ if (!pacc)
+ return 0;
+
+ pci_init(pacc);
+ pci_scan_bus(pacc);
+
+ do {
+ dev = find_parent(pacc, bus);
+ if (dev) {
+ list_add(&pci_parent_list, &dev->node);
+ bus = dev->pci_dev->bus;
+ }
+ } while (dev && bus);
+
+
+ list_for_each_safe(pos, n, &pci_parent_list) {
+ dev = list_entry(pos, struct device, node);
+ p += make_one_pci_device_path(p,
+ dev->pci_dev->dev,
+ dev->pci_dev->func);
+ list_del(&dev->node);
+ free(dev);
+ }
+
+ p += make_one_pci_device_path(p, device, function);
+
+ pci_cleanup(pacc);
+
+ return ((void *)p - dest);
+}
+
static uint16_t
make_scsi_device_path(void *dest, uint16_t id, uint16_t lun)
{
idlun_to_components(&idlun, &host, &channel, &id, &lun);
p += make_acpi_device_path (p, EISAID_PNP0A03, bus);
- p += make_pci_device_path (p, device, function);
+ p += make_pci_device_path (p, bus, device, function);
p += make_scsi_device_path (p, id, lun);
return ((void *)p - buffer);
}
char *make_net_load_option(char *p, char *iface)
{
/* copied pretty much verbatim from the ethtool source */
- int fd = 0, err;
+ int fd = 0, err;
int bus, slot, func;
struct ifreq ifr;
struct ethtool_drvinfo drvinfo;
perror("Cannot get driver information");
}
+
err = sscanf(drvinfo.bus_info, "%2x:%2x.%x", &bus, &slot, &func);
if (err == 0) {
perror("Couldn't parse device location string.");
}
p += make_acpi_device_path(p, opts.acpi_hid, opts.acpi_uid);
- p += make_pci_device_path(p, (uint8_t)slot, (uint8_t)func);
+ p += make_pci_device_path(p, bus, (uint8_t)slot, (uint8_t)func);
err = ioctl(fd, SIOCGIFHWADDR, &ifr);
if (err < 0) {
p += make_mac_addr_device_path(p, ifr.ifr_ifru.ifru_hwaddr.sa_data, 0);
p += make_end_device_path (p);
-
return(p);
}
projects / debian / efibootmgr / commitdiff