| Message ID | 1530792923-23387-1-git-send-email-clombard@linux.vnet.ibm.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | capi: Select the correct IODA table entry for the mbt cache. | expand |
Christophe Lombard <clombard@linux.vnet.ibm.com> writes: > With the current code, the capi mmio window is not correctly configured > in the IODA table entry. The first entry (generally the non-prefetchable > BAR) is overwrriten. > This patch sets the capi window bar at the right place. > + phb4_ioda_sel(p, IODA3_TBL_MBT, window_num << 1, true); Thanks for fixing this Christophe Reviewed-by: Vaibhav Jain <vaibhav@linux.ibm.com>
Le 05/07/2018 à 14:15, Christophe Lombard a écrit : > With the current code, the capi mmio window is not correctly configured > in the IODA table entry. The first entry (generally the non-prefetchable > BAR) is overwrriten. > This patch sets the capi window bar at the right place. > > Signed-off-by: Christophe Lombard <clombard@linux.vnet.ibm.com> > --- ok, so this is really a fix for 4d359aaac9878601482027ec074fc1d9616132ac Looks sane to me. Reviewed-by: Frederic Barrat <fbarrat@linux.vnet.ibm.com> > hw/phb4.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/hw/phb4.c b/hw/phb4.c > index 67927c4..1bce9e6 100644 > --- a/hw/phb4.c > +++ b/hw/phb4.c > @@ -3910,7 +3910,7 @@ static int64_t enable_capi_mode(struct phb4 *p, uint64_t pe_number, > { > uint64_t reg, start_addr, end_addr, stq_eng, dma_eng; > uint64_t mbt0, mbt1; > - int i, entf = -1; > + int i, window_num = -1; > > /* CAPP Control Register */ > xscom_read(p->chip_id, p->pe_xscom + XPEC_NEST_CAPP_CNTL, ®); > @@ -4054,20 +4054,20 @@ static int64_t enable_capi_mode(struct phb4 *p, uint64_t pe_number, > break; > > /* search a free entry */ > - if ((entf == -1) && > + if ((window_num == -1) && > ((!(p->mbt_cache[i][0] & IODA3_MBT0_ENABLE)) && > (!(p->mbt_cache[i][1] & IODA3_MBT1_ENABLE)))) > - entf = i; > + window_num = i; > } > > - if (entf >= 0 && i == p->mbt_size) { > + if (window_num >= 0 && i == p->mbt_size) { > /* no capi mmio window found, so add it */ > - p->mbt_cache[entf][0] = mbt0; > - p->mbt_cache[entf][1] = mbt1; > + p->mbt_cache[window_num][0] = mbt0; > + p->mbt_cache[window_num][1] = mbt1; > > - phb4_ioda_sel(p, IODA3_TBL_MBT, 0, true); > - out_be64(p->regs + PHB_IODA_DATA0, p->mbt_cache[entf][0]); > - out_be64(p->regs + PHB_IODA_DATA0, p->mbt_cache[entf][1]); > + phb4_ioda_sel(p, IODA3_TBL_MBT, window_num << 1, true); > + out_be64(p->regs + PHB_IODA_DATA0, mbt0); > + out_be64(p->regs + PHB_IODA_DATA0, mbt1); > } else if (i == p->mbt_size) { > /* mbt cache full, this case should never happen */ > PHBERR(p, "CAPP: Failed to add CAPI mmio window\n"); >
On 05/07/18 22:15, Christophe Lombard wrote: > With the current code, the capi mmio window is not correctly configured > in the IODA table entry. The first entry (generally the non-prefetchable > BAR) is overwrriten. > This patch sets the capi window bar at the right place. > > Signed-off-by: Christophe Lombard <clombard@linux.vnet.ibm.com> Does this need to go to stable? Otherwise looks good. Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > --- > hw/phb4.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) > > diff --git a/hw/phb4.c b/hw/phb4.c > index 67927c4..1bce9e6 100644 > --- a/hw/phb4.c > +++ b/hw/phb4.c > @@ -3910,7 +3910,7 @@ static int64_t enable_capi_mode(struct phb4 *p, uint64_t pe_number, > { > uint64_t reg, start_addr, end_addr, stq_eng, dma_eng; > uint64_t mbt0, mbt1; > - int i, entf = -1; > + int i, window_num = -1; > > /* CAPP Control Register */ > xscom_read(p->chip_id, p->pe_xscom + XPEC_NEST_CAPP_CNTL, ®); > @@ -4054,20 +4054,20 @@ static int64_t enable_capi_mode(struct phb4 *p, uint64_t pe_number, > break; > > /* search a free entry */ > - if ((entf == -1) && > + if ((window_num == -1) && > ((!(p->mbt_cache[i][0] & IODA3_MBT0_ENABLE)) && > (!(p->mbt_cache[i][1] & IODA3_MBT1_ENABLE)))) > - entf = i; > + window_num = i; > } > > - if (entf >= 0 && i == p->mbt_size) { > + if (window_num >= 0 && i == p->mbt_size) { > /* no capi mmio window found, so add it */ > - p->mbt_cache[entf][0] = mbt0; > - p->mbt_cache[entf][1] = mbt1; > + p->mbt_cache[window_num][0] = mbt0; > + p->mbt_cache[window_num][1] = mbt1; > > - phb4_ioda_sel(p, IODA3_TBL_MBT, 0, true); > - out_be64(p->regs + PHB_IODA_DATA0, p->mbt_cache[entf][0]); > - out_be64(p->regs + PHB_IODA_DATA0, p->mbt_cache[entf][1]); > + phb4_ioda_sel(p, IODA3_TBL_MBT, window_num << 1, true); > + out_be64(p->regs + PHB_IODA_DATA0, mbt0); > + out_be64(p->regs + PHB_IODA_DATA0, mbt1); > } else if (i == p->mbt_size) { > /* mbt cache full, this case should never happen */ > PHBERR(p, "CAPP: Failed to add CAPI mmio window\n"); >
Le 06/07/2018 à 07:39, Andrew Donnellan a écrit : > On 05/07/18 22:15, Christophe Lombard wrote: >> With the current code, the capi mmio window is not correctly configured >> in the IODA table entry. The first entry (generally the non-prefetchable >> BAR) is overwrriten. >> This patch sets the capi window bar at the right place. >> >> Signed-off-by: Christophe Lombard <clombard@linux.vnet.ibm.com> > > Does this need to go to stable? > yes please. > Otherwise looks good. > > Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> > >> --- >> hw/phb4.c | 18 +++++++++--------- >> 1 file changed, 9 insertions(+), 9 deletions(-) >> >> diff --git a/hw/phb4.c b/hw/phb4.c >> index 67927c4..1bce9e6 100644 >> --- a/hw/phb4.c >> +++ b/hw/phb4.c >> @@ -3910,7 +3910,7 @@ static int64_t enable_capi_mode(struct phb4 *p, >> uint64_t pe_number, >> { >> uint64_t reg, start_addr, end_addr, stq_eng, dma_eng; >> uint64_t mbt0, mbt1; >> - int i, entf = -1; >> + int i, window_num = -1; >> /* CAPP Control Register */ >> xscom_read(p->chip_id, p->pe_xscom + XPEC_NEST_CAPP_CNTL, ®); >> @@ -4054,20 +4054,20 @@ static int64_t enable_capi_mode(struct phb4 >> *p, uint64_t pe_number, >> break; >> /* search a free entry */ >> - if ((entf == -1) && >> + if ((window_num == -1) && >> ((!(p->mbt_cache[i][0] & IODA3_MBT0_ENABLE)) && >> (!(p->mbt_cache[i][1] & IODA3_MBT1_ENABLE)))) >> - entf = i; >> + window_num = i; >> } >> - if (entf >= 0 && i == p->mbt_size) { >> + if (window_num >= 0 && i == p->mbt_size) { >> /* no capi mmio window found, so add it */ >> - p->mbt_cache[entf][0] = mbt0; >> - p->mbt_cache[entf][1] = mbt1; >> + p->mbt_cache[window_num][0] = mbt0; >> + p->mbt_cache[window_num][1] = mbt1; >> - phb4_ioda_sel(p, IODA3_TBL_MBT, 0, true); >> - out_be64(p->regs + PHB_IODA_DATA0, p->mbt_cache[entf][0]); >> - out_be64(p->regs + PHB_IODA_DATA0, p->mbt_cache[entf][1]); >> + phb4_ioda_sel(p, IODA3_TBL_MBT, window_num << 1, true); >> + out_be64(p->regs + PHB_IODA_DATA0, mbt0); >> + out_be64(p->regs + PHB_IODA_DATA0, mbt1); >> } else if (i == p->mbt_size) { >> /* mbt cache full, this case should never happen */ >> PHBERR(p, "CAPP: Failed to add CAPI mmio window\n"); >> >
Le 09/07/2018 à 16:13, christophe lombard a écrit : > Le 06/07/2018 à 07:39, Andrew Donnellan a écrit : >> On 05/07/18 22:15, Christophe Lombard wrote: >>> With the current code, the capi mmio window is not correctly configured >>> in the IODA table entry. The first entry (generally the non-prefetchable >>> BAR) is overwrriten. >>> This patch sets the capi window bar at the right place. >>> >>> Signed-off-by: Christophe Lombard <clombard@linux.vnet.ibm.com> >> >> Does this need to go to stable? >> > > yes please. Stewart: the problem fixed by this patch is seen when using the Mellanox cx5 driver with some special config. It was done on a Coral setup. Is it correct that the 6.0.x branch is now the default for Coral fixes? the op910 branch is dead, right? Fred > >> Otherwise looks good. >> >> Acked-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com> >> >>> --- >>> hw/phb4.c | 18 +++++++++--------- >>> 1 file changed, 9 insertions(+), 9 deletions(-) >>> >>> diff --git a/hw/phb4.c b/hw/phb4.c >>> index 67927c4..1bce9e6 100644 >>> --- a/hw/phb4.c >>> +++ b/hw/phb4.c >>> @@ -3910,7 +3910,7 @@ static int64_t enable_capi_mode(struct phb4 *p, >>> uint64_t pe_number, >>> { >>> uint64_t reg, start_addr, end_addr, stq_eng, dma_eng; >>> uint64_t mbt0, mbt1; >>> - int i, entf = -1; >>> + int i, window_num = -1; >>> /* CAPP Control Register */ >>> xscom_read(p->chip_id, p->pe_xscom + XPEC_NEST_CAPP_CNTL, ®); >>> @@ -4054,20 +4054,20 @@ static int64_t enable_capi_mode(struct phb4 >>> *p, uint64_t pe_number, >>> break; >>> /* search a free entry */ >>> - if ((entf == -1) && >>> + if ((window_num == -1) && >>> ((!(p->mbt_cache[i][0] & IODA3_MBT0_ENABLE)) && >>> (!(p->mbt_cache[i][1] & IODA3_MBT1_ENABLE)))) >>> - entf = i; >>> + window_num = i; >>> } >>> - if (entf >= 0 && i == p->mbt_size) { >>> + if (window_num >= 0 && i == p->mbt_size) { >>> /* no capi mmio window found, so add it */ >>> - p->mbt_cache[entf][0] = mbt0; >>> - p->mbt_cache[entf][1] = mbt1; >>> + p->mbt_cache[window_num][0] = mbt0; >>> + p->mbt_cache[window_num][1] = mbt1; >>> - phb4_ioda_sel(p, IODA3_TBL_MBT, 0, true); >>> - out_be64(p->regs + PHB_IODA_DATA0, p->mbt_cache[entf][0]); >>> - out_be64(p->regs + PHB_IODA_DATA0, p->mbt_cache[entf][1]); >>> + phb4_ioda_sel(p, IODA3_TBL_MBT, window_num << 1, true); >>> + out_be64(p->regs + PHB_IODA_DATA0, mbt0); >>> + out_be64(p->regs + PHB_IODA_DATA0, mbt1); >>> } else if (i == p->mbt_size) { >>> /* mbt cache full, this case should never happen */ >>> PHBERR(p, "CAPP: Failed to add CAPI mmio window\n"); >>> >> >
Frederic Barrat <fbarrat@linux.ibm.com> writes: > Le 09/07/2018 à 16:13, christophe lombard a écrit : >> Le 06/07/2018 à 07:39, Andrew Donnellan a écrit : >>> On 05/07/18 22:15, Christophe Lombard wrote: >>>> With the current code, the capi mmio window is not correctly configured >>>> in the IODA table entry. The first entry (generally the non-prefetchable >>>> BAR) is overwrriten. >>>> This patch sets the capi window bar at the right place. >>>> >>>> Signed-off-by: Christophe Lombard <clombard@linux.vnet.ibm.com> >>> >>> Does this need to go to stable? >>> >> >> yes please. > > Stewart: the problem fixed by this patch is seen when using the Mellanox > cx5 driver with some special config. It was done on a Coral setup. Is it > correct that the 6.0.x branch is now the default for Coral fixes? the > op910 branch is dead, right? Correct. I'll cherry pick in.
Christophe Lombard <clombard@linux.vnet.ibm.com> writes: > With the current code, the capi mmio window is not correctly configured > in the IODA table entry. The first entry (generally the non-prefetchable > BAR) is overwrriten. > This patch sets the capi window bar at the right place. > > Signed-off-by: Christophe Lombard <clombard@linux.vnet.ibm.com> > --- > hw/phb4.c | 18 +++++++++--------- > 1 file changed, 9 insertions(+), 9 deletions(-) Thanks, merged to master as of 98182a960c5ffd53eed139668e686bc5af6e2e5f and 6.0.x as of bfb78e7bc262409ef59067ef554719e85f86c4fb
diff --git a/hw/phb4.c b/hw/phb4.c index 67927c4..1bce9e6 100644 --- a/hw/phb4.c +++ b/hw/phb4.c @@ -3910,7 +3910,7 @@ static int64_t enable_capi_mode(struct phb4 *p, uint64_t pe_number, { uint64_t reg, start_addr, end_addr, stq_eng, dma_eng; uint64_t mbt0, mbt1; - int i, entf = -1; + int i, window_num = -1; /* CAPP Control Register */ xscom_read(p->chip_id, p->pe_xscom + XPEC_NEST_CAPP_CNTL, ®); @@ -4054,20 +4054,20 @@ static int64_t enable_capi_mode(struct phb4 *p, uint64_t pe_number, break; /* search a free entry */ - if ((entf == -1) && + if ((window_num == -1) && ((!(p->mbt_cache[i][0] & IODA3_MBT0_ENABLE)) && (!(p->mbt_cache[i][1] & IODA3_MBT1_ENABLE)))) - entf = i; + window_num = i; } - if (entf >= 0 && i == p->mbt_size) { + if (window_num >= 0 && i == p->mbt_size) { /* no capi mmio window found, so add it */ - p->mbt_cache[entf][0] = mbt0; - p->mbt_cache[entf][1] = mbt1; + p->mbt_cache[window_num][0] = mbt0; + p->mbt_cache[window_num][1] = mbt1; - phb4_ioda_sel(p, IODA3_TBL_MBT, 0, true); - out_be64(p->regs + PHB_IODA_DATA0, p->mbt_cache[entf][0]); - out_be64(p->regs + PHB_IODA_DATA0, p->mbt_cache[entf][1]); + phb4_ioda_sel(p, IODA3_TBL_MBT, window_num << 1, true); + out_be64(p->regs + PHB_IODA_DATA0, mbt0); + out_be64(p->regs + PHB_IODA_DATA0, mbt1); } else if (i == p->mbt_size) { /* mbt cache full, this case should never happen */ PHBERR(p, "CAPP: Failed to add CAPI mmio window\n");
With the current code, the capi mmio window is not correctly configured in the IODA table entry. The first entry (generally the non-prefetchable BAR) is overwrriten. This patch sets the capi window bar at the right place. Signed-off-by: Christophe Lombard <clombard@linux.vnet.ibm.com> --- hw/phb4.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)