sync
This commit is contained in:
parent
2a351e0cdc
commit
f57be82572
GPG key ID:
F42C07F07E2E35B7
704 changed files with 20524 additions and 10572 deletions
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: if_ix.c,v 1.197 2023/06/01 09:05:33 jan Exp $ */
|
||||
/* $OpenBSD: if_ix.c,v 1.198 2023/07/08 09:01:30 jmatthew Exp $ */
|
||||
|
||||
/******************************************************************************
|
||||
|
||||
|
|
@ -3094,8 +3094,11 @@ ixgbe_free_receive_buffers(struct rx_ring *rxr)
|
|||
m_freem(rxbuf->buf);
|
||||
rxbuf->buf = NULL;
|
||||
}
|
||||
bus_dmamap_destroy(rxr->rxdma.dma_tag, rxbuf->map);
|
||||
rxbuf->map = NULL;
|
||||
if (rxbuf->map != NULL) {
|
||||
bus_dmamap_destroy(rxr->rxdma.dma_tag,
|
||||
rxbuf->map);
|
||||
rxbuf->map = NULL;
|
||||
}
|
||||
}
|
||||
free(rxr->rx_buffers, M_DEVBUF,
|
||||
sc->num_rx_desc * sizeof(struct ixgbe_rx_buf));
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
$OpenBSD: pcidevs,v 1.2041 2023/06/29 07:58:15 jsg Exp $
|
||||
$OpenBSD: pcidevs,v 1.2043 2023/07/08 09:11:51 kettenis Exp $
|
||||
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -274,6 +274,7 @@ vendor TOPIC 0x151f Topic/SmartLink
|
|||
vendor ENE 0x1524 ENE
|
||||
vendor ARALION 0x1538 Aralion
|
||||
vendor TERRATEC 0x153b TerraTec
|
||||
vendor PLDA 0x1556 PLDA
|
||||
vendor PERLE 0x155f Perle
|
||||
vendor SYMBOL 0x1562 Symbol
|
||||
vendor SYBA 0x1592 Syba
|
||||
|
|
@ -6949,6 +6950,7 @@ product INTEL RPL_U_HB_2 0xa71b Core 13G Host
|
|||
product INTEL RPL_U_HB_3 0xa71c Core 13G Host
|
||||
product INTEL RPL_DTT 0xa71d Core 13G DTT
|
||||
product INTEL RPL_XHCI 0xa71e Core 13G xHCI
|
||||
product INTEL RPL_TBT_PCIE3 0xa71f Core 13G PCIE
|
||||
product INTEL RPL_P_GT_1 0xa720 Graphics
|
||||
product INTEL RPL_P_GT_2 0xa721 Graphics
|
||||
product INTEL RPL_HX_HB_4 0xa728 Core 13G Host
|
||||
|
|
@ -6957,6 +6959,7 @@ product INTEL RPL_HX_HB_6 0xa72a Core 13G Host
|
|||
product INTEL RPL_PCIE_2 0xa72d Core 13G PCIE
|
||||
product INTEL RPL_TBT_PCIE2 0xa72f Core 13G PCIE
|
||||
product INTEL RPL_TBT_DMA0 0xa73e Core 13G TBT
|
||||
product INTEL RPL_TBT_PCIE1 0xa73f Core 13G PCIE
|
||||
product INTEL RPL_PCIE_3 0xa74d Core 13G PCIE
|
||||
product INTEL RPL_GNA 0xa74f Core 13G GNA
|
||||
product INTEL RPL_IPU 0xa75d Core 13G IPU
|
||||
|
|
@ -8247,6 +8250,9 @@ product PLANEX FNW_3800_TX 0xab07 FNW-3800-TX
|
|||
/* Platform */
|
||||
product PLATFORM ES1849 0x0100 ES1849
|
||||
|
||||
/* PLDA products */
|
||||
product PLDA XR_AXI 0x1111 XpressRICH-AXI
|
||||
|
||||
/* PLX products */
|
||||
product PLX 1076 0x1076 I/O 1076
|
||||
product PLX 1077 0x1077 I/O 1077
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
|
||||
*
|
||||
* generated from:
|
||||
* OpenBSD: pcidevs,v 1.2041 2023/06/29 07:58:15 jsg Exp
|
||||
* OpenBSD: pcidevs,v 1.2043 2023/07/08 09:11:51 kettenis Exp
|
||||
*/
|
||||
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
|
||||
|
||||
|
|
@ -279,6 +279,7 @@
|
|||
#define PCI_VENDOR_ENE 0x1524 /* ENE */
|
||||
#define PCI_VENDOR_ARALION 0x1538 /* Aralion */
|
||||
#define PCI_VENDOR_TERRATEC 0x153b /* TerraTec */
|
||||
#define PCI_VENDOR_PLDA 0x1556 /* PLDA */
|
||||
#define PCI_VENDOR_PERLE 0x155f /* Perle */
|
||||
#define PCI_VENDOR_SYMBOL 0x1562 /* Symbol */
|
||||
#define PCI_VENDOR_SYBA 0x1592 /* Syba */
|
||||
|
|
@ -6954,6 +6955,7 @@
|
|||
#define PCI_PRODUCT_INTEL_RPL_U_HB_3 0xa71c /* Core 13G Host */
|
||||
#define PCI_PRODUCT_INTEL_RPL_DTT 0xa71d /* Core 13G DTT */
|
||||
#define PCI_PRODUCT_INTEL_RPL_XHCI 0xa71e /* Core 13G xHCI */
|
||||
#define PCI_PRODUCT_INTEL_RPL_TBT_PCIE3 0xa71f /* Core 13G PCIE */
|
||||
#define PCI_PRODUCT_INTEL_RPL_P_GT_1 0xa720 /* Graphics */
|
||||
#define PCI_PRODUCT_INTEL_RPL_P_GT_2 0xa721 /* Graphics */
|
||||
#define PCI_PRODUCT_INTEL_RPL_HX_HB_4 0xa728 /* Core 13G Host */
|
||||
|
|
@ -6962,6 +6964,7 @@
|
|||
#define PCI_PRODUCT_INTEL_RPL_PCIE_2 0xa72d /* Core 13G PCIE */
|
||||
#define PCI_PRODUCT_INTEL_RPL_TBT_PCIE2 0xa72f /* Core 13G PCIE */
|
||||
#define PCI_PRODUCT_INTEL_RPL_TBT_DMA0 0xa73e /* Core 13G TBT */
|
||||
#define PCI_PRODUCT_INTEL_RPL_TBT_PCIE1 0xa73f /* Core 13G PCIE */
|
||||
#define PCI_PRODUCT_INTEL_RPL_PCIE_3 0xa74d /* Core 13G PCIE */
|
||||
#define PCI_PRODUCT_INTEL_RPL_GNA 0xa74f /* Core 13G GNA */
|
||||
#define PCI_PRODUCT_INTEL_RPL_IPU 0xa75d /* Core 13G IPU */
|
||||
|
|
@ -8252,6 +8255,9 @@
|
|||
/* Platform */
|
||||
#define PCI_PRODUCT_PLATFORM_ES1849 0x0100 /* ES1849 */
|
||||
|
||||
/* PLDA products */
|
||||
#define PCI_PRODUCT_PLDA_XR_AXI 0x1111 /* XpressRICH-AXI */
|
||||
|
||||
/* PLX products */
|
||||
#define PCI_PRODUCT_PLX_1076 0x1076 /* I/O 1076 */
|
||||
#define PCI_PRODUCT_PLX_1077 0x1077 /* I/O 1077 */
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
|
||||
*
|
||||
* generated from:
|
||||
* OpenBSD: pcidevs,v 1.2041 2023/06/29 07:58:15 jsg Exp
|
||||
* OpenBSD: pcidevs,v 1.2043 2023/07/08 09:11:51 kettenis Exp
|
||||
*/
|
||||
|
||||
/* $NetBSD: pcidevs,v 1.30 1997/06/24 06:20:24 thorpej Exp $ */
|
||||
|
|
@ -25171,6 +25171,10 @@ static const struct pci_known_product pci_known_products[] = {
|
|||
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_RPL_XHCI,
|
||||
"Core 13G xHCI",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_RPL_TBT_PCIE3,
|
||||
"Core 13G PCIE",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_RPL_P_GT_1,
|
||||
"Graphics",
|
||||
|
|
@ -25203,6 +25207,10 @@ static const struct pci_known_product pci_known_products[] = {
|
|||
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_RPL_TBT_DMA0,
|
||||
"Core 13G TBT",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_RPL_TBT_PCIE1,
|
||||
"Core 13G PCIE",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_RPL_PCIE_3,
|
||||
"Core 13G PCIE",
|
||||
|
|
@ -29687,6 +29695,10 @@ static const struct pci_known_product pci_known_products[] = {
|
|||
PCI_VENDOR_PLATFORM, PCI_PRODUCT_PLATFORM_ES1849,
|
||||
"ES1849",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_PLDA, PCI_PRODUCT_PLDA_XR_AXI,
|
||||
"XpressRICH-AXI",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_PLX, PCI_PRODUCT_PLX_1076,
|
||||
"I/O 1076",
|
||||
|
|
@ -35871,6 +35883,10 @@ static const struct pci_known_vendor pci_known_vendors[] = {
|
|||
PCI_VENDOR_TERRATEC,
|
||||
"TerraTec",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_PLDA,
|
||||
"PLDA",
|
||||
},
|
||||
{
|
||||
PCI_VENDOR_PERLE,
|
||||
"Perle",
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: virtio_pci.c,v 1.34 2023/07/05 18:11:08 patrick Exp $ */
|
||||
/* $OpenBSD: virtio_pci.c,v 1.35 2023/07/07 10:23:39 patrick Exp $ */
|
||||
/* $NetBSD: virtio.c,v 1.3 2011/11/02 23:05:52 njoly Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -961,6 +961,13 @@ virtio_pci_setup_msix(struct virtio_pci_softc *sc, struct pci_attach_args *pa,
|
|||
struct virtio_softc *vsc = &sc->sc_sc;
|
||||
int i;
|
||||
|
||||
/* Shared needs config + queue */
|
||||
if (shared && pci_intr_msix_count(pa) < 1 + 1)
|
||||
return 1;
|
||||
/* Per VQ needs config + N * queue */
|
||||
if (!shared && pci_intr_msix_count(pa) < 1 + vsc->sc_nvqs)
|
||||
return 1;
|
||||
|
||||
if (virtio_pci_msix_establish(sc, pa, 0, virtio_pci_config_intr, vsc))
|
||||
return 1;
|
||||
sc->sc_devcfg_offset = VIRTIO_CONFIG_DEVICE_CONFIG_MSI;
|
||||
|
|
@ -1059,10 +1066,9 @@ int
|
|||
virtio_pci_queue_intr(void *arg)
|
||||
{
|
||||
struct virtqueue *vq = arg;
|
||||
struct virtio_softc *vsc = vq->vq_owner;
|
||||
|
||||
if (vq->vq_done)
|
||||
return (vq->vq_done)(vq);
|
||||
return 0;
|
||||
return virtio_check_vq(vsc, vq);
|
||||
}
|
||||
|
||||
int
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue