Hi,
Can you revert previous patch and apply new patch and re-try the capture
of dmesg and wire?
--HPS
Index: sys/compat/linuxkpi/common/include/linux/device.h
===================================================================
--- sys/compat/linuxkpi/common/include/linux/device.h (revision 350625)
+++ sys/compat/linuxkpi/common/include/linux/device.h (working copy)
@@ -110,8 +110,8 @@
void *driver_data;
unsigned int irq;
#define LINUX_IRQ_INVALID 65535
- unsigned int msix;
- unsigned int msix_max;
+ unsigned int irq_start;
+ unsigned int irq_end;
const struct attribute_group **groups;
struct fwnode_handle *fwnode;
Index: sys/compat/linuxkpi/common/include/linux/interrupt.h
===================================================================
--- sys/compat/linuxkpi/common/include/linux/interrupt.h (revision 350625)
+++ sys/compat/linuxkpi/common/include/linux/interrupt.h (working copy)
@@ -55,9 +55,11 @@
static inline int
linux_irq_rid(struct device *dev, unsigned int irq)
{
- if (irq == dev->irq)
+ /* check for MSI- or MSIX- interrupt */
+ if (irq >= dev->irq_start && irq < dev->irq_end)
+ return (irq - dev->irq_start + 1);
+ else
return (0);
- return irq - dev->msix + 1;
}
extern void linux_irq_handler(void *);
Index: sys/compat/linuxkpi/common/include/linux/pci.h
===================================================================
--- sys/compat/linuxkpi/common/include/linux/pci.h (revision 350625)
+++ sys/compat/linuxkpi/common/include/linux/pci.h (working copy)
@@ -228,6 +228,7 @@
unsigned int devfn;
uint32_t class;
uint8_t revision;
+ bool msi_enabled;
};
static inline struct resource_list_entry *
@@ -262,7 +263,7 @@
spin_lock(&pci_lock);
list_for_each_entry(pdev, &pci_devices, links) {
if (irq == pdev->dev.irq ||
- (irq >= pdev->dev.msix && irq < pdev->dev.msix_max)) {
+ (irq >= pdev->dev.irq_start && irq < pdev->dev.irq_end)) {
found = &pdev->dev;
break;
}
@@ -424,10 +425,25 @@
* linux_pci_find_irq_dev() does no longer see them by
* resetting their references to zero:
*/
- pdev->dev.msix = 0;
- pdev->dev.msix_max = 0;
+ pdev->dev.irq_start = 0;
+ pdev->dev.irq_end = 0;
}
+#define pci_disable_msi(pdev) \
+ linux_pci_disable_msi(pdev)
+
+static inline void
+linux_pci_disable_msi(struct pci_dev *pdev)
+{
+
+ pci_release_msi(pdev->dev.bsddev);
+
+ pdev->dev.irq_start = 0;
+ pdev->dev.irq_end = 0;
+ pdev->irq = pdev->dev.irq;
+ pdev->msi_enabled = false;
+}
+
unsigned long pci_resource_start(struct pci_dev *pdev, int bar);
unsigned long pci_resource_len(struct pci_dev *pdev, int bar);
@@ -562,10 +578,10 @@
return avail;
}
rle = linux_pci_get_rle(pdev, SYS_RES_IRQ, 1);
- pdev->dev.msix = rle->start;
- pdev->dev.msix_max = rle->start + avail;
+ pdev->dev.irq_start = rle->start;
+ pdev->dev.irq_end = rle->start + avail;
for (i = 0; i < nreq; i++)
- entries[i].vector = pdev->dev.msix + i;
+ entries[i].vector = pdev->dev.irq_start + i;
return (0);
}
@@ -595,7 +611,33 @@
return (nvec);
}
+#define pci_enable_msi(pdev) \
+ linux_pci_enable_msi(pdev)
+
static inline int
+pci_enable_msi(struct pci_dev *pdev)
+{
+ struct resource_list_entry *rle;
+ int error;
+ int avail;
+
+ avail = pci_msi_count(pdev->dev.bsddev);
+ if (avail < 1)
+ return -EINVAL;
+
+ avail = 1; /* this function only enable one MSI IRQ */
+ if ((error = -pci_alloc_msi(pdev->dev.bsddev, &avail)) != 0)
+ return error;
+
+ rle = linux_pci_get_rle(pdev, SYS_RES_IRQ, 1);
+ pdev->dev.irq_start = rle->start;
+ pdev->dev.irq_end = rle->start + avail;
+ pdev->irq = rle->start;
+ pdev->msi_enabled = true;
+ return (0);
+}
+
+static inline int
pci_channel_offline(struct pci_dev *pdev)
{
Index: sys/dev/usb/controller/xhci.c
===================================================================
--- sys/dev/usb/controller/xhci.c (revision 350625)
+++ sys/dev/usb/controller/xhci.c (working copy)
@@ -1454,6 +1454,12 @@
/* execute set address command */
usbd_get_page(&hdev->input_pc, 0, &buf_inp);
+ /* wait 20ms */
+ if (address != 0) {
+ printf("WAITING A BIT\n");
+ usb_pause_mtx(NULL, hz / 50);
+ }
+
err = xhci_cmd_set_address(sc, buf_inp.physaddr,
(address == 0), index);
_______________________________________________
freebsd-usb@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-usb
To unsubscribe, send any mail to "freebsd-usb-unsubscr...@freebsd.org"
