Skip to content

Commit d9d9f26

Browse files
Mani-Sadhasivamkwilczynski
authored andcommitted
PCI: epf-mhi: Make use of the alignment restriction from EPF core
Instead of hardcoding the alignment restriction in the EPF_MHI driver, make use of the info available from the EPF core that reflects the alignment restriction of the endpoint controller. For this purpose, let's introduce the get_align_offset() static function. [kwilczynski: update get_align_offset() to avoid issues on 32-bit architectures] Link: https://lore.kernel.org/linux-pci/20230717065459.14138-3-manivannan.sadhasivam@linaro.org Link: https://lore.kernel.org/linux-pci/20230826150626.23309-1-manivannan.sadhasivam@linaro.org Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Signed-off-by: Krzysztof Wilczyński <kwilczynski@kernel.org>
1 parent 8cd2b8c commit d9d9f26

File tree

1 file changed

+14
-7
lines changed

1 file changed

+14
-7
lines changed

drivers/pci/endpoint/functions/pci-epf-mhi.c

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ static const struct pci_epf_mhi_ep_info sdx55_info = {
9292
};
9393

9494
struct pci_epf_mhi {
95+
const struct pci_epc_features *epc_features;
9596
const struct pci_epf_mhi_ep_info *info;
9697
struct mhi_ep_cntrl mhi_cntrl;
9798
struct pci_epf *epf;
@@ -102,6 +103,11 @@ struct pci_epf_mhi {
102103
int irq;
103104
};
104105

106+
static size_t get_align_offset(struct pci_epf_mhi *epf_mhi, u64 addr)
107+
{
108+
return addr & (epf_mhi->epc_features->align -1);
109+
}
110+
105111
static int __pci_epf_mhi_alloc_map(struct mhi_ep_cntrl *mhi_cntrl, u64 pci_addr,
106112
phys_addr_t *paddr, void __iomem **vaddr,
107113
size_t offset, size_t size)
@@ -133,8 +139,7 @@ static int pci_epf_mhi_alloc_map(struct mhi_ep_cntrl *mhi_cntrl, u64 pci_addr,
133139
size_t size)
134140
{
135141
struct pci_epf_mhi *epf_mhi = to_epf_mhi(mhi_cntrl);
136-
struct pci_epc *epc = epf_mhi->epf->epc;
137-
size_t offset = pci_addr & (epc->mem->window.page_size - 1);
142+
size_t offset = get_align_offset(epf_mhi, pci_addr);
138143

139144
return __pci_epf_mhi_alloc_map(mhi_cntrl, pci_addr, paddr, vaddr,
140145
offset, size);
@@ -159,9 +164,7 @@ static void pci_epf_mhi_unmap_free(struct mhi_ep_cntrl *mhi_cntrl, u64 pci_addr,
159164
size_t size)
160165
{
161166
struct pci_epf_mhi *epf_mhi = to_epf_mhi(mhi_cntrl);
162-
struct pci_epf *epf = epf_mhi->epf;
163-
struct pci_epc *epc = epf->epc;
164-
size_t offset = pci_addr & (epc->mem->window.page_size - 1);
167+
size_t offset = get_align_offset(epf_mhi, pci_addr);
165168

166169
__pci_epf_mhi_unmap_free(mhi_cntrl, pci_addr, paddr, vaddr, offset,
167170
size);
@@ -185,7 +188,7 @@ static int pci_epf_mhi_read_from_host(struct mhi_ep_cntrl *mhi_cntrl, u64 from,
185188
void *to, size_t size)
186189
{
187190
struct pci_epf_mhi *epf_mhi = to_epf_mhi(mhi_cntrl);
188-
size_t offset = from % SZ_4K;
191+
size_t offset = get_align_offset(epf_mhi, from);
189192
void __iomem *tre_buf;
190193
phys_addr_t tre_phys;
191194
int ret;
@@ -213,7 +216,7 @@ static int pci_epf_mhi_write_to_host(struct mhi_ep_cntrl *mhi_cntrl,
213216
void *from, u64 to, size_t size)
214217
{
215218
struct pci_epf_mhi *epf_mhi = to_epf_mhi(mhi_cntrl);
216-
size_t offset = to % SZ_4K;
219+
size_t offset = get_align_offset(epf_mhi, to);
217220
void __iomem *tre_buf;
218221
phys_addr_t tre_phys;
219222
int ret;
@@ -270,6 +273,10 @@ static int pci_epf_mhi_core_init(struct pci_epf *epf)
270273
return ret;
271274
}
272275

276+
epf_mhi->epc_features = pci_epc_get_features(epc, epf->func_no, epf->vfunc_no);
277+
if (!epf_mhi->epc_features)
278+
return -ENODATA;
279+
273280
return 0;
274281
}
275282

0 commit comments

Comments
 (0)