kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ntb: Use pci_msix_vec_count() to obtain number of MSI-Xs

Browse source 
Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Signed-off-by: Jon Mason <jon.mason@intel.com>
This commit is contained in:
Alexander Gordeev 2014-02-21 16:49:30 +01:00 committed by Jon Mason
parent 53ca4fea0b
commit 77733513c4
2 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/ntb/ntb_hw.c
View file

@ -1086,19 +1086,12 @@ static int ntb_setup_msix(struct ntb_device *ndev)
struct msix_entry *msix;
int msix_entries;
int rc, i;
u16 val;
if (!pdev->msix_cap) {
rc = -EIO;
msix_entries = pci_msix_vec_count(pdev);
if (msix_entries < 0) {
rc = msix_entries;
goto err;
}
rc = pci_read_config_word(pdev, pdev->msix_cap + PCI_MSIX_FLAGS, &val);
if (rc)
goto err;
msix_entries = msix_table_size(val);
if (msix_entries > ndev->limits.msix_cnt) {
} else if (msix_entries > ndev->limits.msix_cnt) {
rc = -EINVAL;
goto err;
}

2
drivers/ntb/ntb_hw.h
View file

@ -61,8 +61,6 @@
#define PCI_DEVICE_ID_INTEL_NTB_SS_HSX 0x2F0F
#define PCI_DEVICE_ID_INTEL_NTB_B2B_BWD 0x0C4E
#define msix_table_size(control) ((control & PCI_MSIX_FLAGS_QSIZE)+1)
#ifndef readq
static inline u64 readq(void __iomem *addr)
{