Página Principal Explorar Ajuda
Iniciar Sessão
OpenWrt
/
openwrt
mirror de https://github.com/openwrt/openwrt.git
2
0
Fork 0
Ficheiros Problemas 0 Wiki
Árvore: d8ab910fdc
Ramos Etiquetas
openwrt
/
target
/
linux
/
generic-2.4
/
patches
/
008-intel_flashchip_fix.patch

008-intel_flashchip_fix.patch 3.0 KB
Histórico Em bruto

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103 
  1. Index: linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0001.c
    2. 

  2. ===================================================================
    3. 

  3. --- linux-2.4.35.4.orig/drivers/mtd/chips/cfi_cmdset_0001.c
    4. 

  4. +++ linux-2.4.35.4/drivers/mtd/chips/cfi_cmdset_0001.c
    5. 

  5. @@ -28,10 +28,18 @@
    6. 

  6.  #include <linux/slab.h>
    7. 

  7.  #include <linux/delay.h>
    8. 

  8.  #include <linux/interrupt.h>
    9. 

  9. +#include <linux/notifier.h>
    10. 

  10. +#include <linux/reboot.h>
    11. 

  11.  #include <linux/mtd/map.h>
    12. 

  12.  #include <linux/mtd/cfi.h>
    13. 

  13.  #include <linux/mtd/compatmac.h>
    14. 

  14.  
    15. 

  15. +#ifndef container_of
    16. 

  16. +#define container_of(ptr, type, member) ({                      \
    17. 

  17. +		        const typeof( ((type *)0)->member ) *__mptr = (ptr);    \
    18. 

  18. +			        (type *)( (char *)__mptr - offsetof(type,member) );})
    19. 

  19. +#endif
    20. 

  20. +
    21. 

  21.  // debugging, turns off buffer write mode #define FORCE_WORD_WRITE
    22. 

  22.  
    23. 

  23.  static int cfi_intelext_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
    24. 

  24. @@ -45,6 +53,7 @@ static int cfi_intelext_lock(struct mtd_
    25. 

  25.  static int cfi_intelext_unlock(struct mtd_info *mtd, loff_t ofs, size_t len);
    26. 

  26.  static int cfi_intelext_suspend (struct mtd_info *);
    27. 

  27.  static void cfi_intelext_resume (struct mtd_info *);
    28. 

  28. +static int cfi_intelext_reboot(struct notifier_block *nb, unsigned long val, void *v);
    29. 

  29.  
    30. 

  30.  static void cfi_intelext_destroy(struct mtd_info *);
    31. 

  31.  
    32. 

  32. @@ -288,6 +297,9 @@ static struct mtd_info *cfi_intelext_set
    33. 

  33.  	map->fldrv = &cfi_intelext_chipdrv;
    34. 

  34.  	MOD_INC_USE_COUNT;
    35. 

  35.  	mtd->name = map->name;
    36. 

  36. +	mtd->reboot_notifier.notifier_call = cfi_intelext_reboot;
    37. 

  37. +	register_reboot_notifier(&mtd->reboot_notifier);
    38. 

  38. +
    39. 

  39.  	return mtd;
    40. 

  40.  
    41. 

  41.   setup_err:
    42. 

  42. @@ -1961,10 +1973,40 @@ static void cfi_intelext_resume(struct m
    43. 

  43.  	}
    44. 

  44.  }
    45. 

  45.  
    46. 

  46. +
    47. 

  47. +static void cfi_intelext_reset(struct mtd_info *mtd)
    48. 

  48. +{
    49. 

  49. +	struct map_info *map = mtd->priv;
    50. 

  50. +	struct cfi_private *cfi = map->fldrv_priv;
    51. 

  51. +	int i;
    52. 

  52. +	struct flchip *chip;
    53. 

  53. +
    54. 

  54. +	cfi_intelext_sync(mtd);
    55. 

  55. +	for (i=0; i<cfi->numchips; i++) {
    56. 

  56. +		chip = &cfi->chips[i];
    57. 

  57. +		
    58. 

  58. +		spin_lock(chip->mutex);
    59. 

  59. +		cfi_write(map, CMD(0xFF), 0);
    60. 

  60. +		chip->state = FL_READY;
    61. 

  61. +		spin_unlock(chip->mutex);
    62. 

  62. +	}
    63. 

  63. +}
    64. 

  64. +
    65. 

  65. +static int cfi_intelext_reboot(struct notifier_block *nb, unsigned long val, void *v)
    66. 

  66. +{
    67. 

  67. +	struct mtd_info *mtd;
    68. 

  68. +
    69. 

  69. +	mtd = container_of(nb, struct mtd_info, reboot_notifier);
    70. 

  70. +	cfi_intelext_reset(mtd);
    71. 

  71. +	return NOTIFY_DONE;
    72. 

  72. +}
    73. 

  73. +
    74. 

  74.  static void cfi_intelext_destroy(struct mtd_info *mtd)
    75. 

  75.  {
    76. 

  76.  	struct map_info *map = mtd->priv;
    77. 

  77.  	struct cfi_private *cfi = map->fldrv_priv;
    78. 

  78. +	cfi_intelext_reset(mtd);
    79. 

  79. +	unregister_reboot_notifier(&mtd->reboot_notifier);
    80. 

  80.  	kfree(cfi->cmdset_priv);
    81. 

  81.  	kfree(cfi->cfiq);
    82. 

  82.  	kfree(cfi);
    83. 

  83. Index: linux-2.4.35.4/include/linux/mtd/mtd.h
    84. 

  84. ===================================================================
    85. 

  85. --- linux-2.4.35.4.orig/include/linux/mtd/mtd.h
    86. 

  86. +++ linux-2.4.35.4/include/linux/mtd/mtd.h
    87. 

  87. @@ -10,6 +10,7 @@
    88. 

  88.  #include <linux/version.h>
    89. 

  89.  #include <linux/types.h>
    90. 

  90.  #include <linux/mtd/compatmac.h>
    91. 

  91. +#include <linux/notifier.h>
    92. 

  92.  #include <linux/module.h>
    93. 

  93.  #include <linux/uio.h>
    94. 

  94.  
    95. 

  95. @@ -217,6 +218,8 @@ struct mtd_info {
    96. 

  96.  	int (*suspend) (struct mtd_info *mtd);
    97. 

  97.  	void (*resume) (struct mtd_info *mtd);
    98. 

  98.  
    99. 

  99. +	struct notifier_block reboot_notifier;
    100. 

  100. +
    101. 

  101.  	void *priv;
    102. 

  102.  };
    103. 

  103.  
    104.