14.05, dde_linux patch issue?

[Bob Stewart]

Thanks Christian.

The patch got through the first hunk for xhci-pci.c but failed on the 
hunk for xhci.c --

*/Work/Genode/genode-14.05/tool/ports$ ./prepare_port dde_linux**
**dde_linux  download https://github.com/nfeske/dwc_otg.git**
**Cloning into 'src/lib/dde_linux/drivers/usb/host/dwc_otg'...**
**remote: Counting objects: 233, done.**
**remote: Compressing objects: 100% (93/93), done.**
**remote: Total 233 (delta 138), reused 233 (delta 138)**
**Receiving objects: 100% (233/233), 420.95 KiB, done.**
**Resolving deltas: 100% (138/138), done.**
**dde_linux  update src/lib/dde_linux/drivers/usb/host/dwc_otg**
**dde_linux  download 
http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.9.tar.gz**
**dde_linux  extract linux-3.9.tar.gz**
**dde_linux  extract linux-3.9.tar.gz**
**dde_linux  apply patches/*.patch**
**The text leading up to this was:**
**--------------------------**
**|diff -r a103aef8f269 drivers/usb/host/xhci-pci.c**
**|--- a/drivers/usb/host/xhci-pci.c    Wed Mar 05 13:54:43 2014 +0100**
**|+++ b/drivers/usb/host/xhci-pci.c    Wed Mar 05 13:58:50 2014 +0100**
**--------------------------**
**File to patch:*

Comparing my patched repos/dde_linux/patches/xhci-quirks.patch with the 
one just updated n the github staging branch, they are identical. This 
is mine:
diff -r a103aef8f269 drivers/usb/host/xhci-pci.c
--- a/drivers/usb/host/xhci-pci.c       Wed Mar 05 13:54:43 2014 +0100
+++ b/drivers/usb/host/xhci-pci.c       Wed Mar 05 13:58:50 2014 +0100
@@ -34,6 +34,8 @@
  #define PCI_VENDOR_ID_ETRON            0x1b6f
  #define PCI_DEVICE_ID_ASROCK_P67       0x7023

+#define PCI_VENDOR_ID_RENESAS  0x1912
+
  static const char hcd_name[] = "xhci_hcd";

  /* called after powerup, by probe or system-pm "wakeup" */
@@ -81,6 +83,10 @@
         if (pdev->vendor == PCI_VENDOR_ID_NEC)
                 xhci->quirks |= XHCI_NEC_HOST;

+       /* Quirk for RENESAS USB 3.0 express cards */
+        if (pdev->vendor == PCI_VENDOR_ID_RENESAS)
+               xhci->quirks |= XHCI_TRUST_TX_LENGTH;
+
         if (pdev->vendor == PCI_VENDOR_ID_AMD && xhci->hci_version == 0x96)
                 xhci->quirks |= XHCI_AMD_0x96_HOST;

diff -r a103aef8f269 drivers/usb/host/xhci.c
--- a/drivers/usb/host/xhci.c   Wed Mar 05 13:54:43 2014 +0100
+++ b/drivers/usb/host/xhci.c   Wed Mar 05 13:58:50 2014 +0100
@@ -4683,6 +4683,14 @@

         get_quirks(dev, xhci);

+
+       /* In xhci controllers which follow xhci 1.0 spec gives a spurious
+        * success event after a short transfer. This quirk will ignore such
+        * spurious event (This is taken from Linux 3.13)
+        */
+       if (xhci->hci_version > 0x96)
+               xhci->quirks |= XHCI_SPURIOUS_SUCCESS;
+
         /* Make sure the HC is halted. */
         retval = xhci_halt(xhci);
         if (retval)

in my config directory, xhci.c has the patch applied correctly after 4683.

Prior to running the tool, I remove the dde_linux directory that had 
been created in my contrib directory from Friday's attempt.

Bob


On 06/02/2014 05:07 AM, Christian Helmuth wrote:
> Hello,
>
> I removed the .swp file from our patch file. Could your please try it
> on your side with the attached patch?
>
> Greets
>
>
> ------------------------------------------------------------------------------
> Learn Graph Databases - Download FREE O'Reilly Book
> "Graph Databases" is the definitive new guide to graph databases and their
> applications. Written by three acclaimed leaders in the field,
> this first edition is now available. Download your free book today!
> http://p.sf.net/sfu/NeoTech
>
>
> _______________________________________________
> Genode-main mailing list
> Genode-main at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/genode-main

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.genode.org/pipermail/users/attachments/20140602/c5249b47/attachment.html>