Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 53203244 authored by Anil Veerabhadrappa's avatar Anil Veerabhadrappa Committed by James Bottomley
Browse files

[SCSI] bnx2i: Fix context mapping issue for architectures with PAGE_SIZE != 4096 



5706/5708/5709 devices allow driver/user to set page size. By default it is
set to 4096.  Current drivers do not program this register based on
architecture type (e.g. x86 = 4K, IA64 = 16K) and by choice lets device use
the defaults. So while mapping connection context memory (doorebll registers),
driver has to match page size used by the device. Included change fixes the
issue we uncovered during IA64 testing

Signed-off-by: default avatarAnil Veerabhadrappa <anilgv@broadcom.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@suse.de>
parent 3bfc13c2

drivers/scsi/bnx2i/bnx2i.h

+2 −0
Original line number Diff line number Diff line
@@ -100,6 +100,8 @@ 
#define CTX_OFFSET 			0x10000

#define MAX_CID_CNT			0x4000



#define BNX2I_570X_PAGE_SIZE_DEFAULT	4096



/* 5709 context registers */

#define BNX2_MQ_CONFIG2			0x00003d00

#define BNX2_MQ_CONFIG2_CONT_SZ		(0x7L<<4)

drivers/scsi/bnx2i/bnx2i_hwi.c

+1 −1
Original line number Diff line number Diff line
@@ -2386,7 +2386,7 @@ int bnx2i_map_ep_dbell_regs(struct bnx2i_endpoint *ep) 
		ctx_sz = (config2 & BNX2_MQ_CONFIG2_CONT_SZ) >> 3;

		if (ctx_sz)

			reg_off = CTX_OFFSET + MAX_CID_CNT * MB_KERNEL_CTX_SIZE

				  + PAGE_SIZE *

				  + BNX2I_570X_PAGE_SIZE_DEFAULT *

				  (((cid_num - first_l4l5) / ctx_sz) + 256);

		else

			reg_off = CTX_OFFSET + (MB_KERNEL_CTX_SIZE * cid_num);