Attachment 205541 Details for Bug 211713 – Fix SM961 issue

[patch] Fix SM961 issue

0001-Program-the-MSI-X-vector-control-field-for-MSI-X-tab.patch (text/plain), 1.24 KB, created by Ka Ho Ng on 2019-07-06 11:16:56 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ka Ho Ng

Created: 2019-07-06 11:16:56 UTC

Size: 1.24 KB

patch

obsolete

>diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c
>index 7c6a1604c13..5120db62a74 100644
>--- a/sys/dev/pci/pci.c
>+++ b/sys/dev/pci/pci.c
>@@ -1649,15 +1649,11 @@ pci_mask_msix(device_t dev, u_int index)
> {
> 	struct pci_devinfo *dinfo = device_get_ivars(dev);
> 	struct pcicfg_msix *msix = &dinfo->cfg.msix;
>-	uint32_t offset, val;
>+	uint32_t offset;
> 
> 	KASSERT(msix->msix_msgnum > index, ("bogus index"));
> 	offset = msix->msix_table_offset + index * 16 + 12;
>-	val = bus_read_4(msix->msix_table_res, offset);
>-	if (!(val & PCIM_MSIX_VCTRL_MASK)) {
>-		val |= PCIM_MSIX_VCTRL_MASK;
>-		bus_write_4(msix->msix_table_res, offset, val);
>-	}
>+	bus_write_4(msix->msix_table_res, offset, PCIM_MSIX_VCTRL_MASK);
> }
> 
> void
>@@ -1665,15 +1661,11 @@ pci_unmask_msix(device_t dev, u_int index)
> {
> 	struct pci_devinfo *dinfo = device_get_ivars(dev);
> 	struct pcicfg_msix *msix = &dinfo->cfg.msix;
>-	uint32_t offset, val;
>+	uint32_t offset;
> 
> 	KASSERT(msix->msix_table_len > index, ("bogus index"));
> 	offset = msix->msix_table_offset + index * 16 + 12;
>-	val = bus_read_4(msix->msix_table_res, offset);
>-	if (val & PCIM_MSIX_VCTRL_MASK) {
>-		val &= ~PCIM_MSIX_VCTRL_MASK;
>-		bus_write_4(msix->msix_table_res, offset, val);
>-	}
>+	bus_write_4(msix->msix_table_res, offset, 0);
> }
> 
> int

Actions: View | Diff

Attachments on bug 211713: 180826 | 180827 | 180828 | 191543 | 199031 | 205429 | 205541