From 572dc56ecee796e10f27d3b18fd6fce5bd84b8a1 Mon Sep 17 00:00:00 2001
From: "Subramanian, Kavitha" <k.subramanian@intel.com>
Date: Wed, 21 Mar 2018 08:42:45 +0100
Subject: [PATCH] Merge pull request #254 in SW_PON/linux from
bugfix/FALCONSYS-186 to xrx500
* commit 'ba386275f83d36b7abc08bab81ece98089c426ab':
fix pen error in debug code
fix pen error in debug code
---
drivers/net/ethernet/lantiq/cqm/falconmx/cqm_proc.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/ethernet/lantiq/cqm/falconmx/cqm_proc.c b/drivers/net/ethernet/lantiq/cqm/falconmx/cqm_proc.c
index 40d5708a3..323bc1a7d 100644
--- a/drivers/net/ethernet/lantiq/cqm/falconmx/cqm_proc.c
+++ b/drivers/net/ethernet/lantiq/cqm/falconmx/cqm_proc.c
@@ -125,7 +125,7 @@ uint64_t REG64(void *addr)
reg1 = cbm_r32(addr);
reg2 = cbm_r32(addr + 4);
- readreg = (((u64)reg1) >> 32) + (u64)reg2;
+ readreg = (((u64)reg1) << 32) + (u64)reg2;
return readreg;
}
EXPORT_SYMBOL(REG64);
@@ -310,11 +310,11 @@ static ssize_t cqm_dma_desc_write(struct file *file, const char __user *buf,
PRINTK("Addr: %8p\n", addr);
reg64 = REG64(addr);
reg1 = (u32)(reg64 >> 32);
- reg2 = (reg & 0xFFFFFFFF);
+ reg2 = (reg64 & 0xFFFFFFFF);
reg64 = REG64(addr1);
reg3 = (u32)(reg64 >> 32);
- reg4 = (reg & 0xFFFFFFFF);
+ reg4 = (reg64 & 0xFFFFFFFF);
PRINTK("Val: 0x%08x%08x\n",
reg1, reg2);
PRINTK("Name: DESC1_%d_IGP_%02d\n",
@@ -323,7 +323,7 @@ static ssize_t cqm_dma_desc_write(struct file *file, const char __user *buf,
addr1);
reg64 = REG64(addr1);
reg3 = (u32)(reg64 >> 32);
- reg4 = (reg & 0xFFFFFFFF);
+ reg4 = (reg64 & 0xFFFFFFFF);
PRINTK("Val: 0x%08x%08x\n",
reg3, reg4);
}
@@ -347,11 +347,11 @@ static ssize_t cqm_dma_desc_write(struct file *file, const char __user *buf,
PRINTK("Addr: %8p\n", addr);
reg64 = REG64(addr);
reg1 = (u32)(reg64 >> 32);
- reg2 = (reg & 0xFFFFFFFF);
+ reg2 = (reg64 & 0xFFFFFFFF);
reg64 = REG64(addr1);
reg3 = (u32)(reg64 >> 32);
- reg4 = (reg & 0xFFFFFFFF);
+ reg4 = (reg64 & 0xFFFFFFFF);
PRINTK("Val: 0x%08x%08x\n", reg1, reg2);
PRINTK("Name: DESC1_0_EGP\n");
PRINTK("Addr: %8p\n", addr1);
--
GitLab