UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

PCI: endpoint: pci-epf-vntb: Replace hardcoded 4 with sizeof(u32) 

NTB spad entry item size is sizeof(u32), replace hardcoded 4 with it.

Link: https://lore.kernel.org/r/20221102141014.1025893-6-Frank.Li@nxp.com
Signed-off-by: Frank Li <frank.li@nxp.com>
Signed-off-by: Lorenzo Pieralisi <lpieralisi@kernel.org>
Acked-by: Manivannan Sadhasivam <mani@kernel.org>
This commit is contained in:
Frank Li 2022-11-02 10:10:12 -04:00 committed by Lorenzo Pieralisi
parent 03d426ae54
commit 2b35c88655
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/pci/endpoint/functions/pci-epf-vntb.c
View File

@ -257,12 +257,12 @@ static void epf_ntb_cmd_handler(struct work_struct *work)
ntb = container_of(work, struct epf_ntb, cmd_handler.work); ntb = container_of(work, struct epf_ntb, cmd_handler.work);
for (i = 1; i < ntb->db_count; i++) { for (i = 1; i < ntb->db_count; i++) {
if (readl(ntb->epf_db + i * 4)) { if (readl(ntb->epf_db + i * sizeof(u32))) {
if (readl(ntb->epf_db + i * 4)) if (readl(ntb->epf_db + i * sizeof(u32)))
ntb->db |= 1 << (i - 1); ntb->db |= 1 << (i - 1);
ntb_db_event(&ntb->ntb, i); ntb_db_event(&ntb->ntb, i);
writel(0, ntb->epf_db + i * 4); writel(0, ntb->epf_db + i * sizeof(u32));
} }
} }
@ -433,7 +433,7 @@ static int epf_ntb_config_spad_bar_alloc(struct epf_ntb *ntb)
spad_count = ntb->spad_count; spad_count = ntb->spad_count;
ctrl_size = sizeof(struct epf_ntb_ctrl); ctrl_size = sizeof(struct epf_ntb_ctrl);
spad_size = 2 * spad_count * 4; spad_size = 2 * spad_count * sizeof(u32);
if (!align) { if (!align) {
ctrl_size = roundup_pow_of_two(ctrl_size); ctrl_size = roundup_pow_of_two(ctrl_size);
@ -463,7 +463,7 @@ static int epf_ntb_config_spad_bar_alloc(struct epf_ntb *ntb)
ctrl->num_mws = ntb->num_mws; ctrl->num_mws = ntb->num_mws;
ntb->spad_size = spad_size; ntb->spad_size = spad_size;
ctrl->db_entry_size = 4; ctrl->db_entry_size = sizeof(u32);
for (i = 0; i < ntb->db_count; i++) { for (i = 0; i < ntb->db_count; i++) {
ntb->reg->db_data[i] = 1 + i; ntb->reg->db_data[i] = 1 + i;
@ -535,7 +535,7 @@ static int epf_ntb_db_bar_init(struct epf_ntb *ntb)
struct pci_epf_bar *epf_bar; struct pci_epf_bar *epf_bar;
void __iomem *mw_addr; void __iomem *mw_addr;
enum pci_barno barno; enum pci_barno barno;
size_t size = 4 * ntb->db_count; size_t size = sizeof(u32) * ntb->db_count;
epc_features = pci_epc_get_features(ntb->epf->epc, epc_features = pci_epc_get_features(ntb->epf->epc,
ntb->epf->func_no, ntb->epf->func_no,
@ -1121,11 +1121,11 @@ static int vntb_epf_link_enable(struct ntb_dev *ntb,
static u32 vntb_epf_spad_read(struct ntb_dev *ndev, int idx) static u32 vntb_epf_spad_read(struct ntb_dev *ndev, int idx)
{ {
struct epf_ntb *ntb = ntb_ndev(ndev); struct epf_ntb *ntb = ntb_ndev(ndev);
int off = ntb->reg->spad_offset, ct = ntb->reg->spad_count * 4; int off = ntb->reg->spad_offset, ct = ntb->reg->spad_count * sizeof(u32);
u32 val; u32 val;
void __iomem *base = ntb->reg; void __iomem *base = ntb->reg;
val = readl(base + off + ct + idx * 4); val = readl(base + off + ct + idx * sizeof(u32));
return val; return val;
} }
@ -1133,10 +1133,10 @@ static int vntb_epf_spad_write(struct ntb_dev *ndev, int idx, u32 val)
{ {
struct epf_ntb *ntb = ntb_ndev(ndev); struct epf_ntb *ntb = ntb_ndev(ndev);
struct epf_ntb_ctrl *ctrl = ntb->reg; struct epf_ntb_ctrl *ctrl = ntb->reg;
int off = ctrl->spad_offset, ct = ctrl->spad_count * 4; int off = ctrl->spad_offset, ct = ctrl->spad_count * sizeof(u32);
void __iomem *base = ntb->reg; void __iomem *base = ntb->reg;
writel(val, base + off + ct + idx * 4); writel(val, base + off + ct + idx * sizeof(u32));
return 0; return 0;
} }
@ -1148,7 +1148,7 @@ static u32 vntb_epf_peer_spad_read(struct ntb_dev *ndev, int pidx, int idx)
void __iomem *base = ntb->reg; void __iomem *base = ntb->reg;
u32 val; u32 val;
val = readl(base + off + idx * 4); val = readl(base + off + idx * sizeof(u32));
return val; return val;
} }
@ -1159,7 +1159,7 @@ static int vntb_epf_peer_spad_write(struct ntb_dev *ndev, int pidx, int idx, u32
int off = ctrl->spad_offset; int off = ctrl->spad_offset;
void __iomem *base = ntb->reg; void __iomem *base = ntb->reg;
writel(val, base + off + idx * 4); writel(val, base + off + idx * sizeof(u32));
return 0; return 0;
} }