Message ID | 1498577261.3651.33.camel@kernel.crashing.org |
---|---|
State | Accepted |
Headers | show |
On Tue, 2017-06-27 at 10:27 -0500, Benjamin Herrenschmidt wrote: > On PHB4 the number of index bits in the IODA table address register > was bumped to 10 bits to accomodate for 1024 MSIs and 1024 TVEs (DD2). > > However our macro only defined the field to be 9 bits, thus causing > "interesting" behaviours on some systems. > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Acked-by: Michael Neuling <mikey@neuling.org> > --- > include/phb4-regs.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/phb4-regs.h b/include/phb4-regs.h > index d22acf4..14e9351 100644 > --- a/include/phb4-regs.h > +++ b/include/phb4-regs.h > @@ -97,7 +97,7 @@ > #define PHB_IODA_AD_AUTOINC PPC_BIT(0) > #define PHB_IODA_AD_TSEL PPC_BITMASK(11,15) > #define PHB_IODA_AD_MIST_PWV PPC_BITMASK(28,31) > -#define PHB_IODA_AD_TADR PPC_BITMASK(55,63) > +#define PHB_IODA_AD_TADR PPC_BITMASK(54,63) > #define PHB_IODA_DATA0 0x228 > #define PHB_FFI_REQUEST 0x238 > #define PHB_FFI_LOCK_CLEAR PPC_BIT(3) > > > _______________________________________________ > Skiboot mailing list > Skiboot@lists.ozlabs.org > https://lists.ozlabs.org/listinfo/skiboot
Benjamin Herrenschmidt <benh@kernel.crashing.org> writes: > On PHB4 the number of index bits in the IODA table address register > was bumped to 10 bits to accomodate for 1024 MSIs and 1024 TVEs (DD2). > > However our macro only defined the field to be 9 bits, thus causing > "interesting" behaviours on some systems. > > Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> > --- > include/phb4-regs.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) Merged to master and in for 5.7-rc1 as of ed8da3280e9ddeb33d76efaf4dff5b71eff642a7
diff --git a/include/phb4-regs.h b/include/phb4-regs.h index d22acf4..14e9351 100644 --- a/include/phb4-regs.h +++ b/include/phb4-regs.h @@ -97,7 +97,7 @@ #define PHB_IODA_AD_AUTOINC PPC_BIT(0) #define PHB_IODA_AD_TSEL PPC_BITMASK(11,15) #define PHB_IODA_AD_MIST_PWV PPC_BITMASK(28,31) -#define PHB_IODA_AD_TADR PPC_BITMASK(55,63) +#define PHB_IODA_AD_TADR PPC_BITMASK(54,63) #define PHB_IODA_DATA0 0x228 #define PHB_FFI_REQUEST 0x238 #define PHB_FFI_LOCK_CLEAR PPC_BIT(3)
On PHB4 the number of index bits in the IODA table address register was bumped to 10 bits to accomodate for 1024 MSIs and 1024 TVEs (DD2). However our macro only defined the field to be 9 bits, thus causing "interesting" behaviours on some systems. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> --- include/phb4-regs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)