diff options
| -rw-r--r-- | src/plugins/avf/device.c | 15 | ||||
| -rw-r--r-- | src/plugins/perfmon/intel/bundle/iio_bw.c | 4 | ||||
| -rw-r--r-- | src/plugins/rdma/device.c | 13 | ||||
| -rw-r--r-- | src/vlib/linux/pci.c | 113 | ||||
| -rw-r--r-- | src/vlib/pci/pci.c | 214 | ||||
| -rw-r--r-- | src/vlib/pci/pci.h | 117 | ||||
| -rw-r--r-- | src/vlib/pci/pci_config.h | 541 |
7 files changed, 531 insertions, 486 deletions
diff --git a/src/plugins/avf/device.c b/src/plugins/avf/device.c index dbe344ca278..67f9227a7e5 100644 --- a/src/plugins/avf/device.c +++ b/src/plugins/avf/device.c @@ -1955,17 +1955,4 @@ avf_init (vlib_main_t * vm) return 0; } -/* *INDENT-OFF* */ -VLIB_INIT_FUNCTION (avf_init) = -{ - .runs_after = VLIB_INITS ("pci_bus_init"), -}; -/* *INDENT-OFF* */ - -/* - * fd.io coding-style-patch-verification: ON - * - * Local Variables: - * eval: (c-set-style "gnu") - * End: - */ +VLIB_INIT_FUNCTION (avf_init); diff --git a/src/plugins/perfmon/intel/bundle/iio_bw.c b/src/plugins/perfmon/intel/bundle/iio_bw.c index 66c550ff9c2..f746ca2c906 100644 --- a/src/plugins/perfmon/intel/bundle/iio_bw.c +++ b/src/plugins/perfmon/intel/bundle/iio_bw.c @@ -167,8 +167,8 @@ init_intel_uncore_iio_bw (vlib_main_t *vm, struct perfmon_bundle *b) s = format ( s, "%-10U%-5U%-13U%04x:%04x %-14U%-16s%v\n", format_stack_socket, p, - h, addr, format_vlib_pci_link_port, d, format_vlib_pci_addr, addr, - d->vendor_id, d->device_id, format_vlib_pci_link_speed, d, + h, addr, format_vlib_pci_link_port, &d->config, format_vlib_pci_addr, + addr, d->vendor_id, d->device_id, format_vlib_pci_link_speed, d, d->driver_name ? (char *) d->driver_name : "", d->product_name); vlib_pci_free_device_info (d); diff --git a/src/plugins/rdma/device.c b/src/plugins/rdma/device.c index 44ca516d225..b1a4d35a8ee 100644 --- a/src/plugins/rdma/device.c +++ b/src/plugins/rdma/device.c @@ -1152,15 +1152,4 @@ rdma_init (vlib_main_t * vm) return 0; } -VLIB_INIT_FUNCTION (rdma_init) = -{ - .runs_after = VLIB_INITS ("pci_bus_init"), -}; - -/* - * fd.io coding-style-patch-verification: ON - * - * Local Variables: - * eval: (c-set-style "gnu") - * End: - */ +VLIB_INIT_FUNCTION (rdma_init); diff --git a/src/vlib/linux/pci.c b/src/vlib/linux/pci.c index 75d9edf8849..e94fee1bcbd 100644 --- a/src/vlib/linux/pci.c +++ b/src/vlib/linux/pci.c @@ -61,12 +61,17 @@ static const char *sysfs_pci_drv_path = "/sys/bus/pci/drivers"; static char *sysfs_mod_vfio_noiommu = "/sys/module/vfio/parameters/enable_unsafe_noiommu_mode"; -#define pci_log_debug(vm, dev, f, ...) \ - vlib_log(VLIB_LOG_LEVEL_DEBUG, pci_main.log_default, "%U: " f, \ - format_vlib_pci_addr, vlib_pci_get_addr(vm, dev->handle), ## __VA_ARGS__) -#define pci_log_err(vm, dev, f, ...) \ - vlib_log(VLIB_LOG_LEVEL_ERR, pci_main.log_default, "%U: " f, \ - format_vlib_pci_addr, vlib_pci_get_addr(vm, dev->handle), ## __VA_ARGS__) +VLIB_REGISTER_LOG_CLASS (pci_log, static) = { + .class_name = "pci", + .subclass_name = "linux", +}; + +#define log_debug(p, f, ...) \ + vlib_log (VLIB_LOG_LEVEL_DEBUG, pci_log.class, "%U: " f, \ + format_vlib_pci_log, p->handle, ##__VA_ARGS__) +#define log_err(p, f, ...) \ + vlib_log (VLIB_LOG_LEVEL_ERR, pci_log.class, "%U: " f, format_vlib_pci_log, \ + p->handle, ##__VA_ARGS__) typedef struct { @@ -233,32 +238,13 @@ vlib_pci_get_device_info (vlib_main_t * vm, vlib_pci_addr_t * addr, /* You can only read more that 64 bytes of config space as root; so we try to read the full space but fall back to just the first 64 bytes. */ - if (read (fd, &di->config_data, sizeof (di->config_data)) < - sizeof (di->config0)) + if (read (fd, &di->config, sizeof (di->config)) < sizeof (di->config)) { err = clib_error_return_unix (0, "read `%s'", f); close (fd); goto error; } - { - static pci_config_header_t all_ones; - if (all_ones.vendor_id == 0) - clib_memset (&all_ones, ~0, sizeof (all_ones)); - - if (!memcmp (&di->config0.header, &all_ones, sizeof (all_ones))) - { - err = clib_error_return (0, "invalid PCI config for `%s'", f); - close (fd); - goto error; - } - } - - if (di->config0.header.header_type == 0) - pci_config_type0_little_to_host (&di->config0); - else - pci_config_type1_little_to_host (&di->config1); - di->numa_node = -1; vec_reset_length (f); f = format (f, "%v/numa_node%c", dev_dir_name, 0); @@ -301,6 +287,13 @@ vlib_pci_get_device_info (vlib_main_t * vm, vlib_pci_addr_t * addr, di->device_id = tmp; vec_reset_length (f); + f = format (f, "%v/revision%c", dev_dir_name, 0); + err = clib_sysfs_read ((char *) f, "0x%x", &tmp); + if (err) + goto error; + di->revision = tmp; + + vec_reset_length (f); f = format (f, "%v/driver%c", dev_dir_name, 0); di->driver_name = clib_sysfs_link_to_name ((char *) f); if (!di->driver_name) @@ -670,13 +663,12 @@ vfio_set_irqs (vlib_main_t * vm, linux_pci_device_t * p, u32 index, u32 start, return clib_error_return_unix (0, "ioctl(VFIO_DEVICE_GET_IRQ_INFO) " "'%U'", format_vlib_pci_addr, &p->addr); - pci_log_debug (vm, p, "%s index:%u count:%u flags: %s%s%s%s(0x%x)", - __func__, ii.index, ii.count, - ii.flags & VFIO_IRQ_INFO_EVENTFD ? "eventfd " : "", - ii.flags & VFIO_IRQ_INFO_MASKABLE ? "maskable " : "", - ii.flags & VFIO_IRQ_INFO_AUTOMASKED ? "automasked " : "", - ii.flags & VFIO_IRQ_INFO_NORESIZE ? "noresize " : "", - ii.flags); + log_debug (p, "%s index:%u count:%u flags: %s%s%s%s(0x%x)", __func__, + ii.index, ii.count, + ii.flags & VFIO_IRQ_INFO_EVENTFD ? "eventfd " : "", + ii.flags & VFIO_IRQ_INFO_MASKABLE ? "maskable " : "", + ii.flags & VFIO_IRQ_INFO_AUTOMASKED ? "automasked " : "", + ii.flags & VFIO_IRQ_INFO_NORESIZE ? "noresize " : "", ii.flags); if (ii.count < start + count) return clib_error_return_unix (0, "vfio_set_irq: unexistng interrupt on " @@ -864,13 +856,12 @@ vlib_pci_register_intx_handler (vlib_main_t * vm, vlib_pci_dev_handle_t h, if (ioctl (p->fd, VFIO_DEVICE_GET_IRQ_INFO, &ii) < 0) return clib_error_return_unix (0, "ioctl(VFIO_DEVICE_GET_IRQ_INFO) '" "%U'", format_vlib_pci_addr, &p->addr); - pci_log_debug (vm, p, "%s index:%u count:%u flags: %s%s%s%s(0x%x)", - __func__, ii.index, ii.count, - ii.flags & VFIO_IRQ_INFO_EVENTFD ? "eventfd " : "", - ii.flags & VFIO_IRQ_INFO_MASKABLE ? "maskable " : "", - ii.flags & VFIO_IRQ_INFO_AUTOMASKED ? "automasked " : "", - ii.flags & VFIO_IRQ_INFO_NORESIZE ? "noresize " : "", - ii.flags); + log_debug ( + p, "%s index:%u count:%u flags: %s%s%s%s(0x%x)", __func__, ii.index, + ii.count, ii.flags & VFIO_IRQ_INFO_EVENTFD ? "eventfd " : "", + ii.flags & VFIO_IRQ_INFO_MASKABLE ? "maskable " : "", + ii.flags & VFIO_IRQ_INFO_AUTOMASKED ? "automasked " : "", + ii.flags & VFIO_IRQ_INFO_NORESIZE ? "noresize " : "", ii.flags); if (ii.count != 1) return clib_error_return (0, "INTx interrupt does not exist on device" "'%U'", format_vlib_pci_addr, &p->addr); @@ -1042,7 +1033,7 @@ add_device_vfio (vlib_main_t * vm, linux_pci_device_t * p, goto error; } - pci_log_debug (vm, p, "%s %U", __func__, format_vfio_region_info, ®); + log_debug (p, "%s %U", __func__, format_vfio_region_info, ®); p->config_offset = reg.offset; p->config_fd = p->fd; @@ -1177,7 +1168,7 @@ vlib_pci_region (vlib_main_t * vm, vlib_pci_dev_handle_t h, u32 bar, int *fd, _fd = p->fd; _size = r->size; _offset = r->offset; - pci_log_debug (vm, p, "%s %U", __func__, format_vfio_region_info, r); + log_debug (p, "%s %U", __func__, format_vfio_region_info, r); clib_mem_free (r); } else @@ -1198,18 +1189,18 @@ vlib_pci_map_region_int (vlib_main_t * vm, vlib_pci_dev_handle_t h, int fd = -1; clib_error_t *error; u64 size = 0, offset = 0; - u16 command; + vlib_pci_config_reg_command_t command; - pci_log_debug (vm, p, "map region %u to va %p", bar, addr); + log_debug (p, "map region %u to va %p", bar, addr); - if ((error = vlib_pci_read_config_u16 (vm, h, 4, &command))) + if ((error = vlib_pci_read_config_u16 (vm, h, 4, &command.as_u16))) return error; - if (!(command & PCI_COMMAND_MEMORY)) + if (!(command.mem_space)) { - pci_log_debug (vm, p, "setting memory enable bit"); - command |= PCI_COMMAND_MEMORY; - if ((error = vlib_pci_write_config_u16 (vm, h, 4, &command))) + log_debug (p, "setting memory enable bit"); + command.mem_space = 1; + if ((error = vlib_pci_write_config_u16 (vm, h, 4, &command.as_u16))) return error; } @@ -1321,12 +1312,19 @@ vlib_pci_device_open (vlib_main_t * vm, vlib_pci_addr_t * addr, if (err) return err; - for (i = ids; i->vendor_id != 0; i++) - if (i->vendor_id == di->vendor_id && i->device_id == di->device_id) - break; - if (i->vendor_id == 0) - return clib_error_return (0, "Wrong vendor or device id"); + if (ids) + { + for (i = ids; i->vendor_id != 0; i++) + if (i->vendor_id == di->vendor_id && i->device_id == di->device_id) + break; + + if (i->vendor_id == 0) + { + vlib_pci_free_device_info (di); + return clib_error_return (0, "Wrong vendor or device id"); + } + } pool_get (lpm->linux_pci_devices, p); p->handle = p - lpm->linux_pci_devices; @@ -1339,9 +1337,8 @@ vlib_pci_device_open (vlib_main_t * vm, vlib_pci_addr_t * addr, */ p->io_fd = -1; - pci_log_debug (vm, p, "open vid:0x%04x did:0x%04x driver:%s iommu_group:%d", - di->vendor_id, di->device_id, di->driver_name, - di->iommu_group); + log_debug (p, "open vid:0x%04x did:0x%04x driver:%s iommu_group:%d", + di->vendor_id, di->device_id, di->driver_name, di->iommu_group); if (clib_strncmp ("vfio-pci", (char *) di->driver_name, 8) == 0) err = add_device_vfio (vm, p, di, 0); @@ -1359,7 +1356,7 @@ error: vlib_pci_free_device_info (di); if (err) { - pci_log_err (vm, p, "%U", format_clib_error, err); + log_err (p, "%U", format_clib_error, err); clib_memset (p, 0, sizeof (linux_pci_device_t)); pool_put (lpm->linux_pci_devices, p); } diff --git a/src/vlib/pci/pci.c b/src/vlib/pci/pci.c index 249a26b1d21..b6a9416cbc3 100644 --- a/src/vlib/pci/pci.c +++ b/src/vlib/pci/pci.c @@ -52,9 +52,25 @@ vlib_pci_main_t pci_main; -vlib_pci_device_info_t * __attribute__ ((weak)) -vlib_pci_get_device_info (vlib_main_t * vm, vlib_pci_addr_t * addr, - clib_error_t ** error) +VLIB_REGISTER_LOG_CLASS (pci_log, static) = { + .class_name = "pci", +}; + +#define log_debug(h, f, ...) \ + vlib_log (VLIB_LOG_LEVEL_DEBUG, pci_log.class, "%U: " f, \ + format_vlib_pci_log, h, ##__VA_ARGS__) + +u8 * +format_vlib_pci_log (u8 *s, va_list *va) +{ + vlib_pci_dev_handle_t h = va_arg (*va, vlib_pci_dev_handle_t); + return format (s, "%U", format_vlib_pci_addr, + vlib_pci_get_addr (vlib_get_main (), h)); +} + +vlib_pci_device_info_t *__attribute__ ((weak)) +vlib_pci_get_device_info (vlib_main_t *vm, vlib_pci_addr_t *addr, + clib_error_t **error) { if (error) *error = clib_error_return (0, "unsupported"); @@ -73,6 +89,122 @@ vlib_pci_addr_t * __attribute__ ((weak)) vlib_pci_get_all_dev_addrs () } static clib_error_t * +_vlib_pci_config_set_control_bit (vlib_main_t *vm, vlib_pci_dev_handle_t h, + u16 bit, int new_val, int *already_set) +{ + u16 control, old; + clib_error_t *err; + + err = vlib_pci_read_write_config ( + vm, h, VLIB_READ, STRUCT_OFFSET_OF (vlib_pci_config_t, command), &old, + STRUCT_SIZE_OF (vlib_pci_config_t, command)); + + if (err) + return err; + + control = new_val ? old | bit : old & ~bit; + *already_set = old == control; + if (*already_set) + return 0; + + return vlib_pci_read_write_config ( + vm, h, VLIB_WRITE, STRUCT_OFFSET_OF (vlib_pci_config_t, command), &control, + STRUCT_SIZE_OF (vlib_pci_config_t, command)); +} + +clib_error_t * +vlib_pci_intr_enable (vlib_main_t *vm, vlib_pci_dev_handle_t h) +{ + const vlib_pci_config_reg_command_t cmd = { .intx_disable = 1 }; + clib_error_t *err; + int already_set; + + err = _vlib_pci_config_set_control_bit (vm, h, cmd.as_u16, 0, &already_set); + log_debug (h, "interrupt%senabled", already_set ? " " : " already "); + return err; +} + +clib_error_t * +vlib_pci_intr_disable (vlib_main_t *vm, vlib_pci_dev_handle_t h) +{ + const vlib_pci_config_reg_command_t cmd = { .intx_disable = 1 }; + clib_error_t *err; + int already_set; + + err = _vlib_pci_config_set_control_bit (vm, h, cmd.as_u16, 1, &already_set); + log_debug (h, "interrupt%sdisabled", already_set ? " " : " already "); + return err; +} + +clib_error_t * +vlib_pci_bus_master_enable (vlib_main_t *vm, vlib_pci_dev_handle_t h) +{ + const vlib_pci_config_reg_command_t cmd = { .bus_master = 1 }; + clib_error_t *err; + int already_set; + + err = _vlib_pci_config_set_control_bit (vm, h, cmd.as_u16, 1, &already_set); + log_debug (h, "bus-master%senabled", already_set ? " " : " already "); + return err; +} + +clib_error_t * +vlib_pci_bus_master_disable (vlib_main_t *vm, vlib_pci_dev_handle_t h) +{ + const vlib_pci_config_reg_command_t cmd = { .bus_master = 1 }; + clib_error_t *err; + int already_set; + + err = _vlib_pci_config_set_control_bit (vm, h, cmd.as_u16, 0, &already_set); + log_debug (h, "bus-master%sdisabled", already_set ? " " : " already "); + return err; +} + +clib_error_t * +vlib_pci_function_level_reset (vlib_main_t *vm, vlib_pci_dev_handle_t h) +{ + vlib_pci_config_t cfg; + pci_capability_pcie_t *cap; + pci_capability_pcie_dev_control_t dev_control; + clib_error_t *err; + u8 offset; + + log_debug (h, "function level reset"); + + err = vlib_pci_read_write_config (vm, h, VLIB_READ, 0, &cfg, sizeof (cfg)); + if (err) + return err; + + offset = cfg.cap_ptr; + + while (offset) + { + cap = (pci_capability_pcie_t *) (cfg.data + offset); + + if (cap->capability_id == PCI_CAP_ID_PCIE) + break; + + offset = cap->next_offset; + } + + if (cap->capability_id != PCI_CAP_ID_PCIE) + return clib_error_return (0, "PCIe capability config not found"); + + if (cap->dev_caps.flr_capable == 0) + return clib_error_return (0, "PCIe function level reset not supported"); + + dev_control = cap->dev_control; + dev_control.function_level_reset = 1; + + if ((err = vlib_pci_write_config_u16 ( + vm, h, offset + STRUCT_OFFSET_OF (pci_capability_pcie_t, dev_control), + &dev_control.as_u16))) + return err; + + return 0; +} + +static clib_error_t * show_pci_fn (vlib_main_t * vm, unformat_input_t * input, vlib_cli_command_t * cmd) { @@ -151,38 +283,54 @@ format_vlib_pci_addr (u8 * s, va_list * va) u8 * format_vlib_pci_link_port (u8 *s, va_list *va) { - vlib_pci_device_info_t *d = va_arg (*va, vlib_pci_device_info_t *); - pcie_config_regs_t *r = - pci_config_find_capability (&d->config0, PCI_CAP_ID_PCIE); + vlib_pci_config_t *c = va_arg (*va, vlib_pci_config_t *); + pci_capability_pcie_t *r = pci_config_find_capability (c, PCI_CAP_ID_PCIE); + + if (!r) + return format (s, "unknown"); + + return format (s, "P%d", r->link_caps.port_number); +} + +static u8 * +_vlib_pci_link_speed (u8 *s, u8 speed, u8 width) +{ + static char *speeds[] = { + [1] = "2.5", [2] = "5.0", [3] = "8.0", [4] = "16.0", [5] = "32.0" + }; + + if (speed > ARRAY_LEN (speeds) || speeds[speed] == 0) + s = format (s, "unknown speed"); + else + s = format (s, "%s GT/s", speeds[speed]); + + return format (s, " x%u", width); +} + +u8 * +format_vlib_pci_link_speed (u8 *s, va_list *va) +{ + vlib_pci_config_t *c = va_arg (*va, vlib_pci_config_t *); + pci_capability_pcie_t *r = pci_config_find_capability (c, PCI_CAP_ID_PCIE); if (!r) return format (s, "unknown"); - return format (s, "P%d", r->link_capabilities >> 24); + return _vlib_pci_link_speed (s, r->link_status.link_speed, + r->link_status.negotiated_link_width); } u8 * -format_vlib_pci_link_speed (u8 * s, va_list * va) +format_vlib_pci_link_speed_cap (u8 *s, va_list *va) { - vlib_pci_device_info_t *d = va_arg (*va, vlib_pci_device_info_t *); - pcie_config_regs_t *r = - pci_config_find_capability (&d->config0, PCI_CAP_ID_PCIE); - int width; + vlib_pci_config_t *c = va_arg (*va, vlib_pci_config_t *); + pci_capability_pcie_t *r = pci_config_find_capability (c, PCI_CAP_ID_PCIE); if (!r) return format (s, "unknown"); - width = (r->link_status >> 4) & 0x3f; - - if ((r->link_status & 0xf) == 1) - return format (s, "2.5 GT/s x%u", width); - if ((r->link_status & 0xf) == 2) - return format (s, "5.0 GT/s x%u", width); - if ((r->link_status & 0xf) == 3) - return format (s, "8.0 GT/s x%u", width); - if ((r->link_status & 0xf) == 4) - return format (s, "16.0 GT/s x%u", width); - return format (s, "unknown"); + return _vlib_pci_link_speed (s, r->link_caps.max_link_speed, + r->link_caps.max_link_width); } u8 * @@ -257,29 +405,9 @@ format_vlib_pci_vpd (u8 * s, va_list * args) return s; } - -/* *INDENT-OFF* */ VLIB_CLI_COMMAND (show_pci_command, static) = { .path = "show pci", .short_help = "show pci [all]", .function = show_pci_fn, }; -/* *INDENT-ON* */ -clib_error_t * -pci_bus_init (vlib_main_t * vm) -{ - vlib_pci_main_t *pm = &pci_main; - pm->log_default = vlib_log_register_class ("pci", 0); - return 0; -} - -VLIB_INIT_FUNCTION (pci_bus_init); - -/* - * fd.io coding-style-patch-verification: ON - * - * Local Variables: - * eval: (c-set-style "gnu") - * End: - */ diff --git a/src/vlib/pci/pci.h b/src/vlib/pci/pci.h index 4e9cf4aee9e..627833d4dfc 100644 --- a/src/vlib/pci/pci.h +++ b/src/vlib/pci/pci.h @@ -72,6 +72,7 @@ typedef struct vlib_pci_device_info u16 device_class; u16 vendor_id; u16 device_id; + u8 revision; /* Vital Product Data */ u8 *product_name; @@ -82,12 +83,7 @@ typedef struct vlib_pci_device_info u8 *driver_name; /* First 64 bytes of configuration space. */ - union - { - pci_config_type0_regs_t config0; - pci_config_type1_regs_t config1; - u8 config_data[256]; - }; + vlib_pci_config_t config; /* IOMMU Group */ int iommu_group; @@ -129,6 +125,12 @@ typedef struct u16 vendor_id, device_id; } pci_device_id_t; +#define PCI_DEVICE_IDS(...) \ + (pci_device_id_t[]) \ + { \ + __VA_ARGS__, {} \ + } + typedef void (pci_intx_handler_function_t) (vlib_main_t * vm, vlib_pci_dev_handle_t handle); typedef void (pci_msix_handler_function_t) (vlib_main_t * vm, @@ -198,15 +200,19 @@ clib_error_t *vlib_pci_read_write_io (vlib_main_t * vm, vlib_read_or_write_t read_or_write, uword address, void *data, u32 n_bytes); - -#define _(t, x) \ -static inline clib_error_t * \ -vlib_pci_read_##x##_##t (vlib_main_t *vm, vlib_pci_dev_handle_t h, \ - uword address, t * data) \ -{ \ - return vlib_pci_read_write_##x (vm, h, VLIB_READ,address, data, \ - sizeof (data[0])); \ -} +#define _(t, x) \ + static inline clib_error_t *vlib_pci_read_##x##_##t ( \ + vlib_main_t *vm, vlib_pci_dev_handle_t h, uword address, t *data) \ + { \ + return vlib_pci_read_write_##x (vm, h, VLIB_READ, address, data, \ + sizeof (data[0])); \ + } \ + static inline clib_error_t *vlib_pci_write_##x##_##t ( \ + vlib_main_t *vm, vlib_pci_dev_handle_t h, uword address, t *data) \ + { \ + return vlib_pci_read_write_##x (vm, h, VLIB_WRITE, address, data, \ + sizeof (data[0])); \ + } _(u32, config); _(u16, config); @@ -218,77 +224,6 @@ _(u8, io); #undef _ -#define _(t, x) \ -static inline clib_error_t * \ -vlib_pci_write_##x##_##t (vlib_main_t *vm, vlib_pci_dev_handle_t h, \ - uword address, t * data) \ -{ \ - return vlib_pci_read_write_##x (vm, h, VLIB_WRITE, \ - address, data, sizeof (data[0])); \ -} - -_(u32, config); -_(u16, config); -_(u8, config); - -_(u32, io); -_(u16, io); -_(u8, io); - -#undef _ - -static inline clib_error_t * -vlib_pci_intr_enable (vlib_main_t * vm, vlib_pci_dev_handle_t h) -{ - u16 command; - clib_error_t *err; - - err = vlib_pci_read_config_u16 (vm, h, 4, &command); - - if (err) - return err; - - command &= ~PCI_COMMAND_INTX_DISABLE; - - return vlib_pci_write_config_u16 (vm, h, 4, &command); -} - -static inline clib_error_t * -vlib_pci_intr_disable (vlib_main_t * vm, vlib_pci_dev_handle_t h) -{ - u16 command; - clib_error_t *err; - - err = vlib_pci_read_config_u16 (vm, h, 4, &command); - - if (err) - return err; - - command |= PCI_COMMAND_INTX_DISABLE; - - return vlib_pci_write_config_u16 (vm, h, 4, &command); -} - -static inline clib_error_t * -vlib_pci_bus_master_enable (vlib_main_t * vm, vlib_pci_dev_handle_t h) -{ - clib_error_t *err; - u16 command; - - /* Set bus master enable (BME) */ - err = vlib_pci_read_config_u16 (vm, h, 4, &command); - - if (err) - return err; - - if (command & PCI_COMMAND_BUS_MASTER) - return 0; - - command |= PCI_COMMAND_BUS_MASTER; - - return vlib_pci_write_config_u16 (vm, h, 4, &command); -} - clib_error_t *vlib_pci_device_open (vlib_main_t * vm, vlib_pci_addr_t * addr, pci_device_id_t ids[], vlib_pci_dev_handle_t * handle); @@ -323,12 +258,22 @@ uword vlib_pci_get_msix_file_index (vlib_main_t * vm, vlib_pci_dev_handle_t h, int vlib_pci_supports_virtual_addr_dma (vlib_main_t * vm, vlib_pci_dev_handle_t h); +clib_error_t *vlib_pci_intr_enable (vlib_main_t *, vlib_pci_dev_handle_t); +clib_error_t *vlib_pci_intr_disable (vlib_main_t *, vlib_pci_dev_handle_t); +clib_error_t *vlib_pci_bus_master_enable (vlib_main_t *, + vlib_pci_dev_handle_t); +clib_error_t *vlib_pci_bus_master_disable (vlib_main_t *, + vlib_pci_dev_handle_t); +clib_error_t *vlib_pci_function_level_reset (vlib_main_t *, + vlib_pci_dev_handle_t); unformat_function_t unformat_vlib_pci_addr; format_function_t format_vlib_pci_addr; format_function_t format_vlib_pci_link_speed; +format_function_t format_vlib_pci_link_speed_cap; format_function_t format_vlib_pci_link_port; format_function_t format_vlib_pci_vpd; +format_function_t format_vlib_pci_log; #endif /* included_vlib_pci_h */ diff --git a/src/vlib/pci/pci_config.h b/src/vlib/pci/pci_config.h index b4c38eb53e4..3501bde4214 100644 --- a/src/vlib/pci/pci_config.h +++ b/src/vlib/pci/pci_config.h @@ -168,210 +168,114 @@ pci_device_class_base (pci_device_class_t c) #define VIRTIO_PCI_LEGACY_DEVICEID_NET 0x1000 #define VIRTIO_PCI_MODERN_DEVICEID_NET 0x1041 -/* - * Under PCI, each device has 256 bytes of configuration address space, - * of which the first 64 bytes are standardized as follows: - */ -typedef struct +typedef union { - u16 vendor_id; - u16 device_id; + struct + { + u16 io_space : 1; + u16 mem_space : 1; + u16 bus_master : 1; + u16 special_cycles : 1; + u16 mem_write_invalidate : 1; + u16 vga_palette_snoop : 1; + u16 parity_err_resp : 1; + u16 _reserved_7 : 1; + u16 serr_enable : 1; + u16 fast_b2b_enable : 1; + u16 intx_disable : 1; + u16 _reserved_11 : 5; + }; + u16 as_u16; +} vlib_pci_config_reg_command_t; + +typedef union +{ + struct + { + u16 _reserved_0 : 3; + u16 intx_status : 1; + u16 capabilities_list : 1; + u16 capaable_66mhz : 1; + u16 _reserved_6 : 1; + u16 fast_b2b_capable : 1; + u16 master_data_parity_error : 1; + u16 devsel_timing : 2; + u16 sig_target_abort : 1; + u16 rec_target_abort : 1; + u16 rec_master_abort : 1; + u16 sig_system_err : 1; + u16 detected_parity_err : 1; + }; + u16 as_u16; +} vlib_pci_config_reg_status_t; - u16 command; -#define PCI_COMMAND_IO (1 << 0) /* Enable response in I/O space */ -#define PCI_COMMAND_MEMORY (1 << 1) /* Enable response in Memory space */ -#define PCI_COMMAND_BUS_MASTER (1 << 2) /* Enable bus mastering */ -#define PCI_COMMAND_SPECIAL (1 << 3) /* Enable response to special cycles */ -#define PCI_COMMAND_WRITE_INVALIDATE (1 << 4) /* Use memory write and invalidate */ -#define PCI_COMMAND_VGA_PALETTE_SNOOP (1 << 5) -#define PCI_COMMAND_PARITY (1 << 6) -#define PCI_COMMAND_WAIT (1 << 7) /* Enable address/data stepping */ -#define PCI_COMMAND_SERR (1 << 8) /* Enable SERR */ -#define PCI_COMMAND_BACK_TO_BACK_WRITE (1 << 9) -#define PCI_COMMAND_INTX_DISABLE (1 << 10) /* INTx Emulation Disable */ - - u16 status; -#define PCI_STATUS_INTX_PENDING (1 << 3) -#define PCI_STATUS_CAPABILITY_LIST (1 << 4) -#define PCI_STATUS_66MHZ (1 << 5) /* Support 66 Mhz PCI 2.1 bus */ -#define PCI_STATUS_UDF (1 << 6) /* Support User Definable Features (obsolete) */ -#define PCI_STATUS_BACK_TO_BACK_WRITE (1 << 7) /* Accept fast-back to back */ -#define PCI_STATUS_PARITY_ERROR (1 << 8) /* Detected parity error */ -#define PCI_STATUS_DEVSEL_GET(x) ((x >> 9) & 3) /* DEVSEL timing */ -#define PCI_STATUS_DEVSEL_FAST (0 << 9) -#define PCI_STATUS_DEVSEL_MEDIUM (1 << 9) -#define PCI_STATUS_DEVSEL_SLOW (2 << 9) -#define PCI_STATUS_SIG_TARGET_ABORT (1 << 11) /* Set on target abort */ -#define PCI_STATUS_REC_TARGET_ABORT (1 << 12) /* Master ack of " */ -#define PCI_STATUS_REC_MASTER_ABORT (1 << 13) /* Set on master abort */ -#define PCI_STATUS_SIG_SYSTEM_ERROR (1 << 14) /* Set when we drive SERR */ -#define PCI_STATUS_DETECTED_PARITY_ERROR (1 << 15) - - u8 revision_id; - u8 programming_interface_class; /* Reg. Level Programming Interface */ - - pci_device_class_t device_class:16; - - u8 cache_size; - u8 latency_timer; - - u8 header_type; -#define PCI_HEADER_TYPE_NORMAL 0 -#define PCI_HEADER_TYPE_BRIDGE 1 -#define PCI_HEADER_TYPE_CARDBUS 2 - - u8 bist; -#define PCI_BIST_CODE_MASK 0x0f /* Return result */ -#define PCI_BIST_START 0x40 /* 1 to start BIST, 2 secs or less */ -#define PCI_BIST_CAPABLE 0x80 /* 1 if BIST capable */ -} pci_config_header_t; - -/* Byte swap config header. */ -always_inline void -pci_config_header_little_to_host (pci_config_header_t * r) +typedef enum { - if (!CLIB_ARCH_IS_BIG_ENDIAN) - return; -#define _(f,t) r->f = clib_byte_swap_##t (r->f) - _(vendor_id, u16); - _(device_id, u16); - _(command, u16); - _(status, u16); - _(device_class, u16); -#undef _ -} + PCI_HEADER_TYPE_NORMAL = 0, + PCI_HEADER_TYPE_BRIDGE = 1, + PCI_HEADER_TYPE_CARDBUS = 2 +} __clib_packed pci_config_header_type_t; + +#define foreach_pci_config_reg \ + _ (u16, vendor_id) \ + _ (u16, device_id) \ + _ (vlib_pci_config_reg_command_t, command) \ + _ (vlib_pci_config_reg_status_t, status) \ + _ (u8, revision_id) \ + _ (u8, prog_if) \ + _ (u8, subclass) \ + _ (u8, class) \ + _ (u8, cache_line_size) \ + _ (u8, latency_timer) \ + _ (pci_config_header_type_t, header_type) \ + _ (u8, bist) \ + _ (u32, bar, [6]) \ + _ (u32, cardbus_cis_ptr) \ + _ (u16, sub_vendor_id) \ + _ (u16, sub_device_id) \ + _ (u32, exp_rom_base_addr) \ + _ (u8, cap_ptr) \ + _ (u8, _reserved_0x35, [3]) \ + _ (u32, _reserved_0x38) \ + _ (u8, intr_line) \ + _ (u8, intr_pin) \ + _ (u8, min_grant) \ + _ (u8, max_latency) -/* Header type 0 (normal devices) */ typedef struct { - pci_config_header_t header; - - /* - * Base addresses specify locations in memory or I/O space. - * Decoded size can be determined by writing a value of - * 0xffffffff to the register, and reading it back. Only - * 1 bits are decoded. - */ - u32 base_address[6]; - - u16 cardbus_cis; - - u16 subsystem_vendor_id; - u16 subsystem_id; - - u32 rom_address; -#define PCI_ROM_ADDRESS 0x30 /* Bits 31..11 are address, 10..1 reserved */ -#define PCI_ROM_ADDRESS_ENABLE 0x01 -#define PCI_ROM_ADDRESS_MASK (~0x7ffUL) - - u8 first_capability_offset; - CLIB_PAD_FROM_TO (0x35, 0x3c); - - u8 interrupt_line; - u8 interrupt_pin; - u8 min_grant; - u8 max_latency; +#define _(a, b, ...) a b __VA_ARGS__; + foreach_pci_config_reg +#undef _ +} vlib_pci_config_mandatory_t; - u8 capability_data[0]; -} pci_config_type0_regs_t; +STATIC_ASSERT_SIZEOF (vlib_pci_config_mandatory_t, 64); -always_inline void -pci_config_type0_little_to_host (pci_config_type0_regs_t * r) +typedef union { - int i; - if (!CLIB_ARCH_IS_BIG_ENDIAN) - return; - pci_config_header_little_to_host (&r->header); -#define _(f,t) r->f = clib_byte_swap_##t (r->f) - for (i = 0; i < ARRAY_LEN (r->base_address); i++) - _(base_address[i], u32); - _(cardbus_cis, u16); - _(subsystem_vendor_id, u16); - _(subsystem_id, u16); - _(rom_address, u32); + struct + { +#define _(a, b, ...) a b __VA_ARGS__; + foreach_pci_config_reg #undef _ -} - -/* Header type 1 (PCI-to-PCI bridges) */ -typedef struct -{ - pci_config_header_t header; - - u32 base_address[2]; - - /* Primary/secondary bus number. */ - u8 primary_bus; - u8 secondary_bus; - - /* Highest bus number behind the bridge */ - u8 subordinate_bus; - - u8 secondary_bus_latency_timer; - - /* I/O range behind bridge. */ - u8 io_base, io_limit; + }; + u8 data[256]; +} vlib_pci_config_t; - /* Secondary status register, only bit 14 used */ - u16 secondary_status; +STATIC_ASSERT_SIZEOF (vlib_pci_config_t, 256); - /* Memory range behind bridge in units of 64k bytes. */ - u16 memory_base, memory_limit; -#define PCI_MEMORY_RANGE_TYPE_MASK 0x0fUL -#define PCI_MEMORY_RANGE_MASK (~0x0fUL) - - u16 prefetchable_memory_base, prefetchable_memory_limit; -#define PCI_PREF_RANGE_TYPE_MASK 0x0fUL -#define PCI_PREF_RANGE_TYPE_32 0x00 -#define PCI_PREF_RANGE_TYPE_64 0x01 -#define PCI_PREF_RANGE_MASK (~0x0fUL) - - u32 prefetchable_memory_base_upper_32bits; - u32 prefetchable_memory_limit_upper_32bits; - u16 io_base_upper_16bits; - u16 io_limit_upper_16bits; - - /* Same as for type 0. */ - u8 capability_list_offset; - CLIB_PAD_FROM_TO (0x35, 0x37); - - u32 rom_address; - CLIB_PAD_FROM_TO (0x3c, 0x3e); - - u16 bridge_control; -#define PCI_BRIDGE_CTL_PARITY 0x01 /* Enable parity detection on secondary interface */ -#define PCI_BRIDGE_CTL_SERR 0x02 /* The same for SERR forwarding */ -#define PCI_BRIDGE_CTL_NO_ISA 0x04 /* Disable bridging of ISA ports */ -#define PCI_BRIDGE_CTL_VGA 0x08 /* Forward VGA addresses */ -#define PCI_BRIDGE_CTL_MASTER_ABORT 0x20 /* Report master aborts */ -#define PCI_BRIDGE_CTL_BUS_RESET 0x40 /* Secondary bus reset */ -#define PCI_BRIDGE_CTL_FAST_BACK 0x80 /* Fast Back2Back enabled on secondary interface */ - - u8 capability_data[0]; -} pci_config_type1_regs_t; - -always_inline void -pci_config_type1_little_to_host (pci_config_type1_regs_t * r) +typedef union { - int i; - if (!CLIB_ARCH_IS_BIG_ENDIAN) - return; - pci_config_header_little_to_host (&r->header); -#define _(f,t) r->f = clib_byte_swap_##t (r->f) - for (i = 0; i < ARRAY_LEN (r->base_address); i++) - _(base_address[i], u32); - _(secondary_status, u16); - _(memory_base, u16); - _(memory_limit, u16); - _(prefetchable_memory_base, u16); - _(prefetchable_memory_limit, u16); - _(prefetchable_memory_base_upper_32bits, u32); - _(prefetchable_memory_limit_upper_32bits, u32); - _(io_base_upper_16bits, u16); - _(io_limit_upper_16bits, u16); - _(rom_address, u32); - _(bridge_control, u16); + struct + { +#define _(a, b, ...) a b __VA_ARGS__; + foreach_pci_config_reg #undef _ -} + }; + u8 data[4096]; +} vlib_pci_config_ext_t; + +STATIC_ASSERT_SIZEOF (vlib_pci_config_ext_t, 4096); /* Capabilities. */ typedef enum pci_capability_type @@ -418,16 +322,16 @@ typedef struct } __clib_packed pci_capability_regs_t; always_inline void * -pci_config_find_capability (pci_config_type0_regs_t * t, int cap_type) +pci_config_find_capability (vlib_pci_config_t *t, int cap_type) { pci_capability_regs_t *c; u32 next_offset; u32 ttl = 48; - if (!(t->header.status & PCI_STATUS_CAPABILITY_LIST)) + if (!(t->status.capabilities_list)) return 0; - next_offset = t->first_capability_offset; + next_offset = t->cap_ptr; while (ttl-- && next_offset >= 0x40) { c = (void *) t + (next_offset & ~3); @@ -592,77 +496,6 @@ pcie_code_to_size (int code) return size; } -/* PCI Express capability registers */ -typedef struct -{ - pci_capability_regs_t header; - u16 pcie_capabilities; -#define PCIE_CAP_VERSION(x) (((x) >> 0) & 0xf) -#define PCIE_CAP_DEVICE_TYPE(x) (((x) >> 4) & 0xf) -#define PCIE_DEVICE_TYPE_ENDPOINT 0 -#define PCIE_DEVICE_TYPE_LEGACY_ENDPOINT 1 -#define PCIE_DEVICE_TYPE_ROOT_PORT 4 - /* Upstream/downstream port of PCI Express switch. */ -#define PCIE_DEVICE_TYPE_SWITCH_UPSTREAM 5 -#define PCIE_DEVICE_TYPE_SWITCH_DOWNSTREAM 6 -#define PCIE_DEVICE_TYPE_PCIE_TO_PCI_BRIDGE 7 -#define PCIE_DEVICE_TYPE_PCI_TO_PCIE_BRIDGE 8 - /* Root complex integrated endpoint. */ -#define PCIE_DEVICE_TYPE_ROOT_COMPLEX_ENDPOINT 9 -#define PCIE_DEVICE_TYPE_ROOT_COMPLEX_EVENT_COLLECTOR 10 -#define PCIE_CAP_SLOW_IMPLEMENTED (1 << 8) -#define PCIE_CAP_MSI_IRQ(x) (((x) >> 9) & 0x1f) - u32 dev_capabilities; -#define PCIE_DEVCAP_MAX_PAYLOAD(x) (128 << (((x) >> 0) & 0x7)) -#define PCIE_DEVCAP_PHANTOM_BITS(x) (((x) >> 3) & 0x3) -#define PCIE_DEVCAP_EXTENTED_TAG (1 << 5) -#define PCIE_DEVCAP_L0S 0x1c0 /* L0s Acceptable Latency */ -#define PCIE_DEVCAP_L1 0xe00 /* L1 Acceptable Latency */ -#define PCIE_DEVCAP_ATN_BUT 0x1000 /* Attention Button Present */ -#define PCIE_DEVCAP_ATN_IND 0x2000 /* Attention Indicator Present */ -#define PCIE_DEVCAP_PWR_IND 0x4000 /* Power Indicator Present */ -#define PCIE_DEVCAP_PWR_VAL 0x3fc0000 /* Slot Power Limit Value */ -#define PCIE_DEVCAP_PWR_SCL 0xc000000 /* Slot Power Limit Scale */ - u16 dev_control; -#define PCIE_CTRL_CERE 0x0001 /* Correctable Error Reporting En. */ -#define PCIE_CTRL_NFERE 0x0002 /* Non-Fatal Error Reporting Enable */ -#define PCIE_CTRL_FERE 0x0004 /* Fatal Error Reporting Enable */ -#define PCIE_CTRL_URRE 0x0008 /* Unsupported Request Reporting En. */ -#define PCIE_CTRL_RELAX_EN 0x0010 /* Enable relaxed ordering */ -#define PCIE_CTRL_MAX_PAYLOAD(n) (((n) & 7) << 5) -#define PCIE_CTRL_EXT_TAG 0x0100 /* Extended Tag Field Enable */ -#define PCIE_CTRL_PHANTOM 0x0200 /* Phantom Functions Enable */ -#define PCIE_CTRL_AUX_PME 0x0400 /* Auxiliary Power PM Enable */ -#define PCIE_CTRL_NOSNOOP_EN 0x0800 /* Enable No Snoop */ -#define PCIE_CTRL_MAX_READ_REQUEST(n) (((n) & 7) << 12) - u16 dev_status; -#define PCIE_DEVSTA_AUXPD 0x10 /* AUX Power Detected */ -#define PCIE_DEVSTA_TRPND 0x20 /* Transactions Pending */ - u32 link_capabilities; - u16 link_control; - u16 link_status; - u32 slot_capabilities; - u16 slot_control; - u16 slot_status; - u16 root_control; -#define PCIE_RTCTL_SECEE 0x01 /* System Error on Correctable Error */ -#define PCIE_RTCTL_SENFEE 0x02 /* System Error on Non-Fatal Error */ -#define PCIE_RTCTL_SEFEE 0x04 /* System Error on Fatal Error */ -#define PCIE_RTCTL_PMEIE 0x08 /* PME Interrupt Enable */ -#define PCIE_RTCTL_CRSSVE 0x10 /* CRS Software Visibility Enable */ - u16 root_capabilities; - u32 root_status; - u32 dev_capabilities2; - u16 dev_control2; - u16 dev_status2; - u32 link_capabilities2; - u16 link_control2; - u16 link_status2; - u32 slot_capabilities2; - u16 slot_control2; - u16 slot_status2; -} __clib_packed pcie_config_regs_t; - /* PCI express extended capabilities. */ typedef enum pcie_capability_type { @@ -735,12 +568,178 @@ typedef struct #define PCI_PWR_CAP 12 /* Capability */ #define PCI_PWR_CAP_BUDGET(x) ((x) & 1) /* Included in system budget */ +#define pci_capability_pcie_dev_caps_t_fields \ + _ (3, max_payload_sz) \ + _ (2, phantom_fn_present) \ + _ (1, ext_tags_supported) \ + _ (3, acceptable_l0s_latency) \ + _ (3, acceptable_l1_latency) \ + _ (1, attention_button_present) \ + _ (1, attention_indicator_present) \ + _ (1, power_indicator_present) \ + _ (1, role_based_error_reporting_supported) \ + _ (2, _reserved_16) \ + _ (8, slot_ppower_limit_val) \ + _ (2, slot_power_limit_scale) \ + _ (1, flr_capable) \ + _ (3, _reserved_29) + +#define pci_capability_pcie_dev_control_t_fields \ + _ (1, enable_correctable_error_reporting) \ + _ (1, enable_non_fatal_error_reporting) \ + _ (1, enable_fatal_error_reporting) \ + _ (1, enable_unsupported_request_reporting) \ + _ (1, enable_relaxed_ordering) \ + _ (3, maximum_payload_size) \ + _ (1, extended_tag_field_enable) \ + _ (1, phantom_fn_denable) \ + _ (1, aux_power_pm_enable) \ + _ (1, enable_no_snoop) \ + _ (3, max_read_request_size) \ + _ (1, function_level_reset) + +#define pci_capability_pcie_dev_status_t_fields \ + _ (1, correctable_err_detected) \ + _ (1, non_fatal_err_detected) \ + _ (1, fatal_err_detected) \ + _ (1, unsupported_request_detected) \ + _ (1, aux_power_detected) \ + _ (1, transaction_pending) \ + _ (10, _reserved_6) + +#define pci_capability_pcie_link_caps_t_fields \ + _ (4, max_link_speed) \ + _ (5, max_link_width) \ + _ (2, aspm_support) \ + _ (3, l0s_exit_latency) \ + _ (3, l1_exit_latency) \ + _ (1, clock_power_mgmt_status) \ + _ (1, surprise_down_error_reporting_capable_status) \ + _ (1, data_link_layer_link_active_reporting_capable_status) \ + _ (1, link_bandwidth_notification_capability_status) \ + _ (1, aspm_optionality_compliance) \ + _ (1, _reserved_23) \ + _ (8, port_number) + +#define pci_capability_pcie_link_control_t_fields \ + _ (2, aspm_control) \ + _ (1, _reserved_2) \ + _ (1, read_completion_boundary) \ + _ (1, link_disable) \ + _ (1, retrain_clock) \ + _ (1, common_clock_config) \ + _ (1, extended_synch) \ + _ (1, enable_clock_pwr_mgmt) \ + _ (1, hw_autonomous_width_disable) \ + _ (1, link_bw_mgmt_intr_enable) \ + _ (1, link_autonomous_bw_intr_enable) \ + _ (4, _reserved_12) + +#define pci_capability_pcie_link_status_t_fields \ + _ (4, link_speed) \ + _ (6, negotiated_link_width) \ + _ (1, _reserved_10) \ + _ (1, link_training) \ + _ (1, slot_clock_config) \ + _ (1, data_link_layer_link_active) \ + _ (1, link_bw_mgmt_status) \ + _ (1, _reserved_15) + +#define pci_capability_pcie_dev_caps2_t_fields \ + _ (4, compl_timeout_ranges_supported) \ + _ (1, compl_timeout_disable_supported) \ + _ (1, ari_forwarding_supported) \ + _ (1, atomic_op_routing_supported) \ + _ (1, bit32_atomic_op_completer_supported) \ + _ (1, bit64_atomic_op_completer_supported) \ + _ (1, bit128_cas_completer_supported) \ + _ (1, no_ro_enabled_pr_pr_passing) \ + _ (1, ltr_mechanism_supported) \ + _ (1, tph_completer_supported) \ + _ (18, _reserved_14) + +#define pci_capability_pcie_dev_control2_t_fields \ + _ (4, completion_timeout_value) \ + _ (1, completion_timeout_disable) \ + _ (1, ari_forwarding_enable) \ + _ (1, atomic_op_requester_enable) \ + _ (1, atomic_op_egress_blocking) \ + _ (1, ido_request_enable) \ + _ (1, ido_completion_enable) \ + _ (1, ltr_mechanism_enable) \ + _ (5, _reserved_11) + +#define pci_capability_pcie_link_control2_t_fields \ + _ (4, target_link_speed) \ + _ (1, enter_compliance) \ + _ (1, hw_autonomous_speed_disable) \ + _ (1, selectable_de_emphasis) \ + _ (3, transmit_margin) \ + _ (1, enter_modified_compliance) \ + _ (1, compliance_sos) \ + _ (4, compliance_de_emphasis) + +#define pci_capability_pcie_link_status2_t_fields \ + _ (1, current_de_emphasis_level) \ + _ (15, _reserved_1) + +#define __(t, n) \ + typedef union \ + { \ + struct \ + { \ + n##_fields; \ + }; \ + t as_##t; \ + } n; \ + STATIC_ASSERT_SIZEOF (n, sizeof (t)) + +#define _(b, n) u32 n : b; +__ (u32, pci_capability_pcie_dev_caps_t); +__ (u32, pci_capability_pcie_link_caps_t); +__ (u32, pci_capability_pcie_dev_caps2_t); +#undef _ +#define _(b, n) u16 n : b; +__ (u16, pci_capability_pcie_dev_control_t); +__ (u16, pci_capability_pcie_dev_status_t); +__ (u16, pci_capability_pcie_link_control_t); +__ (u16, pci_capability_pcie_link_status_t); +__ (u16, pci_capability_pcie_dev_control2_t); +__ (u16, pci_capability_pcie_link_control2_t); +__ (u16, pci_capability_pcie_link_status2_t); +#undef _ +#undef __ + +typedef struct +{ + u8 capability_id; + u8 next_offset; + u16 version_id : 3; + u16 _reserved_0_19 : 13; + pci_capability_pcie_dev_caps_t dev_caps; + pci_capability_pcie_dev_control_t dev_control; + pci_capability_pcie_dev_status_t dev_status; + pci_capability_pcie_link_caps_t link_caps; + pci_capability_pcie_link_control_t link_control; + pci_capability_pcie_link_status_t link_status; + u32 _reserved_0x14; + u16 _reserved_0x18; + u16 _reserved_0x1a; + u32 _reserved_0x1c; + u16 _reserved_0x20; + u16 _reserved_0x22; + pci_capability_pcie_dev_caps2_t dev_caps2; + pci_capability_pcie_dev_control2_t dev_control2; + u16 _reserved_0x2a; + u32 _reserved_0x2c; + pci_capability_pcie_link_control2_t link_control2; + pci_capability_pcie_link_status2_t link_status2; + u32 _reserved_0x34; + u16 _reserved_0x38; + u16 _reserved_0x3a; +} pci_capability_pcie_t; + +STATIC_ASSERT_SIZEOF (pci_capability_pcie_t, 60); + #endif /* included_vlib_pci_config_h */ -/* - * fd.io coding-style-patch-verification: ON - * - * Local Variables: - * eval: (c-set-style "gnu") - * End: - */ |