aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma/qcom
diff options
context:
space:
mode:
authorSinan Kaya <okaya@codeaurora.org>2017-07-16 10:30:37 -0400
committerVinod Koul <vinod.koul@intel.com>2017-07-19 00:08:55 -0400
commit0217cccdbfb71bfa9482c323a380cedebcd96e41 (patch)
treee2e7f5d228d2e8d0045352fd25f3e1f118f665fd /drivers/dma/qcom
parent5e2db086be4fc77c7715297ffdf929e7a8a55041 (diff)
dmaengine: qcom_hidma: correct overriding message
A false overriding information is being presented during boot under this scenario. 1. First object checks for kernel command line value against zero. 2. It doesn't find it, it sets the command line variable to the value coming from ACPI/DT. 3. Second object is being probed. 4. Second object sees that the value of kernel command line override is non-zero, it prints an overriding message even though value matches ACPI/DT value. hidma-mgmt QCOM8060:03: overriding max-write-burst-bytes: 1024 Add an additional check to verify that kernel command line value is different from the ACPI/DT value. Signed-off-by: Sinan Kaya <okaya@codeaurora.org> Signed-off-by: Vinod Koul <vinod.koul@intel.com>
Diffstat (limited to 'drivers/dma/qcom')
-rw-r--r--drivers/dma/qcom/hidma_mgmt.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/dma/qcom/hidma_mgmt.c b/drivers/dma/qcom/hidma_mgmt.c
index 5a0991bc4787..d51cd34c8267 100644
--- a/drivers/dma/qcom/hidma_mgmt.c
+++ b/drivers/dma/qcom/hidma_mgmt.c
@@ -227,7 +227,8 @@ static int hidma_mgmt_probe(struct platform_device *pdev)
227 goto out; 227 goto out;
228 } 228 }
229 229
230 if (max_write_request) { 230 if (max_write_request &&
231 (max_write_request != mgmtdev->max_write_request)) {
231 dev_info(&pdev->dev, "overriding max-write-burst-bytes: %d\n", 232 dev_info(&pdev->dev, "overriding max-write-burst-bytes: %d\n",
232 max_write_request); 233 max_write_request);
233 mgmtdev->max_write_request = max_write_request; 234 mgmtdev->max_write_request = max_write_request;
@@ -240,7 +241,8 @@ static int hidma_mgmt_probe(struct platform_device *pdev)
240 dev_err(&pdev->dev, "max-read-burst-bytes missing\n"); 241 dev_err(&pdev->dev, "max-read-burst-bytes missing\n");
241 goto out; 242 goto out;
242 } 243 }
243 if (max_read_request) { 244 if (max_read_request &&
245 (max_read_request != mgmtdev->max_read_request)) {
244 dev_info(&pdev->dev, "overriding max-read-burst-bytes: %d\n", 246 dev_info(&pdev->dev, "overriding max-read-burst-bytes: %d\n",
245 max_read_request); 247 max_read_request);
246 mgmtdev->max_read_request = max_read_request; 248 mgmtdev->max_read_request = max_read_request;
@@ -253,7 +255,8 @@ static int hidma_mgmt_probe(struct platform_device *pdev)
253 dev_err(&pdev->dev, "max-write-transactions missing\n"); 255 dev_err(&pdev->dev, "max-write-transactions missing\n");
254 goto out; 256 goto out;
255 } 257 }
256 if (max_wr_xactions) { 258 if (max_wr_xactions &&
259 (max_wr_xactions != mgmtdev->max_wr_xactions)) {
257 dev_info(&pdev->dev, "overriding max-write-transactions: %d\n", 260 dev_info(&pdev->dev, "overriding max-write-transactions: %d\n",
258 max_wr_xactions); 261 max_wr_xactions);
259 mgmtdev->max_wr_xactions = max_wr_xactions; 262 mgmtdev->max_wr_xactions = max_wr_xactions;
@@ -266,7 +269,8 @@ static int hidma_mgmt_probe(struct platform_device *pdev)
266 dev_err(&pdev->dev, "max-read-transactions missing\n"); 269 dev_err(&pdev->dev, "max-read-transactions missing\n");
267 goto out; 270 goto out;
268 } 271 }
269 if (max_rd_xactions) { 272 if (max_rd_xactions &&
273 (max_rd_xactions != mgmtdev->max_rd_xactions)) {
270 dev_info(&pdev->dev, "overriding max-read-transactions: %d\n", 274 dev_info(&pdev->dev, "overriding max-read-transactions: %d\n",
271 max_rd_xactions); 275 max_rd_xactions);
272 mgmtdev->max_rd_xactions = max_rd_xactions; 276 mgmtdev->max_rd_xactions = max_rd_xactions;