svn commit: r310246 - in stable/11/sys/compat/linuxkpi/common: include/linux src

Hans Petter Selasky hselasky at FreeBSD.org
Mon Dec 19 09:41:51 UTC 2016


Author: hselasky
Date: Mon Dec 19 09:41:49 2016
New Revision: 310246
URL: https://svnweb.freebsd.org/changeset/base/310246

Log:
  MFC r309733:
  MSIX can support more than 256 IRQs. Make sure the invalid IRQ number
  set in the LinuxKPI is big enough.
  
  Sponsored by:           Mellanox Technologies

Modified:
  stable/11/sys/compat/linuxkpi/common/include/linux/device.h
  stable/11/sys/compat/linuxkpi/common/src/linux_pci.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/compat/linuxkpi/common/include/linux/device.h
==============================================================================
--- stable/11/sys/compat/linuxkpi/common/include/linux/device.h	Mon Dec 19 09:40:29 2016	(r310245)
+++ stable/11/sys/compat/linuxkpi/common/include/linux/device.h	Mon Dec 19 09:41:49 2016	(r310246)
@@ -70,6 +70,7 @@ struct device {
 	uint64_t	*dma_mask;
 	void		*driver_data;
 	unsigned int	irq;
+#define	LINUX_IRQ_INVALID	65535
 	unsigned int	msix;
 	unsigned int	msix_max;
 	const struct attribute_group **groups;

Modified: stable/11/sys/compat/linuxkpi/common/src/linux_pci.c
==============================================================================
--- stable/11/sys/compat/linuxkpi/common/src/linux_pci.c	Mon Dec 19 09:40:29 2016	(r310245)
+++ stable/11/sys/compat/linuxkpi/common/src/linux_pci.c	Mon Dec 19 09:41:49 2016	(r310246)
@@ -144,7 +144,7 @@ linux_pci_attach(device_t dev)
 	if (rle)
 		pdev->dev.irq = rle->start;
 	else
-		pdev->dev.irq = 255;
+		pdev->dev.irq = LINUX_IRQ_INVALID;
 	pdev->irq = pdev->dev.irq;
 	DROP_GIANT();
 	spin_lock(&pci_lock);


More information about the svn-src-all mailing list