Home Explore Help
Register Sign In
wareck
/
openwrt_lede
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 488fc98adf
Branches Tags
openwrt_lede
/
target
/
linux
/
mcs814x
/
patches-3.18
/
013-ohci_workarounds.patch

013-ohci_workarounds.patch 1.9 KB
History Raw

12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455565758596061626364 
  1. --- a/drivers/usb/host/ohci.h
    2. 

  2. +++ b/drivers/usb/host/ohci.h
    3. 

  3. @@ -122,7 +122,7 @@ struct td {
    4. 

  4.  	/* PSW is only for ISO.  Only 1 PSW entry is used, but on
    5. 

  5.  	 * big-endian PPC hardware that's the second entry.
    6. 

  6.  	 */
    7. 

  7. -#define MAXPSW	2
    8. 

  8. +#define MAXPSW	8
    9. 

  9.  	__hc16		hwPSW [MAXPSW];
    10. 

  10.  
    11. 

  11.  	/* rest are purely for the driver's use */
    12. 

  12. --- a/drivers/usb/host/ohci-hcd.c
    13. 

  13. +++ b/drivers/usb/host/ohci-hcd.c
    14. 

  14. @@ -441,6 +441,7 @@ static int ohci_init (struct ohci_hcd *o
    15. 

  15.  {
    16. 

  16.  	int ret;
    17. 

  17.  	struct usb_hcd *hcd = ohci_to_hcd(ohci);
    18. 

  18. +	u32 hcca_area;
    19. 

  19.  
    20. 

  20.  	/* Accept arbitrarily long scatter-gather lists */
    21. 

  21.  	hcd->self.sg_tablesize = ~0;
    22. 

  22. @@ -501,11 +502,13 @@ static int ohci_init (struct ohci_hcd *o
    23. 

  23.  			(unsigned long) ohci);
    24. 

  24.  	set_timer_slack(&ohci->io_watchdog, msecs_to_jiffies(20));
    25. 

  25.  
    26. 

  26. -	ohci->hcca = dma_alloc_coherent (hcd->self.controller,
    27. 

  27. -			sizeof(*ohci->hcca), &ohci->hcca_dma, GFP_KERNEL);
    28. 

  28. +	hcca_area = ohci_readl(ohci, &ohci->regs->hcca);
    29. 

  29. +	ohci->hcca = ioremap_nocache(hcca_area, sizeof *ohci->hcca);
    30. 

  30.  	if (!ohci->hcca)
    31. 

  31.  		return -ENOMEM;
    32. 

  32.  
    33. 

  33. +	ohci->hcca_dma = hcca_area;
    34. 

  34. +
    35. 

  35.  	if ((ret = ohci_mem_init (ohci)) < 0)
    36. 

  36.  		ohci_stop (hcd);
    37. 

  37.  	else {
    38. 

  38. @@ -523,6 +526,7 @@ static int ohci_init (struct ohci_hcd *o
    39. 

  39.   */
    40. 

  40.  static int ohci_run (struct ohci_hcd *ohci)
    41. 

  41.  {
    42. 

  42. +	int			i = 0;
    43. 

  43.  	u32			mask, val;
    44. 

  44.  	int			first = ohci->fminterval == 0;
    45. 

  45.  	struct usb_hcd		*hcd = ohci_to_hcd(ohci);
    46. 

  46. @@ -573,6 +577,8 @@ static int ohci_run (struct ohci_hcd *oh
    47. 

  47.  	msleep(val);
    48. 

  48.  
    49. 

  49.  	memset (ohci->hcca, 0, sizeof (struct ohci_hcca));
    50. 

  50. +	for (i = 0; i < NUM_INTS; i++)
    51. 

  51. +		ohci->hcca->int_table[i] = 0;
    52. 

  52.  
    53. 

  53.  	/* 2msec timelimit here means no irqs/preempt */
    54. 

  54.  	spin_lock_irq (&ohci->lock);
    55. 

  55. @@ -984,9 +990,6 @@ static void ohci_stop (struct usb_hcd *h
    56. 

  56.  	remove_debug_files (ohci);
    57. 

  57.  	ohci_mem_cleanup (ohci);
    58. 

  58.  	if (ohci->hcca) {
    59. 

  59. -		dma_free_coherent (hcd->self.controller,
    60. 

  60. -				sizeof *ohci->hcca,
    61. 

  61. -				ohci->hcca, ohci->hcca_dma);
    62. 

  62.  		ohci->hcca = NULL;
    63. 

  63.  		ohci->hcca_dma = 0;
    64. 

  64.  	}
    65.