From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id DABE4B0A6 for ; Mon, 16 Jun 2014 13:10:20 +0200 (CEST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 16 Jun 2014 04:05:17 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,486,1400050800"; d="scan'208";a="529157014" Received: from sie-lab-212-143.ir.intel.com (HELO silpixa00385294.ir.intel.com) ([10.237.212.143]) by orsmga001.jf.intel.com with ESMTP; 16 Jun 2014 04:10:35 -0700 From: Alan Carew To: dev@dpdk.org Date: Mon, 16 Jun 2014 12:10:26 +0100 Message-Id: <1402917026-2886-2-git-send-email-alan.carew@intel.com> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1402917026-2886-1-git-send-email-alan.carew@intel.com> References: <1402917026-2886-1-git-send-email-alan.carew@intel.com> Subject: [dpdk-dev] [PATCH 1/1] librte_pmd_virtio: Fix incorrect device specific header offset when MSI-X is disabled X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Jun 2014 11:10:21 -0000 Signed-off-by: Alan Carew --- config/common_bsdapp | 2 +- lib/librte_pmd_virtio/virtio_ethdev.c | 28 +++++++++++++++++++++++++++- lib/librte_pmd_virtio/virtio_pci.h | 5 ++--- 3 files changed, 30 insertions(+), 5 deletions(-) diff --git a/config/common_bsdapp b/config/common_bsdapp index ef8eeab..f7397ee 100644 --- a/config/common_bsdapp +++ b/config/common_bsdapp @@ -169,7 +169,7 @@ CONFIG_RTE_IXGBE_RX_OLFLAGS_DISABLE=n # # Compile burst-oriented VIRTIO PMD driver # -CONFIG_RTE_LIBRTE_VIRTIO_PMD=n +CONFIG_RTE_LIBRTE_VIRTIO_PMD=y CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_INIT=n CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_RX=n CONFIG_RTE_LIBRTE_VIRTIO_DEBUG_TX=n diff --git a/lib/librte_pmd_virtio/virtio_ethdev.c b/lib/librte_pmd_virtio/virtio_ethdev.c index d0b419d..ecdf6f8 100644 --- a/lib/librte_pmd_virtio/virtio_ethdev.c +++ b/lib/librte_pmd_virtio/virtio_ethdev.c @@ -583,7 +583,8 @@ parse_sysfs_value(const char *filename, unsigned long *val) return 0; } -static int get_uio_dev(struct rte_pci_addr *loc, char *buf, unsigned int buflen) +static +int get_uio_dev(struct rte_pci_addr *loc, char *buf, unsigned int buflen) { unsigned int uio_num; struct dirent *e; @@ -647,6 +648,30 @@ static int get_uio_dev(struct rte_pci_addr *loc, char *buf, unsigned int buflen) return 0; } + +static int +virtio_has_msix(const struct rte_pci_addr *loc) +{ + DIR *d; + char dirname[PATH_MAX]; + + rte_snprintf(dirname, sizeof(dirname), + SYSFS_PCI_DEVICES "/" PCI_PRI_FMT "/msi_irqs", + loc->domain, loc->bus, loc->devid, loc->function); + + d = opendir(dirname); + if (d) + closedir(d); + + return (d != NULL); +} +#else +static int +virtio_has_msix(const struct rte_pci_addr *loc __rte_unused) +{ + /* nic_uio does not enable interrupts, return 0 (false). */ + return 0; +} #endif /* @@ -720,6 +745,7 @@ eth_virtio_dev_init(__rte_unused struct eth_driver *eth_drv, start, size); } #endif + hw->use_msix = virtio_has_msix(&pci_dev->addr); hw->io_base = (uint32_t)(uintptr_t)pci_dev->mem_resource[0].addr; /* Reset the device although not necessary at startup */ diff --git a/lib/librte_pmd_virtio/virtio_pci.h b/lib/librte_pmd_virtio/virtio_pci.h index 864b084..d27b734 100644 --- a/lib/librte_pmd_virtio/virtio_pci.h +++ b/lib/librte_pmd_virtio/virtio_pci.h @@ -177,6 +177,7 @@ struct virtio_hw { uint16_t subsystem_device_id; uint16_t subsystem_vendor_id; uint8_t revision_id; + uint8_t use_msix; uint8_t mac_addr[ETHER_ADDR_LEN]; int adapter_stopped; struct rte_eth_stats eth_stats; @@ -195,13 +196,11 @@ struct virtio_net_config { uint16_t max_virtqueue_pairs; } __attribute__((packed)); -/* Value indicated in device config */ -#define VIRTIO_PCI_FLAG_MSIX 0x0020 /* * The remaining space is defined by each driver as the per-driver * configuration space. */ -#define VIRTIO_PCI_CONFIG(hw) (((hw)->guest_features & VIRTIO_PCI_FLAG_MSIX) ? 24 : 20) +#define VIRTIO_PCI_CONFIG(hw) (((hw)->use_msix) ? 24 : 20) /* * How many bits to shift physical queue address written to QUEUE_PFN. -- 1.9.3