| Message ID | 20190604210010.7405-2-dann.frazier@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [1/4,Unstable,SRU,Disco] UBUNTU: [Config] Bump CMA_SIZE_MBYTES to 32 on arm64 | expand |
On Tue, Jun 4, 2019 at 3:00 PM dann frazier <dann.frazier@canonical.com> wrote: > > BugLink: http://bugs.launchpad.net/bugs/1823753 > > This aligns us with the upstream defconfig which was bumped to 32 for > the VC4 SoC in commit 7304a9a99d7b15fd69b3f00f7e16206bba110b35 > ("arm64: defconfig: Increase CMA size for VC4") btw, do I need to do anything to be sure the equivalent is applied to debian.hwe{-edge}/ in the HWE package? -dann > Signed-off-by: dann frazier <dann.frazier@canonical.com> > --- > debian.master/config/annotations | 2 +- > debian.master/config/config.common.ubuntu | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/debian.master/config/annotations b/debian.master/config/annotations > index 008ead6f697cd..062688998114b 100644 > --- a/debian.master/config/annotations > +++ b/debian.master/config/annotations > @@ -1484,7 +1484,7 @@ CONFIG_DEVTMPFS_MOUNT note<ENFORCED> note<upstart requ > > # Menu: Device Drivers >> Generic Driver Options >> DMA Contiguous Memory Allocator > CONFIG_DMA_CMA policy<{'amd64': 'n', 'arm64': 'y', 'armhf-generic': 'y', 'armhf-generic-lpae': 'n', 'i386': 'n', 's390x': 'n'}> > -CONFIG_CMA_SIZE_MBYTES policy<{'arm64': '16', 'armhf-generic': '16'}> > +CONFIG_CMA_SIZE_MBYTES policy<{'arm64': '32', 'armhf-generic': '16'}> > CONFIG_CMA_ALIGNMENT policy<{'arm64': '8', 'armhf-generic': '8'}> > # > CONFIG_DMA_CMA note<ENFORCED> note<LP#1362261> note<LP:1803206> > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu > index df275aa4a69d3..6d5f4835a28bf 100644 > --- a/debian.master/config/config.common.ubuntu > +++ b/debian.master/config/config.common.ubuntu > @@ -1532,7 +1532,7 @@ CONFIG_CMA_ALIGNMENT=8 > CONFIG_CMA_AREAS=7 > # CONFIG_CMA_DEBUG is not set > # CONFIG_CMA_DEBUGFS is not set > -CONFIG_CMA_SIZE_MBYTES=16 > +CONFIG_CMA_SIZE_MBYTES=32 > # CONFIG_CMA_SIZE_SEL_MAX is not set > CONFIG_CMA_SIZE_SEL_MBYTES=y > # CONFIG_CMA_SIZE_SEL_MIN is not set > -- > 2.20.1 >
On 25.06.19 23:17, dann frazier wrote: > On Tue, Jun 4, 2019 at 3:00 PM dann frazier <dann.frazier@canonical.com> wrote: >> >> BugLink: http://bugs.launchpad.net/bugs/1823753 >> >> This aligns us with the upstream defconfig which was bumped to 32 for >> the VC4 SoC in commit 7304a9a99d7b15fd69b3f00f7e16206bba110b35 >> ("arm64: defconfig: Increase CMA size for VC4") > > btw, do I need to do anything to be sure the equivalent is applied to > debian.hwe{-edge}/ in the HWE package? Config subdirectory gets copied into hwe, so it should propagate automatically. I am just a bit confused by Seth's comment in his ACK. Is that something that should be done for Disco, too? -Stefan > > -dann > >> Signed-off-by: dann frazier <dann.frazier@canonical.com> >> --- >> debian.master/config/annotations | 2 +- >> debian.master/config/config.common.ubuntu | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/debian.master/config/annotations b/debian.master/config/annotations >> index 008ead6f697cd..062688998114b 100644 >> --- a/debian.master/config/annotations >> +++ b/debian.master/config/annotations >> @@ -1484,7 +1484,7 @@ CONFIG_DEVTMPFS_MOUNT note<ENFORCED> note<upstart requ >> >> # Menu: Device Drivers >> Generic Driver Options >> DMA Contiguous Memory Allocator >> CONFIG_DMA_CMA policy<{'amd64': 'n', 'arm64': 'y', 'armhf-generic': 'y', 'armhf-generic-lpae': 'n', 'i386': 'n', 's390x': 'n'}> >> -CONFIG_CMA_SIZE_MBYTES policy<{'arm64': '16', 'armhf-generic': '16'}> >> +CONFIG_CMA_SIZE_MBYTES policy<{'arm64': '32', 'armhf-generic': '16'}> >> CONFIG_CMA_ALIGNMENT policy<{'arm64': '8', 'armhf-generic': '8'}> >> # >> CONFIG_DMA_CMA note<ENFORCED> note<LP#1362261> note<LP:1803206> >> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu >> index df275aa4a69d3..6d5f4835a28bf 100644 >> --- a/debian.master/config/config.common.ubuntu >> +++ b/debian.master/config/config.common.ubuntu >> @@ -1532,7 +1532,7 @@ CONFIG_CMA_ALIGNMENT=8 >> CONFIG_CMA_AREAS=7 >> # CONFIG_CMA_DEBUG is not set >> # CONFIG_CMA_DEBUGFS is not set >> -CONFIG_CMA_SIZE_MBYTES=16 >> +CONFIG_CMA_SIZE_MBYTES=32 >> # CONFIG_CMA_SIZE_SEL_MAX is not set >> CONFIG_CMA_SIZE_SEL_MBYTES=y >> # CONFIG_CMA_SIZE_SEL_MIN is not set >> -- >> 2.20.1 >> >
On Fri, Jun 28, 2019 at 05:20:18PM +0200, Stefan Bader wrote: > On 25.06.19 23:17, dann frazier wrote: > > On Tue, Jun 4, 2019 at 3:00 PM dann frazier <dann.frazier@canonical.com> wrote: > >> > >> BugLink: http://bugs.launchpad.net/bugs/1823753 > >> > >> This aligns us with the upstream defconfig which was bumped to 32 for > >> the VC4 SoC in commit 7304a9a99d7b15fd69b3f00f7e16206bba110b35 > >> ("arm64: defconfig: Increase CMA size for VC4") > > > > btw, do I need to do anything to be sure the equivalent is applied to > > debian.hwe{-edge}/ in the HWE package? > > Config subdirectory gets copied into hwe, so it should propagate automatically. > I am just a bit confused by Seth's comment in his ACK. Is that something that > should be done for Disco, too? I think so -- it' unlikely the value will get accidetnally changed, but if it does it's only going to get caught if you enforce the value. And really, what's the point of updating the annotations in a stable release if you don't enforce the value? Annotations are only really used for config review and enforcing config values, and we don't do config reviews for stable releases.
On Fri, Jun 28, 2019 at 9:38 AM Seth Forshee <seth.forshee@canonical.com> wrote: > > On Fri, Jun 28, 2019 at 05:20:18PM +0200, Stefan Bader wrote: > > On 25.06.19 23:17, dann frazier wrote: > > > On Tue, Jun 4, 2019 at 3:00 PM dann frazier <dann.frazier@canonical.com> wrote: > > >> > > >> BugLink: http://bugs.launchpad.net/bugs/1823753 > > >> > > >> This aligns us with the upstream defconfig which was bumped to 32 for > > >> the VC4 SoC in commit 7304a9a99d7b15fd69b3f00f7e16206bba110b35 > > >> ("arm64: defconfig: Increase CMA size for VC4") > > > > > > btw, do I need to do anything to be sure the equivalent is applied to > > > debian.hwe{-edge}/ in the HWE package? > > > > Config subdirectory gets copied into hwe, so it should propagate automatically. > > I am just a bit confused by Seth's comment in his ACK. Is that something that > > should be done for Disco, too? > > I think so -- it' unlikely the value will get accidetnally changed, but > if it does it's only going to get caught if you enforce the value. > > And really, what's the point of updating the annotations in a stable > release if you don't enforce the value? Annotations are only really used > for config review and enforcing config values, and we don't do config > reviews for stable releases. Reasonable - would you like me to submit a v2 for disco w/ that enforcement in-place (i.e. cherry-picking what you applied to unstable)? -dann
On 28.06.19 18:02, dann frazier wrote: > On Fri, Jun 28, 2019 at 9:38 AM Seth Forshee <seth.forshee@canonical.com> wrote: >> >> On Fri, Jun 28, 2019 at 05:20:18PM +0200, Stefan Bader wrote: >>> On 25.06.19 23:17, dann frazier wrote: >>>> On Tue, Jun 4, 2019 at 3:00 PM dann frazier <dann.frazier@canonical.com> wrote: >>>>> >>>>> BugLink: http://bugs.launchpad.net/bugs/1823753 >>>>> >>>>> This aligns us with the upstream defconfig which was bumped to 32 for >>>>> the VC4 SoC in commit 7304a9a99d7b15fd69b3f00f7e16206bba110b35 >>>>> ("arm64: defconfig: Increase CMA size for VC4") >>>> >>>> btw, do I need to do anything to be sure the equivalent is applied to >>>> debian.hwe{-edge}/ in the HWE package? >>> >>> Config subdirectory gets copied into hwe, so it should propagate automatically. >>> I am just a bit confused by Seth's comment in his ACK. Is that something that >>> should be done for Disco, too? >> >> I think so -- it' unlikely the value will get accidetnally changed, but >> if it does it's only going to get caught if you enforce the value. >> >> And really, what's the point of updating the annotations in a stable >> release if you don't enforce the value? Annotations are only really used >> for config review and enforcing config values, and we don't do config >> reviews for stable releases. > > Reasonable - would you like me to submit a v2 for disco w/ that > enforcement in-place (i.e. cherry-picking what you applied to > unstable)? > > -dann > Might be simplest if we pick from unstable Acked-by: Stefan Bader <stefan.bader@canonical.com>
On 04.06.19 23:00, dann frazier wrote: > BugLink: http://bugs.launchpad.net/bugs/1823753 > > This aligns us with the upstream defconfig which was bumped to 32 for > the VC4 SoC in commit 7304a9a99d7b15fd69b3f00f7e16206bba110b35 > ("arm64: defconfig: Increase CMA size for VC4") > > Signed-off-by: dann frazier <dann.frazier@canonical.com> > --- > debian.master/config/annotations | 2 +- > debian.master/config/config.common.ubuntu | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/debian.master/config/annotations b/debian.master/config/annotations > index 008ead6f697cd..062688998114b 100644 > --- a/debian.master/config/annotations > +++ b/debian.master/config/annotations > @@ -1484,7 +1484,7 @@ CONFIG_DEVTMPFS_MOUNT note<ENFORCED> note<upstart requ > > # Menu: Device Drivers >> Generic Driver Options >> DMA Contiguous Memory Allocator > CONFIG_DMA_CMA policy<{'amd64': 'n', 'arm64': 'y', 'armhf-generic': 'y', 'armhf-generic-lpae': 'n', 'i386': 'n', 's390x': 'n'}> > -CONFIG_CMA_SIZE_MBYTES policy<{'arm64': '16', 'armhf-generic': '16'}> > +CONFIG_CMA_SIZE_MBYTES policy<{'arm64': '32', 'armhf-generic': '16'}> > CONFIG_CMA_ALIGNMENT policy<{'arm64': '8', 'armhf-generic': '8'}> > # > CONFIG_DMA_CMA note<ENFORCED> note<LP#1362261> note<LP:1803206> > diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu > index df275aa4a69d3..6d5f4835a28bf 100644 > --- a/debian.master/config/config.common.ubuntu > +++ b/debian.master/config/config.common.ubuntu > @@ -1532,7 +1532,7 @@ CONFIG_CMA_ALIGNMENT=8 > CONFIG_CMA_AREAS=7 > # CONFIG_CMA_DEBUG is not set > # CONFIG_CMA_DEBUGFS is not set > -CONFIG_CMA_SIZE_MBYTES=16 > +CONFIG_CMA_SIZE_MBYTES=32 This turns out to cause the builds to fail as armhf is enforced to be 16. I have now changed this patch to only change the arm64 setting (moves that option out from config.common.ubuntu into the arm64 and armhf common configs). -Stefan > # CONFIG_CMA_SIZE_SEL_MAX is not set > CONFIG_CMA_SIZE_SEL_MBYTES=y > # CONFIG_CMA_SIZE_SEL_MIN is not set >
diff --git a/debian.master/config/annotations b/debian.master/config/annotations index 008ead6f697cd..062688998114b 100644 --- a/debian.master/config/annotations +++ b/debian.master/config/annotations @@ -1484,7 +1484,7 @@ CONFIG_DEVTMPFS_MOUNT note<ENFORCED> note<upstart requ # Menu: Device Drivers >> Generic Driver Options >> DMA Contiguous Memory Allocator CONFIG_DMA_CMA policy<{'amd64': 'n', 'arm64': 'y', 'armhf-generic': 'y', 'armhf-generic-lpae': 'n', 'i386': 'n', 's390x': 'n'}> -CONFIG_CMA_SIZE_MBYTES policy<{'arm64': '16', 'armhf-generic': '16'}> +CONFIG_CMA_SIZE_MBYTES policy<{'arm64': '32', 'armhf-generic': '16'}> CONFIG_CMA_ALIGNMENT policy<{'arm64': '8', 'armhf-generic': '8'}> # CONFIG_DMA_CMA note<ENFORCED> note<LP#1362261> note<LP:1803206> diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index df275aa4a69d3..6d5f4835a28bf 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -1532,7 +1532,7 @@ CONFIG_CMA_ALIGNMENT=8 CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUG is not set # CONFIG_CMA_DEBUGFS is not set -CONFIG_CMA_SIZE_MBYTES=16 +CONFIG_CMA_SIZE_MBYTES=32 # CONFIG_CMA_SIZE_SEL_MAX is not set CONFIG_CMA_SIZE_SEL_MBYTES=y # CONFIG_CMA_SIZE_SEL_MIN is not set
BugLink: http://bugs.launchpad.net/bugs/1823753 This aligns us with the upstream defconfig which was bumped to 32 for the VC4 SoC in commit 7304a9a99d7b15fd69b3f00f7e16206bba110b35 ("arm64: defconfig: Increase CMA size for VC4") Signed-off-by: dann frazier <dann.frazier@canonical.com> --- debian.master/config/annotations | 2 +- debian.master/config/config.common.ubuntu | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)