mpc85xx: add missing devicetree ranges property for ethernet devices
[openwrt/svn-archive/archive.git] / target / linux / mpc85xx / patches-3.14 / 210-spi-fsl-espi-preallocate-local-buffer.patch
1 From: Gabor Juhos <juhosg@openwrt.org>
2 Subject: spi-fsl-espi: avoid frequent high order allocations
3
4 The driver allocates 64KiB of memory fro a local buffer before
5 each transfer and releases that afterwards. When the memory is
6 fragmented this allocation often fails and causes a warning like
7 this:
8
9 kworker/u2:2: page allocation failure: order:4, mode:0x10c0d0
10 CPU: 0 PID: 7011 Comm: kworker/u2:2 Not tainted 3.10.24 #1
11 Workqueue: ffe07000.spi mpc8xxx_spi_work
12 Call Trace:
13 [c1c6dcf0] [c0006914] show_stack+0x50/0x170 (unreliable)
14 [c1c6dd30] [c0259858] dump_stack+0x24/0x34
15 [c1c6dd40] [c00672e8] warn_alloc_failed+0x120/0x13c
16 [c1c6dd90] [c0069920] __alloc_pages_nodemask+0x574/0x5c8
17 [c1c6de20] [c0069990] __get_free_pages+0x1c/0x4c
18 [c1c6de30] [c0185174] fsl_espi_do_one_msg+0x128/0x2a0
19 [c1c6de90] [c0184290] mpc8xxx_spi_work+0x50/0x7c
20 [c1c6dea0] [c0037af8] process_one_work+0x208/0x30c
21 [c1c6dec0] [c00387a0] worker_thread+0x20c/0x308
22 [c1c6def0] [c003de60] kthread+0xa4/0xa8
23 [c1c6df40] [c000c4bc] ret_from_kernel_thread+0x5c/0x64
24
25 m25p80 spi0.0: error -12 reading SR
26 end_request: I/O error, dev mtdblock3, sector 680
27 SQUASHFS error: squashfs_read_data failed to read block 0x54a4a
28 SQUASHFS error: Unable to read data cache entry [54a4a]
29
30 Preallocate the buffer from the probe routine to avoid
31 this.
32
33 Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
34 ---
35 drivers/spi/spi-fsl-espi.c | 34 ++++++++++++++++------------------
36 drivers/spi/spi-fsl-lib.h | 1 +
37 2 files changed, 17 insertions(+), 18 deletions(-)
38
39 --- a/drivers/spi/spi-fsl-espi.c
40 +++ b/drivers/spi/spi-fsl-espi.c
41 @@ -334,17 +334,13 @@ static void fsl_espi_do_trans(struct spi
42 static void fsl_espi_cmd_trans(struct spi_message *m,
43 struct fsl_espi_transfer *trans, u8 *rx_buff)
44 {
45 + struct spi_device *spi = m->spi;
46 + struct mpc8xxx_spi *mspi = spi_master_get_devdata(spi->master);
47 struct spi_transfer *t;
48 - u8 *local_buf;
49 + u8 *local_buf = mspi->local_buf;
50 int i = 0;
51 struct fsl_espi_transfer *espi_trans = trans;
52
53 - local_buf = kzalloc(SPCOM_TRANLEN_MAX, GFP_KERNEL);
54 - if (!local_buf) {
55 - espi_trans->status = -ENOMEM;
56 - return;
57 - }
58 -
59 list_for_each_entry(t, &m->transfers, transfer_list) {
60 if (t->tx_buf) {
61 memcpy(local_buf + i, t->tx_buf, t->len);
62 @@ -357,28 +353,23 @@ static void fsl_espi_cmd_trans(struct sp
63 fsl_espi_do_trans(m, espi_trans);
64
65 espi_trans->actual_length = espi_trans->len;
66 - kfree(local_buf);
67 }
68
69 static void fsl_espi_rw_trans(struct spi_message *m,
70 struct fsl_espi_transfer *trans, u8 *rx_buff)
71 {
72 + struct spi_device *spi = m->spi;
73 + struct mpc8xxx_spi *mspi = spi_master_get_devdata(spi->master);
74 struct fsl_espi_transfer *espi_trans = trans;
75 unsigned int n_tx = espi_trans->n_tx;
76 unsigned int n_rx = espi_trans->n_rx;
77 struct spi_transfer *t;
78 - u8 *local_buf;
79 + u8 *local_buf = mspi->local_buf;
80 u8 *rx_buf = rx_buff;
81 unsigned int trans_len;
82 unsigned int addr;
83 int i, pos, loop;
84
85 - local_buf = kzalloc(SPCOM_TRANLEN_MAX, GFP_KERNEL);
86 - if (!local_buf) {
87 - espi_trans->status = -ENOMEM;
88 - return;
89 - }
90 -
91 for (pos = 0, loop = 0; pos < n_rx; pos += trans_len, loop++) {
92 trans_len = n_rx - pos;
93 if (trans_len > SPCOM_TRANLEN_MAX - n_tx)
94 @@ -412,8 +403,6 @@ static void fsl_espi_rw_trans(struct spi
95 else
96 espi_trans->actual_length += espi_trans->len;
97 }
98 -
99 - kfree(local_buf);
100 }
101
102 static void fsl_espi_do_one_msg(struct spi_message *m)
103 @@ -581,6 +570,7 @@ static irqreturn_t fsl_espi_irq(s32 irq,
104 static void fsl_espi_remove(struct mpc8xxx_spi *mspi)
105 {
106 iounmap(mspi->reg_base);
107 + kfree(mspi->local_buf);
108 }
109
110 static struct spi_master * fsl_espi_probe(struct device *dev,
111 @@ -612,10 +602,16 @@ static struct spi_master * fsl_espi_prob
112 mpc8xxx_spi->spi_do_one_msg = fsl_espi_do_one_msg;
113 mpc8xxx_spi->spi_remove = fsl_espi_remove;
114
115 + mpc8xxx_spi->local_buf = kzalloc(SPCOM_TRANLEN_MAX, GFP_KERNEL);
116 + if (!mpc8xxx_spi->local_buf) {
117 + ret = -ENOMEM;
118 + goto err_probe;
119 + }
120 +
121 mpc8xxx_spi->reg_base = ioremap(mem->start, resource_size(mem));
122 if (!mpc8xxx_spi->reg_base) {
123 ret = -ENOMEM;
124 - goto err_probe;
125 + goto free_buf;
126 }
127
128 reg_base = mpc8xxx_spi->reg_base;
129 @@ -658,6 +654,8 @@ unreg_master:
130 free_irq(mpc8xxx_spi->irq, mpc8xxx_spi);
131 free_irq:
132 iounmap(mpc8xxx_spi->reg_base);
133 +free_buf:
134 + kfree(mpc8xxx_spi->local_buf);
135 err_probe:
136 spi_master_put(master);
137 err:
138 --- a/drivers/spi/spi-fsl-lib.h
139 +++ b/drivers/spi/spi-fsl-lib.h
140 @@ -30,6 +30,7 @@ struct mpc8xxx_spi {
141 void *rx;
142 #ifdef CONFIG_SPI_FSL_ESPI
143 int len;
144 + u8 *local_buf;
145 #endif
146
147 int subblock;