add boot partition size

hc

2023-12-11 d2ccde1c8e90d38cee87a1b0309ad2827f3fd30d

 kernel/drivers/dma/coh901318.c
..
..
@@ -1,8 +1,8 @@
1
+// SPDX-License-Identifier: GPL-2.0-only
1
2
 /*
2
3
  * driver/dma/coh901318.c
3
4
  *
4
5
  * Copyright (C) 2007-2009 ST-Ericsson
5
- * License terms: GNU General Public License (GPL) version 2
6
6
  * DMA driver for COH 901 318
7
7
  * Author: Per Friden <per.friden@stericsson.com>
8
8
  */
..
..
@@ -1306,6 +1306,7 @@
1306
1306
 	unsigned long nbr_active_done;
1307
1307
 	unsigned long busy;
1308
1308
 
1309
+	struct dma_slave_config config;
1309
1310
 	u32 addr;
1310
1311
 	u32 ctrl;
1311
1312
 
..
..
@@ -1377,10 +1378,8 @@
1377
1378
 
1378
1379
 	dma_dentry = debugfs_create_dir("dma", NULL);
1379
1380
 
1380
-	(void) debugfs_create_file("status",
1381
-				   S_IFREG | S_IRUGO,
1382
-				   dma_dentry, NULL,
1383
-				   &coh901318_debugfs_status_operations);
1381
+	debugfs_create_file("status", S_IFREG | S_IRUGO, dma_dentry, NULL,
1382
+			    &coh901318_debugfs_status_operations);
1384
1383
 	return 0;
1385
1384
 }
1386
1385
 
..
..
@@ -1401,6 +1400,10 @@
1401
1400
 {
1402
1401
 	return container_of(chan, struct coh901318_chan, chan);
1403
1402
 }
1403
+
1404
+static int coh901318_dma_set_runtimeconfig(struct dma_chan *chan,
1405
+					   struct dma_slave_config *config,
1406
+					   enum dma_transfer_direction direction);
1404
1407
 
1405
1408
 static inline const struct coh901318_params *
1406
1409
 cohc_chan_param(struct coh901318_chan *cohc)
..
..
@@ -1865,9 +1868,9 @@
1865
1868
  * This tasklet is called from the interrupt handler to
1866
1869
  * handle each descriptor (DMA job) that is sent to a channel.
1867
1870
  */
1868
-static void dma_tasklet(unsigned long data)
1871
+static void dma_tasklet(struct tasklet_struct *t)
1869
1872
 {
1870
-	struct coh901318_chan *cohc = (struct coh901318_chan *) data;
1873
+	struct coh901318_chan *cohc = from_tasklet(cohc, t, tasklet);
1871
1874
 	struct coh901318_desc *cohd_fin;
1872
1875
 	unsigned long flags;
1873
1876
 	struct dmaengine_desc_callback cb;
..
..
@@ -2351,6 +2354,8 @@
2351
2354
 	if (lli == NULL)
2352
2355
 		goto err_dma_alloc;
2353
2356
 
2357
+	coh901318_dma_set_runtimeconfig(chan, &cohc->config, direction);
2358
+
2354
2359
 	/* initiate allocated lli list */
2355
2360
 	ret = coh901318_lli_fill_sg(&cohc->base->pool, lli, sgl, sg_len,
2356
2361
 				    cohc->addr,
..
..
@@ -2490,7 +2495,8 @@
2490
2495
 };
2491
2496
 
2492
2497
 static int coh901318_dma_set_runtimeconfig(struct dma_chan *chan,
2493
-					   struct dma_slave_config *config)
2498
+					   struct dma_slave_config *config,
2499
+					   enum dma_transfer_direction direction)
2494
2500
 {
2495
2501
 	struct coh901318_chan *cohc = to_coh901318_chan(chan);
2496
2502
 	dma_addr_t addr;
..
..
@@ -2500,11 +2506,11 @@
2500
2506
 	int i = 0;
2501
2507
 
2502
2508
 	/* We only support mem to per or per to mem transfers */
2503
-	if (config->direction == DMA_DEV_TO_MEM) {
2509
+	if (direction == DMA_DEV_TO_MEM) {
2504
2510
 		addr = config->src_addr;
2505
2511
 		addr_width = config->src_addr_width;
2506
2512
 		maxburst = config->src_maxburst;
2507
-	} else if (config->direction == DMA_MEM_TO_DEV) {
2513
+	} else if (direction == DMA_MEM_TO_DEV) {
2508
2514
 		addr = config->dst_addr;
2509
2515
 		addr_width = config->dst_addr_width;
2510
2516
 		maxburst = config->dst_maxburst;
..
..
@@ -2570,6 +2576,16 @@
2570
2576
 	return 0;
2571
2577
 }
2572
2578
 
2579
+static int coh901318_dma_slave_config(struct dma_chan *chan,
2580
+					   struct dma_slave_config *config)
2581
+{
2582
+	struct coh901318_chan *cohc = to_coh901318_chan(chan);
2583
+
2584
+	memcpy(&cohc->config, config, sizeof(*config));
2585
+
2586
+	return 0;
2587
+}
2588
+
2573
2589
 static void coh901318_base_init(struct dma_device *dma, const int *pick_chans,
2574
2590
 				struct coh901318_base *base)
2575
2591
 {
..
..
@@ -2599,8 +2615,7 @@
2599
2615
 			INIT_LIST_HEAD(&cohc->active);
2600
2616
 			INIT_LIST_HEAD(&cohc->queue);
2601
2617
 
2602
-			tasklet_init(&cohc->tasklet, dma_tasklet,
2603
-				     (unsigned long) cohc);
2618
+			tasklet_setup(&cohc->tasklet, dma_tasklet);
2604
2619
 
2605
2620
 			list_add_tail(&cohc->chan.device_node,
2606
2621
 				      &dma->channels);
..
..
@@ -2675,7 +2690,7 @@
2675
2690
 	base->dma_slave.device_prep_slave_sg = coh901318_prep_slave_sg;
2676
2691
 	base->dma_slave.device_tx_status = coh901318_tx_status;
2677
2692
 	base->dma_slave.device_issue_pending = coh901318_issue_pending;
2678
-	base->dma_slave.device_config = coh901318_dma_set_runtimeconfig;
2693
+	base->dma_slave.device_config = coh901318_dma_slave_config;
2679
2694
 	base->dma_slave.device_pause = coh901318_pause;
2680
2695
 	base->dma_slave.device_resume = coh901318_resume;
2681
2696
 	base->dma_slave.device_terminate_all = coh901318_terminate_all;
..
..
@@ -2698,7 +2713,7 @@
2698
2713
 	base->dma_memcpy.device_prep_dma_memcpy = coh901318_prep_memcpy;
2699
2714
 	base->dma_memcpy.device_tx_status = coh901318_tx_status;
2700
2715
 	base->dma_memcpy.device_issue_pending = coh901318_issue_pending;
2701
-	base->dma_memcpy.device_config = coh901318_dma_set_runtimeconfig;
2716
+	base->dma_memcpy.device_config = coh901318_dma_slave_config;
2702
2717
 	base->dma_memcpy.device_pause = coh901318_pause;
2703
2718
 	base->dma_memcpy.device_resume = coh901318_resume;
2704
2719
 	base->dma_memcpy.device_terminate_all = coh901318_terminate_all;