[PATCH net 1/1] qed: Fix mask for physical address in ILT entry

[PATCH net 1/1] qed: Fix mask for physical address in ILT entry

[Shahed Shaikh]

ILT entry requires 12 bit right shifted physical address.
Existing mask for ILT entry of physical address i.e.
ILT_ENTRY_PHY_ADDR_MASK is not sufficient to handle 64bit
address because upper 8 bits of 64 bit address were getting
masked which resulted in completer abort error on
PCIe bus due to invalid address.

Fix that mask to handle 64bit physical address.

Fixes: fe56b9e6a8d9 ("qed: Add module with basic common support")

Signed-off-by: Shahed Shaikh <shahed.shaikh@cavium.com>
Signed-off-by: Ariel Elior <ariel.elior@cavium.com>
---
 drivers/net/ethernet/qlogic/qed/qed_cxt.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/net/ethernet/qlogic/qed/qed_cxt.c b/drivers/net/ethernet/qlogic/qed/qed_cxt.c
index 00f41c1..820b226 100644
--- a/drivers/net/ethernet/qlogic/qed/qed_cxt.c
+++ b/drivers/net/ethernet/qlogic/qed/qed_cxt.c
@@ -77,7 +77,7 @@
 #define ILT_CFG_REG(cli, reg)	PSWRQ2_REG_ ## cli ## _ ## reg ## _RT_OFFSET
 
 /* ILT entry structure */
-#define ILT_ENTRY_PHY_ADDR_MASK		0x000FFFFFFFFFFFULL
+#define ILT_ENTRY_PHY_ADDR_MASK		(~0ULL >> 12)
 #define ILT_ENTRY_PHY_ADDR_SHIFT	0
 #define ILT_ENTRY_VALID_MASK		0x1ULL
 #define ILT_ENTRY_VALID_SHIFT		52
-- 
1.7.1

Re: [PATCH net 1/1] qed: Fix mask for physical address in ILT entry

[David Miller]

From: Shahed Shaikh <shahed.shaikh@cavium.com>
Date: Mon, 21 May 2018 12:31:47 -0700

> ILT entry requires 12 bit right shifted physical address.
> Existing mask for ILT entry of physical address i.e.
> ILT_ENTRY_PHY_ADDR_MASK is not sufficient to handle 64bit
> address because upper 8 bits of 64 bit address were getting
> masked which resulted in completer abort error on
> PCIe bus due to invalid address.
> 
> Fix that mask to handle 64bit physical address.
> 
> Fixes: fe56b9e6a8d9 ("qed: Add module with basic common support")
> 
> Signed-off-by: Shahed Shaikh <shahed.shaikh@cavium.com>
> Signed-off-by: Ariel Elior <ariel.elior@cavium.com>

Please do not put an empty line between Fixes: and other tags in the
future.  I fixed it up this time.

Applied, thanks.

RE: [PATCH net 1/1] qed: Fix mask for physical address in ILT entry

[Shaikh, Shahed]

> -----Original Message-----
> From: David Miller <davem@davemloft.net>
> Sent: Tuesday, May 22, 2018 12:34 PM
> To: Shaikh, Shahed <Shahed.Shaikh@cavium.com>
> Cc: netdev@vger.kernel.org; Elior, Ariel <Ariel.Elior@cavium.com>; Dept-Eng
> Everest Linux L2 <Dept-EngEverestLinuxL2@cavium.com>
> Subject: Re: [PATCH net 1/1] qed: Fix mask for physical address in ILT entry
> 
> From: Shahed Shaikh <shahed.shaikh@cavium.com>
> Date: Mon, 21 May 2018 12:31:47 -0700
> 
> > ILT entry requires 12 bit right shifted physical address.
> > Existing mask for ILT entry of physical address i.e.
> > ILT_ENTRY_PHY_ADDR_MASK is not sufficient to handle 64bit address
> > because upper 8 bits of 64 bit address were getting masked which
> > resulted in completer abort error on PCIe bus due to invalid address.
> >
> > Fix that mask to handle 64bit physical address.
> >
> > Fixes: fe56b9e6a8d9 ("qed: Add module with basic common support")
> >
> > Signed-off-by: Shahed Shaikh <shahed.shaikh@cavium.com>
> > Signed-off-by: Ariel Elior <ariel.elior@cavium.com>
> 
> Please do not put an empty line between Fixes: and other tags in the future.  I
> fixed it up this time.

Sorry about this. Thanks for fixing.

> 
> Applied, thanks.
Can you please queues this fix for -stable?

Thanks,
Shahed

Re: [PATCH net 1/1] qed: Fix mask for physical address in ILT entry

[David Miller]

From: "Shaikh, Shahed" <Shahed.Shaikh@cavium.com>
Date: Tue, 22 May 2018 19:42:46 +0000

> Can you please queues this fix for -stable?

I did, see:

http://patchwork.ozlabs.org/bundle/davem/stable/?series=&submitter=&state=*&q=&archive=