ntb: Use pci_msix_vec_count() to obtain number of MSI-Xs (77733513) · Commits · e / devices / android_kernel_samsung_universal8890

drivers/ntb/ntb_hw.c

+4 −11

Original line number	Diff line number	Diff line
		@@ -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;
		goto err;
		}

		rc = pci_read_config_word(pdev, pdev->msix_cap + PCI_MSIX_FLAGS, &val);
		if (rc)
		msix_entries = pci_msix_vec_count(pdev);
		if (msix_entries < 0) {
		rc = msix_entries;
		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;
		}

+0 −2

Original line number	Diff line number	Diff line
		@@ -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)
		{