| Message ID | 20200806081415.208546-1-aneesh.kumar@linux.ibm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | powerpc/book3s64/radix: Make radix_mem_block_size 64bit | expand |
| Context | Check | Description |
|---|---|---|
| snowpatch_ozlabs/apply_patch | success | Successfully applied on branch powerpc/merge (3cd2184115b85cc8242fec3d42529cd112962984) |
| snowpatch_ozlabs/build-ppc64le | warning | Upstream build failed, couldn't test patch |
| snowpatch_ozlabs/build-ppc64be | warning | Upstream build failed, couldn't test patch |
| snowpatch_ozlabs/build-ppc64e | warning | Upstream build failed, couldn't test patch |
| snowpatch_ozlabs/build-pmac32 | warning | Upstream build failed, couldn't test patch |
| snowpatch_ozlabs/checkpatch | warning | total: 1 errors, 1 warnings, 0 checks, 24 lines checked |
| snowpatch_ozlabs/needsstable | success | Patch has no Fixes tags |
"Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com> writes: > Similar to commit: 89c140bbaeee ("pseries: Fix 64 bit logical memory block panic") > make sure we update different variables tracking lmb_size are updated > to be 64 bit. That commit went to all stable releases, should this one also? cheers > diff --git a/arch/powerpc/include/asm/book3s/64/mmu.h b/arch/powerpc/include/asm/book3s/64/mmu.h > index 55442d45c597..1a0c9d09950f 100644 > --- a/arch/powerpc/include/asm/book3s/64/mmu.h > +++ b/arch/powerpc/include/asm/book3s/64/mmu.h > @@ -85,7 +85,7 @@ extern unsigned int mmu_base_pid; > /* > * memory block size used with radix translation. > */ > -extern unsigned int __ro_after_init radix_mem_block_size; > +extern unsigned long __ro_after_init radix_mem_block_size; > > #define PRTB_SIZE_SHIFT (mmu_pid_bits + 4) > #define PRTB_ENTRIES (1ul << mmu_pid_bits) > diff --git a/arch/powerpc/include/asm/drmem.h b/arch/powerpc/include/asm/drmem.h > index 17ccc6474ab6..07c158c5f939 100644 > --- a/arch/powerpc/include/asm/drmem.h > +++ b/arch/powerpc/include/asm/drmem.h > @@ -21,7 +21,7 @@ struct drmem_lmb { > struct drmem_lmb_info { > struct drmem_lmb *lmbs; > int n_lmbs; > - u32 lmb_size; > + u64 lmb_size; > }; > > extern struct drmem_lmb_info *drmem_info; > diff --git a/arch/powerpc/mm/book3s64/radix_pgtable.c b/arch/powerpc/mm/book3s64/radix_pgtable.c > index 28c784976bed..ca76d9d6372a 100644 > --- a/arch/powerpc/mm/book3s64/radix_pgtable.c > +++ b/arch/powerpc/mm/book3s64/radix_pgtable.c > @@ -34,7 +34,7 @@ > > unsigned int mmu_pid_bits; > unsigned int mmu_base_pid; > -unsigned int radix_mem_block_size __ro_after_init; > +unsigned long radix_mem_block_size __ro_after_init; > > static __ref void *early_alloc_pgtable(unsigned long size, int nid, > unsigned long region_start, unsigned long region_end) > -- > 2.26.2
Michael Ellerman <mpe@ellerman.id.au> writes: > "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com> writes: >> Similar to commit: 89c140bbaeee ("pseries: Fix 64 bit logical memory block panic") >> make sure we update different variables tracking lmb_size are updated >> to be 64 bit. > > That commit went to all stable releases, should this one also? > radix_mem_block_size got added recently and it is not yet upstram. But the drmem_lmb_info change can be a stable candidate. We also need this I will split this as two patches? modified arch/powerpc/include/asm/drmem.h @@ -67,7 +67,7 @@ struct of_drconf_cell_v2 { #define DRCONF_MEM_RESERVED 0x00000080 #define DRCONF_MEM_HOTREMOVABLE 0x00000100 -static inline u32 drmem_lmb_size(void) +static inline u64 drmem_lmb_size(void) { return drmem_info->lmb_size; } -aneesh
"Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com> writes: > Michael Ellerman <mpe@ellerman.id.au> writes: > >> "Aneesh Kumar K.V" <aneesh.kumar@linux.ibm.com> writes: >>> Similar to commit: 89c140bbaeee ("pseries: Fix 64 bit logical memory block panic") >>> make sure we update different variables tracking lmb_size are updated >>> to be 64 bit. >> >> That commit went to all stable releases, should this one also? >> > > radix_mem_block_size got added recently and it is not yet upstram. But > the drmem_lmb_info change can be a stable candidate. We also need this > > I will split this as two patches? Yes, sounds good. cheers > modified arch/powerpc/include/asm/drmem.h > @@ -67,7 +67,7 @@ struct of_drconf_cell_v2 { > #define DRCONF_MEM_RESERVED 0x00000080 > #define DRCONF_MEM_HOTREMOVABLE 0x00000100 > > -static inline u32 drmem_lmb_size(void) > +static inline u64 drmem_lmb_size(void) > { > return drmem_info->lmb_size; > } > > -aneesh
diff --git a/arch/powerpc/include/asm/book3s/64/mmu.h b/arch/powerpc/include/asm/book3s/64/mmu.h index 55442d45c597..1a0c9d09950f 100644 --- a/arch/powerpc/include/asm/book3s/64/mmu.h +++ b/arch/powerpc/include/asm/book3s/64/mmu.h @@ -85,7 +85,7 @@ extern unsigned int mmu_base_pid; /* * memory block size used with radix translation. */ -extern unsigned int __ro_after_init radix_mem_block_size; +extern unsigned long __ro_after_init radix_mem_block_size; #define PRTB_SIZE_SHIFT (mmu_pid_bits + 4) #define PRTB_ENTRIES (1ul << mmu_pid_bits) diff --git a/arch/powerpc/include/asm/drmem.h b/arch/powerpc/include/asm/drmem.h index 17ccc6474ab6..07c158c5f939 100644 --- a/arch/powerpc/include/asm/drmem.h +++ b/arch/powerpc/include/asm/drmem.h @@ -21,7 +21,7 @@ struct drmem_lmb { struct drmem_lmb_info { struct drmem_lmb *lmbs; int n_lmbs; - u32 lmb_size; + u64 lmb_size; }; extern struct drmem_lmb_info *drmem_info; diff --git a/arch/powerpc/mm/book3s64/radix_pgtable.c b/arch/powerpc/mm/book3s64/radix_pgtable.c index 28c784976bed..ca76d9d6372a 100644 --- a/arch/powerpc/mm/book3s64/radix_pgtable.c +++ b/arch/powerpc/mm/book3s64/radix_pgtable.c @@ -34,7 +34,7 @@ unsigned int mmu_pid_bits; unsigned int mmu_base_pid; -unsigned int radix_mem_block_size __ro_after_init; +unsigned long radix_mem_block_size __ro_after_init; static __ref void *early_alloc_pgtable(unsigned long size, int nid, unsigned long region_start, unsigned long region_end)
Similar to commit: 89c140bbaeee ("pseries: Fix 64 bit logical memory block panic") make sure we update different variables tracking lmb_size are updated to be 64 bit. Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> --- arch/powerpc/include/asm/book3s/64/mmu.h | 2 +- arch/powerpc/include/asm/drmem.h | 2 +- arch/powerpc/mm/book3s64/radix_pgtable.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)