Accueil Explorer Aide
S'inscrire Connexion
wareck
/
openwrt-archive
1
0
Fork 0
Fichiers Tickets 0 Pull Requests 0 Wiki
Aborescence: 2f76d8f3a7
Branches Tags
openwrt-archive
/
target
/
linux
/
ixp4xx
/
patches-4.1
/
312-ixp4xx_pata_optimization.patch

312-ixp4xx_pata_optimization.patch 3.4 KB
Historique Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137 
  1. --- a/drivers/ata/pata_ixp4xx_cf.c
    2. 

  2. +++ b/drivers/ata/pata_ixp4xx_cf.c
    3. 

  3. @@ -24,16 +24,58 @@
    4. 

  4.  #include <scsi/scsi_host.h>
    5. 

  5.  
    6. 

  6.  #define DRV_NAME	"pata_ixp4xx_cf"
    7. 

  7. -#define DRV_VERSION	"0.2"
    8. 

  8. +#define DRV_VERSION	"0.3"
    9. 

  9.  
    10. 

  10.  static int ixp4xx_set_mode(struct ata_link *link, struct ata_device **error)
    11. 

  11.  {
    12. 

  12. +	struct ixp4xx_pata_data *data = link->ap->host->dev->platform_data;
    13. 

  13. +	unsigned int pio_mask;
    14. 

  14.  	struct ata_device *dev;
    15. 

  15.  
    16. 

  16.  	ata_for_each_dev(dev, link, ENABLED) {
    17. 

  17. -		ata_dev_info(dev, "configured for PIO0\n");
    18. 

  18. -		dev->pio_mode = XFER_PIO_0;
    19. 

  19. -		dev->xfer_mode = XFER_PIO_0;
    20. 

  20. +		if (dev->id[ATA_ID_FIELD_VALID] & (1 << 1)) {
    21. 

  21. +			pio_mask = dev->id[ATA_ID_PIO_MODES] & 0x03;
    22. 

  22. +			if (pio_mask & (1 << 1)) {
    23. 

  23. +				pio_mask = 4;
    24. 

  24. +			} else {
    25. 

  25. +				pio_mask = 3;
    26. 

  26. +			}
    27. 

  27. +		} else {
    28. 

  28. +			pio_mask = (dev->id[ATA_ID_OLD_PIO_MODES] >> 8);
    29. 

  29. +		}
    30. 

  30. +
    31. 

  31. +		switch (pio_mask){
    32. 

  32. +			case 0:
    33. 

  33. +				ata_dev_printk(dev, KERN_INFO, "configured for PIO0\n");
    34. 

  34. +				dev->pio_mode = XFER_PIO_0;
    35. 

  35. +				dev->xfer_mode = XFER_PIO_0;
    36. 

  36. +				*data->cs0_cfg = 0x8a473c03;
    37. 

  37. +				break;
    38. 

  38. +			case 1:
    39. 

  39. +				ata_dev_printk(dev, KERN_INFO, "configured for PIO1\n");
    40. 

  40. +				dev->pio_mode = XFER_PIO_1;
    41. 

  41. +				dev->xfer_mode = XFER_PIO_1;
    42. 

  42. +				*data->cs0_cfg = 0x86433c03;
    43. 

  43. +				break;
    44. 

  44. +			case 2:
    45. 

  45. +				ata_dev_printk(dev, KERN_INFO, "configured for PIO2\n");
    46. 

  46. +				dev->pio_mode = XFER_PIO_2;
    47. 

  47. +				dev->xfer_mode = XFER_PIO_2;
    48. 

  48. +				*data->cs0_cfg = 0x82413c03;
    49. 

  49. +				break;
    50. 

  50. +			case 3:
    51. 

  51. +				ata_dev_printk(dev, KERN_INFO, "configured for PIO3\n");
    52. 

  52. +				dev->pio_mode = XFER_PIO_3;
    53. 

  53. +				dev->xfer_mode = XFER_PIO_3;
    54. 

  54. +				*data->cs0_cfg = 0x80823c03;
    55. 

  55. +				break;
    56. 

  56. +			case 4:
    57. 

  57. +				ata_dev_printk(dev, KERN_INFO, "configured for PIO4\n");
    58. 

  58. +				dev->pio_mode = XFER_PIO_4;
    59. 

  59. +				dev->xfer_mode = XFER_PIO_4;
    60. 

  60. +				*data->cs0_cfg = 0x80403c03;
    61. 

  61. +				break;
    62. 

  62. +		}
    63. 

  63.  		dev->xfer_shift = ATA_SHIFT_PIO;
    64. 

  64.  		dev->flags |= ATA_DFLAG_PIO;
    65. 

  65.  	}
    66. 

  66. @@ -46,6 +88,7 @@ static unsigned int ixp4xx_mmio_data_xfe
    67. 

  67.  	unsigned int i;
    68. 

  68.  	unsigned int words = buflen >> 1;
    69. 

  69.  	u16 *buf16 = (u16 *) buf;
    70. 

  70. +	unsigned int pio_mask;
    71. 

  71.  	struct ata_port *ap = dev->link->ap;
    72. 

  72.  	void __iomem *mmio = ap->ioaddr.data_addr;
    73. 

  73.  	struct ixp4xx_pata_data *data = dev_get_platdata(ap->host->dev);
    74. 

  74. @@ -53,8 +96,34 @@ static unsigned int ixp4xx_mmio_data_xfe
    75. 

  75.  	/* set the expansion bus in 16bit mode and restore
    76. 

  76.  	 * 8 bit mode after the transaction.
    77. 

  77.  	 */
    78. 

  78. -	*data->cs0_cfg &= ~(0x01);
    79. 

  79. -	udelay(100);
    80. 

  80. +	if (dev->id[ATA_ID_FIELD_VALID] & (1 << 1)){
    81. 

  81. +		pio_mask = dev->id[ATA_ID_PIO_MODES] & 0x03;
    82. 

  82. +		if (pio_mask & (1 << 1)){
    83. 

  83. +			pio_mask = 4;
    84. 

  84. +		}else{
    85. 

  85. +			pio_mask = 3;
    86. 

  86. +		}
    87. 

  87. +	}else{
    88. 

  88. +		pio_mask = (dev->id[ATA_ID_OLD_PIO_MODES] >> 8);
    89. 

  89. +	}
    90. 

  90. +	switch (pio_mask){
    91. 

  91. +		case 0:
    92. 

  92. +			*data->cs0_cfg = 0xa9643c42;
    93. 

  93. +		break;
    94. 

  94. +		case 1:
    95. 

  95. +			*data->cs0_cfg = 0x85033c42;
    96. 

  96. +		break;
    97. 

  97. +		case 2:
    98. 

  98. +			*data->cs0_cfg = 0x80b23c42;
    99. 

  99. +		break;
    100. 

  100. +		case 3:
    101. 

  101. +			*data->cs0_cfg = 0x80823c42;
    102. 

  102. +		break;
    103. 

  103. +		case 4:
    104. 

  104. +			*data->cs0_cfg = 0x80403c42;
    105. 

  105. +		break;
    106. 

  106. +	}
    107. 

  107. +	udelay(5);
    108. 

  108.  
    109. 

  109.  	/* Transfer multiple of 2 bytes */
    110. 

  110.  	if (rw == READ)
    111. 

  111. @@ -79,8 +148,24 @@ static unsigned int ixp4xx_mmio_data_xfe
    112. 

  112.  		words++;
    113. 

  113.  	}
    114. 

  114.  
    115. 

  115. -	udelay(100);
    116. 

  116. -	*data->cs0_cfg |= 0x01;
    117. 

  117. +	udelay(5);
    118. 

  118. +	switch (pio_mask){
    119. 

  119. +		case 0:
    120. 

  120. +			*data->cs0_cfg = 0x8a473c03;
    121. 

  121. +		break;
    122. 

  122. +		case 1:
    123. 

  123. +			*data->cs0_cfg = 0x86433c03;
    124. 

  124. +		break;
    125. 

  125. +		case 2:
    126. 

  126. +			*data->cs0_cfg = 0x82413c03;
    127. 

  127. +		break;
    128. 

  128. +		case 3:
    129. 

  129. +			*data->cs0_cfg = 0x80823c03;
    130. 

  130. +		break;
    131. 

  131. +		case 4:
    132. 

  132. +			*data->cs0_cfg = 0x80403c03;
    133. 

  133. +		break;
    134. 

  134. +	}
    135. 

  135.  
    136. 

  136.  	return words << 1;
    137. 

  137.  }
    138.