redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

powerpc/powernv: Increase PE# capacity 

Each PHB maintains an array helping to translate 2-bytes Request
ID (RID) to PE# with the assumption that PE# takes one byte, meaning
that we can't have more than 256 PEs. However, pci_dn->pe_number
already had 4-bytes for the PE#.

This extends the PE# capacity for every PHB. After that, the PE number
is represented by 4-bytes value. Then we can reuse IODA_INVALID_PE to
check the PE# in phb->pe_rmap[] is valid or not.

Signed-off-by: Gavin Shan <gwshan@linux.vnet.ibm.com>
Reviewed-by: Daniel Axtens <dja@axtens.net>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
hifive-unleashed-5.1
Gavin Shan 2016-05-20 16:41:29 +10:00 committed by Michael Ellerman
parent 577c8c8868
commit c127562ae1
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/powerpc/platforms/powernv/pci-ioda.c
View File

@ -761,7 +761,7 @@ static int pnv_ioda_deconfigure_pe(struct pnv_phb *phb, struct pnv_ioda_pe *pe)
/* Clear the reverse map */ /* Clear the reverse map */
for (rid = pe->rid; rid < rid_end; rid++) for (rid = pe->rid; rid < rid_end; rid++)
phb->ioda.pe_rmap[rid] = 0; phb->ioda.pe_rmap[rid] = IODA_INVALID_PE;
/* Release from all parents PELT-V */ /* Release from all parents PELT-V */
while (parent) { while (parent) {
@ -3492,6 +3492,10 @@ static void __init pnv_pci_init_ioda_phb(struct device_node *np,
if (prop32) if (prop32)
phb->ioda.reserved_pe_idx = be32_to_cpup(prop32); phb->ioda.reserved_pe_idx = be32_to_cpup(prop32);
/* Invalidate RID to PE# mapping */
for (segno = 0; segno < ARRAY_SIZE(phb->ioda.pe_rmap); segno++)
phb->ioda.pe_rmap[segno] = IODA_INVALID_PE;
/* Parse 64-bit MMIO range */ /* Parse 64-bit MMIO range */
pnv_ioda_parse_m64_window(phb); pnv_ioda_parse_m64_window(phb);

7
arch/powerpc/platforms/powernv/pci.h
View File

@ -152,11 +152,8 @@ struct pnv_phb {
struct list_head pe_list; struct list_head pe_list;
struct mutex pe_list_mutex; struct mutex pe_list_mutex;
/* Reverse map of PEs, will have to extend if /* Reverse map of PEs, indexed by {bus, devfn} */
* we are to support more than 256 PEs, indexed unsigned int pe_rmap[0x10000];
* bus { bus, devfn }
*/
unsigned char pe_rmap[0x10000];
/* TCE cache invalidate registers (physical and /* TCE cache invalidate registers (physical and
* remapped) * remapped)