Skip to contentSkip to conversation

xen-pciback: fix INTERRUPT_TYPE_* defines

PATCH In review Marek Marczykowski-Górecki 3 participants 3 messages Mar 20, 2020 – Mar 23, 2020 Xen hypervisor interface

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 xen-pciback: fix INTERRUPT_TYPE_* defines

xen_pcibk_get_interrupt_type() assumes INTERRUPT_TYPE_NONE being 0 (initialize ret to 0 and return as INTERRUPT_TYPE_NONE).
Fix the definition to make INTERRUPT_TYPE_NONE really 0, and also shift other values to not leave holes.
But also, do not assume INTERRUPT_TYPE_NONE being 0 anymore to avoid similar confusions in the future.

Fixes 476878e4b2be ("xen-pciback: optionally allow interrupt enable flag writes")

---
Changes in v2:
- don't depend on INTERRUPT_TYPE_NONE being 0

---
 drivers/xen/xen-pciback/conf_space.c | 2 +-
 drivers/xen/xen-pciback/conf_space.h | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/xen/xen-pciback/conf_space.c +1 -1
index b20e43e148ce..da51a5d34e6e 100644
@@ -320,7 +320,7 @@ int xen_pcibk_get_interrupt_type(struct pci_dev *dev)
 		if (val & PCI_MSIX_FLAGS_ENABLE)
 			ret |= INTERRUPT_TYPE_MSIX;
 	}
-	return ret;
+	return ret ?: INTERRUPT_TYPE_NONE;
 }
 
 void xen_pcibk_config_free_dyn_fields(struct pci_dev *dev)
drivers/xen/xen-pciback/conf_space.h +4 -4
index 28c45180a12e..5fe431c79f25 100644
@@ -65,10 +65,10 @@ struct config_field_entry {
 	void *data;
 };
 
-#define INTERRUPT_TYPE_NONE (1<<0)
-#define INTERRUPT_TYPE_INTX (1<<1)
-#define INTERRUPT_TYPE_MSI  (1<<2)
-#define INTERRUPT_TYPE_MSIX (1<<3)
+#define INTERRUPT_TYPE_NONE (0)
+#define INTERRUPT_TYPE_INTX (1<<0)
+#define INTERRUPT_TYPE_MSI  (1<<1)
+#define INTERRUPT_TYPE_MSIX (1<<2)
 
 extern bool xen_pcibk_permissive;
 
Signature · 1 line
2.21.1
Reviewed-by on v2 1/1
#1 lore raw
Quoted 9 lines · Marek Marczykowski-Górecki

xen_pcibk_get_interrupt_type() assumes INTERRUPT_TYPE_NONE being 0 (initialize ret to 0 and return as INTERRUPT_TYPE_NONE).
Fix the definition to make INTERRUPT_TYPE_NONE really 0, and also shift other values to not leave holes.
But also, do not assume INTERRUPT_TYPE_NONE being 0 anymore to avoid similar confusions in the future.

Fixes 476878e4b2be ("xen-pciback: optionally allow interrupt enable flag writes")
Reviewed-by on v2 1/1
#2 lore raw
In reply to Marek Marczykowski-Górecki
Quoted 9 lines · Marek Marczykowski-Górecki

xen_pcibk_get_interrupt_type() assumes INTERRUPT_TYPE_NONE being 0 (initialize ret to 0 and return as INTERRUPT_TYPE_NONE).
Fix the definition to make INTERRUPT_TYPE_NONE really 0, and also shift other values to not leave holes.
But also, do not assume INTERRUPT_TYPE_NONE being 0 anymore to avoid similar confusions in the future.

Fixes 476878e4b2be ("xen-pciback: optionally allow interrupt enable flag writes")

Thanks, Roger.