Sorry to be a pest, but I came across the the following issue when trying to port dde_linux in the new 14.05 release:
*/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.swp** **|Binary file drivers/usb/host/.xhci-pci.c.swp has changed** **|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: *
Any help would be appreciated. Bob
Hi Bob,
Does one of the patch files in patches/ really contain a line for .xhci-pci.c.swp? That would be a bug as this file is a temporary Vim file...
Greets
Hi Christian, xhci-quirks.patch does.
Bob
Sent with AquaMail for Android http://www.aqua-mail.com
On June 1, 2014 9:59:54 AM Christian Helmuth <christian.helmuth@...1...> wrote:
Hi Bob,
Does one of the patch files in patches/ really contain a line for .xhci-pci.c.swp? That would be a bug as this file is a temporary Vim file...
Greets
Christian Helmuth Genode Labs
http://www.genode-labs.com/ · http://genode.org/ · /ˈdʒiː.nəʊd/
Genode Labs GmbH · Amtsgericht Dresden · HRB 28424 · Sitz Dresden Geschäftsführer: Dr.-Ing. Norman Feske, Christian Helmuth
Time is money. Stop wasting it! Get your web API in 5 minutes. www.restlet.com/download http://p.sf.net/sfu/restlet _______________________________________________ Genode-main mailing list Genode-main@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/genode-main
Hello,
I removed the .swp file from our patch file. Could your please try it on your side with the attached patch?
Greets
Hi,
On 06/02/2014 11: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
This should be fixed in Genode's staging branch (https://github.com/genodelabs/genode/tree/staging commit https://github.com/genodelabs/genode/commit/afebaf865b01ca6dcbd957cdfbacb845...).
Cheers,
Sebastian
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@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/genode-main
Hi Bob,
On Mon, Jun 02, 2014 at 11:52:28AM +0200, Sebastian Sumpf wrote:
This should be fixed in Genode's staging branch (https://github.com/genodelabs/genode/tree/staging commit https://github.com/genodelabs/genode/commit/afebaf865b01ca6dcbd957cdfbacb845...).
This commmit seems to have an remaining issue. Please use my patch file sent before.
Greets
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@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/genode-main
Missed your latest email, I'll use your patch.
Bob
Sent with AquaMail for Android http://www.aqua-mail.com
On June 2, 2014 8:12:05 AM Bob Stewart <robjsstewart@...196...> wrote:
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@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/genode-main
The problem appears to be the absence of the file xhci-pci.c from the contribution directory.
Bob
Sent with AquaMail for Android http://www.aqua-mail.com
On June 2, 2014 8:30:29 AM Robert J Stewart <robjsstewart@...196...> wrote:
Missed your latest email, I'll use your patch.
Bob
Sent with AquaMail for Android http://www.aqua-mail.com
On June 2, 2014 8:12:05 AM Bob Stewart <robjsstewart@...196...> wrote:
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@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/genode-main
So after applying Chirstian's patch and adding xhci-pci.c to repros/dde_linux/files.list, the prepare_port for dde_ Linux completes without error.
Bob
Sent with AquaMail for Android http://www.aqua-mail.com
On June 2, 2014 9:07:33 AM Robert J Stewart <robjsstewart@...196...> wrote:
The problem appears to be the absence of the file xhci-pci.c from the contribution directory.
Bob
Sent with AquaMail for Android http://www.aqua-mail.com
On June 2, 2014 8:30:29 AM Robert J Stewart <robjsstewart@...196...> wrote:
Missed your latest email, I'll use your patch.
Bob
Sent with AquaMail for Android http://www.aqua-mail.com
On June 2, 2014 8:12:05 AM Bob Stewart <robjsstewart@...196...> wrote:
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 ignoresuch
* 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@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/genode-main
Hello Bob,
it seems you're missing some pieces of 14.05. Did you rebase your work on top of the new release? When trying
me@...246...> git blame --follow repos/dde_linux/files.list | grep xhci-pci 5f084308 dde_linux/files.list (Sebastian Sumpf 2014-02-14 13:36:21 +0100 126) linux-3.9/drivers/usb/host/xhci-pci.c
I found out, that the line you're missing was added after 14.02 but it is part of 14.05. Maybe a merge-conflict resolution went wrong.
Regards
I must have missed the conflict on files.list, Christian. I did merge in additional files for musb that I had been working on in 14.02. It's fixed now!
Thanks for the help.
Bob
Sent with AquaMail for Android http://www.aqua-mail.com
On June 2, 2014 10:07:00 AM Christian Helmuth <christian.helmuth@...1...> wrote:
Hello Bob,
it seems you're missing some pieces of 14.05. Did you rebase your work on top of the new release? When trying
me@...246...> git blame --follow repos/dde_linux/files.list | grep xhci-pci 5f084308 dde_linux/files.list (Sebastian Sumpf 2014-02-14 13:36:21 +0100 126) linux-3.9/drivers/usb/host/xhci-pci.c
I found out, that the line you're missing was added after 14.02 but it is part of 14.05. Maybe a merge-conflict resolution went wrong.
Regards
Christian Helmuth Genode Labs
http://www.genode-labs.com/ · http://genode.org/ https://twitter.com/GenodeLabs · /ˈdʒiː.nəʊd/
Genode Labs GmbH · Amtsgericht Dresden · HRB 28424 · Sitz Dresden Geschäftsführer: Dr.-Ing. Norman Feske, Christian Helmuth
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@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/genode-main
-
Bob Stewart -
Christian Helmuth -
Robert J Stewart -
Sebastian Sumpf