Sat May 23 14:51:19 2020 UTC ()

switch back to PHYSDEVOP_alloc_irq_vector for non-MSI interrupts - on my
computer it works the same as PHYSDEVOP_map_pirq, but seems it doesn't
on other systems

fixes PR port-xen/55285 for Patrick Welche, but not yet for another system
by Frank Kardel


(jdolecek)

diff -r1.16 -r1.17 src/sys/arch/xen/x86/pintr.c

--- src/sys/arch/xen/x86/pintr.c 2020/05/15 07:42:58	1.16
+++ src/sys/arch/xen/x86/pintr.c 2020/05/23 14:51:19	1.17

 @@ -93,27 +93,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *     @(#)isa.c       7.2 (Berkeley) 5/13/91
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pintr.c,v 1.16 2020/05/15 07:42:58 jdolecek Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pintr.c,v 1.17 2020/05/23 14:51:19 jdolecek Exp $");
 #include "opt_multiprocessor.h"
 #include "opt_xen.h"
 #include "isa.h"
 #include "pci.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/kernel.h>
 #include <sys/syslog.h>
 #include <sys/device.h>
 #include <sys/proc.h>
 #include <sys/errno.h>
 @@ -163,67 +163,68 @@ short irq2port[NR_EVENT_CHANNELS] = {0};
 #endif
 #if defined(DOM0OPS) || NPCI > 0
 /*
  * This function doesn't "allocate" anything. It merely translates our
  * understanding of PIC to the XEN 'gsi' namespace. In the case of
  * MSIs, pirq == irq. In the case of everything else, the hypervisor
  * doesn't really care, so we just use the native conventions that
  * have been setup during boot by mpbios.c/mpacpi.c
  */
 int
 xen_pic_to_gsi(struct pic *pic, int pin)
+{
 	struct physdev_map_pirq map_irq;
 	int ret;
 	int gsi;
 	KASSERT(pic != NULL);
 	/*
 	 * We assume that mpbios/mpacpi have done the right thing.
 	 * If so, legacy_irq should identity map correctly to gsi.
 	 */
 	gsi = pic->pic_vecbase + pin;
 	KASSERT(gsi < NR_EVENT_CHANNELS);
 	switch (pic->pic_type) {
 	case PIC_I8259:
 		KASSERT(gsi < 16);
 		/* FALLTHROUGH */
 	case PIC_IOAPIC:
+	    {
 		KASSERT(gsi < 255);
 		if (irq2port[gsi] != 0) {
 			/* Already mapped the shared interrupt */
 			break;
+		}
-		memset(&map_irq, 0, sizeof(map_irq));
+		struct physdev_irq irq_op;
-		map_irq.domid = DOMID_SELF;
+		memset(&irq_op, 0, sizeof(irq_op));
-		map_irq.type = MAP_PIRQ_TYPE_GSI;
+		irq_op.irq = gsi;
-		map_irq.index = pin;
+		ret = HYPERVISOR_physdev_op(PHYSDEVOP_alloc_irq_vector,
-		map_irq.pirq = gsi;
+		    &irq_op);
-		ret = HYPERVISOR_physdev_op(PHYSDEVOP_map_pirq, &map_irq);
+		if (ret < 0) {
-		if (ret != 0)
+			panic("physdev_op(PHYSDEVOP_alloc_irq_vector) %d"
-			panic("physdev_op(PHYSDEVOP_map_pirq) GSI fail %d",
+			    " fail %d", gsi, ret);
 			    ret);
 		KASSERT(irq_op.vector == gsi);
 		break;
+	    }
 	case PIC_MSI:
 	case PIC_MSIX:
 #ifdef __HAVE_PCI_MSI_MSIX
+	    {
 		struct physdev_map_pirq map_irq;
 		const struct msipic_pci_info *i = msipic_get_pci_info(pic);
 		memset(&map_irq, 0, sizeof(map_irq));
 		map_irq.domid = DOMID_SELF;
 		map_irq.type = MAP_PIRQ_TYPE_MSI_SEG;
 		map_irq.index = -1;
 		map_irq.pirq = -1;
 		map_irq.bus = i->mp_bus;
 	 	map_irq.devfn = (i->mp_dev << 3) | i->mp_fun;
 		KASSERT(i->mp_veccnt > 0);
 		map_irq.entry_nr = i->mp_veccnt;
 		if (pic->pic_type == PIC_MSI && i->mp_veccnt > 1) {
 			map_irq.type = MAP_PIRQ_TYPE_MULTI_MSI;