AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-26 01:50:54 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

IB/ipath: Allow more flexible user register alignments

Browse Source 
User registers have different alignments on different chips (4KB on
older, 64KB on 7220).  Allow mapping the user registers on kernels with
page sizes up to 64K.

Signed-off-by: Ralph Campbell <ralph.campbell@qlogic.com>
Signed-off-by: Roland Dreier <rolandd@cisco.com>
This commit is contained in:
Ralph Campbell 2008-01-06 21:02:34 -08:00 committed by Roland Dreier
parent 9e2ef36b5a
commit a18e26ae44
4 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/infiniband/hw/ipath/ipath_file_ops.c
View File

@ -169,7 +169,7 @@ static int ipath_get_base_info(struct file *fp,
kinfo->spi_piocnt = dd->ipath_pbufsport; kinfo->spi_piocnt = dd->ipath_pbufsport;
kinfo->spi_piobufbase = (u64) pd->port_piobufs; kinfo->spi_piobufbase = (u64) pd->port_piobufs;
kinfo->__spi_uregbase = (u64) dd->ipath_uregbase + kinfo->__spi_uregbase = (u64) dd->ipath_uregbase +
dd->ipath_palign * pd->port_port; dd->ipath_ureg_align * pd->port_port;
} else if (master) { } else if (master) {
kinfo->spi_piocnt = (dd->ipath_pbufsport / subport_cnt) + kinfo->spi_piocnt = (dd->ipath_pbufsport / subport_cnt) +
(dd->ipath_pbufsport % subport_cnt); (dd->ipath_pbufsport % subport_cnt);
@ -186,7 +186,7 @@ static int ipath_get_base_info(struct file *fp,
} }
if (shared) { if (shared) {
kinfo->spi_port_uregbase = (u64) dd->ipath_uregbase + kinfo->spi_port_uregbase = (u64) dd->ipath_uregbase +
dd->ipath_palign * pd->port_port; dd->ipath_ureg_align * pd->port_port;
kinfo->spi_port_rcvegrbuf = kinfo->spi_rcv_egrbufs; kinfo->spi_port_rcvegrbuf = kinfo->spi_rcv_egrbufs;
kinfo->spi_port_rcvhdr_base = kinfo->spi_rcvhdr_base; kinfo->spi_port_rcvhdr_base = kinfo->spi_rcvhdr_base;
kinfo->spi_port_rcvhdr_tailaddr = kinfo->spi_rcvhdr_tailaddr; kinfo->spi_port_rcvhdr_tailaddr = kinfo->spi_rcvhdr_tailaddr;
@ -1271,7 +1271,7 @@ static int ipath_mmap(struct file *fp, struct vm_area_struct *vma)
goto bail; goto bail;
} }
ureg = dd->ipath_uregbase + dd->ipath_palign * pd->port_port; ureg = dd->ipath_uregbase + dd->ipath_ureg_align * pd->port_port;
if (!pd->port_subport_cnt) { if (!pd->port_subport_cnt) {
/* port is not shared */ /* port is not shared */
piocnt = dd->ipath_pbufsport; piocnt = dd->ipath_pbufsport;

7
drivers/infiniband/hw/ipath/ipath_iba6110.c
View File

@ -739,6 +739,13 @@ static int ipath_ht_boardname(struct ipath_devdata *dd, char *name,
dd->ipath_htspeed); dd->ipath_htspeed);
ret = 0; ret = 0;
/*
* set here, not in ipath_init_*_funcs because we have to do
* it after we can read chip registers.
*/
dd->ipath_ureg_align =
ipath_read_kreg32(dd, dd->ipath_kregs->kr_pagealign);
bail: bail:
return ret; return ret;
} }

8
drivers/infiniband/hw/ipath/ipath_iba6120.c
View File

@ -613,6 +613,14 @@ static int ipath_pe_boardname(struct ipath_devdata *dd, char *name,
dd->ipath_f_put_tid = ipath_pe_put_tid_2; dd->ipath_f_put_tid = ipath_pe_put_tid_2;
} }
/*
* set here, not in ipath_init_*_funcs because we have to do
* it after we can read chip registers.
*/
dd->ipath_ureg_align =
ipath_read_kreg32(dd, dd->ipath_kregs->kr_pagealign);
return ret; return ret;
} }

6
drivers/infiniband/hw/ipath/ipath_kernel.h
View File

@ -395,6 +395,8 @@ struct ipath_devdata {
void *ipath_dummy_hdrq; /* used after port close */ void *ipath_dummy_hdrq; /* used after port close */
dma_addr_t ipath_dummy_hdrq_phys; dma_addr_t ipath_dummy_hdrq_phys;
unsigned long ipath_ureg_align; /* user register alignment */
/* /*
* Shadow copies of registers; size indicates read access size. * Shadow copies of registers; size indicates read access size.
* Most of them are readonly, but some are write-only register, * Most of them are readonly, but some are write-only register,
@ -865,7 +867,7 @@ static inline u32 ipath_read_ureg32(const struct ipath_devdata *dd,
return readl(regno + (u64 __iomem *) return readl(regno + (u64 __iomem *)
(dd->ipath_uregbase + (dd->ipath_uregbase +
(char __iomem *)dd->ipath_kregbase + (char __iomem *)dd->ipath_kregbase +
dd->ipath_palign * port)); dd->ipath_ureg_align * port));
} }
/** /**
@ -882,7 +884,7 @@ static inline void ipath_write_ureg(const struct ipath_devdata *dd,
{ {
u64 __iomem *ubase = (u64 __iomem *) u64 __iomem *ubase = (u64 __iomem *)
(dd->ipath_uregbase + (char __iomem *) dd->ipath_kregbase + (dd->ipath_uregbase + (char __iomem *) dd->ipath_kregbase +
dd->ipath_palign * port); dd->ipath_ureg_align * port);
if (dd->ipath_kregbase) if (dd->ipath_kregbase)
writeq(value, &ubase[regno]); writeq(value, &ubase[regno]);
} }