1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
|
From 00cf359b486a3d14c29014e9d57d92ab81972866 Mon Sep 17 00:00:00 2001
From: Christian Marangi <ansuelsmth@gmail.com>
Date: Tue, 9 May 2023 14:03:08 +0200
Subject: [PATCH] drivers: mtd: nand: macronix: comment unused function
Comment unused function since macronix_nand_block_protection_support
cause booting problems.
Signed-off-by: Christian Marangi <ansuelsmth@gmail.com>
---
drivers/mtd/nand/raw/nand_macronix.c | 132 +++++++++++++--------------
1 file changed, 66 insertions(+), 66 deletions(-)
--- a/drivers/mtd/nand/raw/nand_macronix.c
+++ b/drivers/mtd/nand/raw/nand_macronix.c
@@ -179,72 +179,72 @@ static void macronix_nand_fix_broken_get
ONFI_FEATURE_ADDR_TIMING_MODE, 1);
}
-/*
- * Macronix NAND supports Block Protection by Protectoin(PT) pin;
- * active high at power-on which protects the entire chip even the #WP is
- * disabled. Lock/unlock protection area can be partition according to
- * protection bits, i.e. upper 1/2 locked, upper 1/4 locked and so on.
- */
-static int mxic_nand_lock(struct nand_chip *chip, loff_t ofs, uint64_t len)
-{
- u8 feature[ONFI_SUBFEATURE_PARAM_LEN];
- int ret;
-
- feature[0] = MXIC_BLOCK_PROTECTION_ALL_LOCK;
- nand_select_target(chip, 0);
- ret = nand_set_features(chip, ONFI_FEATURE_ADDR_MXIC_PROTECTION,
- feature);
- nand_deselect_target(chip);
- if (ret)
- pr_err("%s all blocks failed\n", __func__);
-
- return ret;
-}
-
-static int mxic_nand_unlock(struct nand_chip *chip, loff_t ofs, uint64_t len)
-{
- u8 feature[ONFI_SUBFEATURE_PARAM_LEN];
- int ret;
-
- feature[0] = MXIC_BLOCK_PROTECTION_ALL_UNLOCK;
- nand_select_target(chip, 0);
- ret = nand_set_features(chip, ONFI_FEATURE_ADDR_MXIC_PROTECTION,
- feature);
- nand_deselect_target(chip);
- if (ret)
- pr_err("%s all blocks failed\n", __func__);
-
- return ret;
-}
-
-static void macronix_nand_block_protection_support(struct nand_chip *chip)
-{
- u8 feature[ONFI_SUBFEATURE_PARAM_LEN];
- int ret;
-
- bitmap_set(chip->parameters.get_feature_list,
- ONFI_FEATURE_ADDR_MXIC_PROTECTION, 1);
-
- feature[0] = MXIC_BLOCK_PROTECTION_ALL_UNLOCK;
- nand_select_target(chip, 0);
- ret = nand_get_features(chip, ONFI_FEATURE_ADDR_MXIC_PROTECTION,
- feature);
- nand_deselect_target(chip);
- if (ret || feature[0] != MXIC_BLOCK_PROTECTION_ALL_LOCK) {
- if (ret)
- pr_err("Block protection check failed\n");
-
- bitmap_clear(chip->parameters.get_feature_list,
- ONFI_FEATURE_ADDR_MXIC_PROTECTION, 1);
- return;
- }
-
- bitmap_set(chip->parameters.set_feature_list,
- ONFI_FEATURE_ADDR_MXIC_PROTECTION, 1);
-
- chip->ops.lock_area = mxic_nand_lock;
- chip->ops.unlock_area = mxic_nand_unlock;
-}
+// /*
+// * Macronix NAND supports Block Protection by Protectoin(PT) pin;
+// * active high at power-on which protects the entire chip even the #WP is
+// * disabled. Lock/unlock protection area can be partition according to
+// * protection bits, i.e. upper 1/2 locked, upper 1/4 locked and so on.
+// */
+// static int mxic_nand_lock(struct nand_chip *chip, loff_t ofs, uint64_t len)
+// {
+// u8 feature[ONFI_SUBFEATURE_PARAM_LEN];
+// int ret;
+
+// feature[0] = MXIC_BLOCK_PROTECTION_ALL_LOCK;
+// nand_select_target(chip, 0);
+// ret = nand_set_features(chip, ONFI_FEATURE_ADDR_MXIC_PROTECTION,
+// feature);
+// nand_deselect_target(chip);
+// if (ret)
+// pr_err("%s all blocks failed\n", __func__);
+
+// return ret;
+// }
+
+// static int mxic_nand_unlock(struct nand_chip *chip, loff_t ofs, uint64_t len)
+// {
+// u8 feature[ONFI_SUBFEATURE_PARAM_LEN];
+// int ret;
+
+// feature[0] = MXIC_BLOCK_PROTECTION_ALL_UNLOCK;
+// nand_select_target(chip, 0);
+// ret = nand_set_features(chip, ONFI_FEATURE_ADDR_MXIC_PROTECTION,
+// feature);
+// nand_deselect_target(chip);
+// if (ret)
+// pr_err("%s all blocks failed\n", __func__);
+
+// return ret;
+// }
+
+// static void macronix_nand_block_protection_support(struct nand_chip *chip)
+// {
+// u8 feature[ONFI_SUBFEATURE_PARAM_LEN];
+// int ret;
+
+// bitmap_set(chip->parameters.get_feature_list,
+// ONFI_FEATURE_ADDR_MXIC_PROTECTION, 1);
+
+// feature[0] = MXIC_BLOCK_PROTECTION_ALL_UNLOCK;
+// nand_select_target(chip, 0);
+// ret = nand_get_features(chip, ONFI_FEATURE_ADDR_MXIC_PROTECTION,
+// feature);
+// nand_deselect_target(chip);
+// if (ret || feature[0] != MXIC_BLOCK_PROTECTION_ALL_LOCK) {
+// if (ret)
+// pr_err("Block protection check failed\n");
+
+// bitmap_clear(chip->parameters.get_feature_list,
+// ONFI_FEATURE_ADDR_MXIC_PROTECTION, 1);
+// return;
+// }
+
+// bitmap_set(chip->parameters.set_feature_list,
+// ONFI_FEATURE_ADDR_MXIC_PROTECTION, 1);
+
+// chip->ops.lock_area = mxic_nand_lock;
+// chip->ops.unlock_area = mxic_nand_unlock;
+// }
static int nand_power_down_op(struct nand_chip *chip)
{
|
