| Message ID | 20230911-msm8916-rmem-v1-4-b7089ec3e3a1@gerhold.net (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 0ed3d82862e8451cc2b14ddb1b064e72ba3e5a60 |
| Headers | show |
| Series | arm64: dts: qcom: msm8916/39: Reserve firmware memory dynamically | expand |
On 11.09.2023 19:41, Stephan Gerhold wrote: > Most of the reserved firmware memory on MSM8916 can be relocated when > respecting the required alignment. To avoid having to precompute the > reserved memory regions in every board DT, describe the actual > requirements (size, alignment, alloc-ranges) using the dynamic reserved > memory allocation. > > This approach has several advantages: > > 1. We can define "templates" for the reserved memory regions in > msm8916.dtsi and keep only device-specific details in the board DT. > This is useful for the "mpss" region size for example, which varies > from device to device. It is no longer necessary to redefine all > firmware regions to shift their addresses. > > 2. When some of the functionality (e.g. WCNSS, Modem, Venus) is not > enabled or needed for a device, the reserved memory can stay > disabled, freeing up the unused reservation for Linux. > > 3. Devices with special requirements for one of the firmware regions > are handled automatically. For example, msm8916-longcheer-l8150 > has non-relocatable "wcnss" firmware that must be loaded exactly > at address 0x8b600000. When this is defined as a static region, > the other dynamic allocations automatically adjust to a different > place with suitable alignment. > > All in all this approach significantly reduces the boilerplate necessary > to define the different firmware regions, and makes it easier to enable > functionality on the different devices. > > Signed-off-by: Stephan Gerhold <stephan@gerhold.net> > --- [...] > > mpss_mem: mpss@86800000 { > + /* > + * The memory region for the mpss firmware is generally > + * relocatable and could be allocated dynamically. > + * However, many firmware versions tend to fail when > + * loaded to some special addresses, so it is hard to > + * define reliable alloc-ranges. > + * > + * alignment = <0x0 0x400000>; > + * alloc-ranges = <0x0 0x86800000 0x0 0x8000000>; > + */ Do we know of any devices that this would actually work on? Konrad
On 13/09/2023 10:06, Konrad Dybcio wrote: > On 11.09.2023 19:41, Stephan Gerhold wrote: >> Most of the reserved firmware memory on MSM8916 can be relocated when >> respecting the required alignment. To avoid having to precompute the >> reserved memory regions in every board DT, describe the actual >> requirements (size, alignment, alloc-ranges) using the dynamic reserved >> memory allocation. >> >> This approach has several advantages: >> >> 1. We can define "templates" for the reserved memory regions in >> msm8916.dtsi and keep only device-specific details in the board DT. >> This is useful for the "mpss" region size for example, which varies >> from device to device. It is no longer necessary to redefine all >> firmware regions to shift their addresses. >> >> 2. When some of the functionality (e.g. WCNSS, Modem, Venus) is not >> enabled or needed for a device, the reserved memory can stay >> disabled, freeing up the unused reservation for Linux. >> >> 3. Devices with special requirements for one of the firmware regions >> are handled automatically. For example, msm8916-longcheer-l8150 >> has non-relocatable "wcnss" firmware that must be loaded exactly >> at address 0x8b600000. When this is defined as a static region, >> the other dynamic allocations automatically adjust to a different >> place with suitable alignment. >> >> All in all this approach significantly reduces the boilerplate necessary >> to define the different firmware regions, and makes it easier to enable >> functionality on the different devices. >> >> Signed-off-by: Stephan Gerhold <stephan@gerhold.net> >> --- > [...] > >> >> mpss_mem: mpss@86800000 { >> + /* >> + * The memory region for the mpss firmware is generally >> + * relocatable and could be allocated dynamically. >> + * However, many firmware versions tend to fail when >> + * loaded to some special addresses, so it is hard to >> + * define reliable alloc-ranges. >> + * >> + * alignment = <0x0 0x400000>; >> + * alloc-ranges = <0x0 0x86800000 0x0 0x8000000>; >> + */ > Do we know of any devices that this would actually work on? > > Konrad I have the same question here. How was this tested ? --- bod
On Wed, Sep 13, 2023 at 10:12:12AM +0100, Bryan O'Donoghue wrote: > On 13/09/2023 10:06, Konrad Dybcio wrote: > > On 11.09.2023 19:41, Stephan Gerhold wrote: > > > Most of the reserved firmware memory on MSM8916 can be relocated when > > > respecting the required alignment. To avoid having to precompute the > > > reserved memory regions in every board DT, describe the actual > > > requirements (size, alignment, alloc-ranges) using the dynamic reserved > > > memory allocation. > > > > > > This approach has several advantages: > > > > > > 1. We can define "templates" for the reserved memory regions in > > > msm8916.dtsi and keep only device-specific details in the board DT. > > > This is useful for the "mpss" region size for example, which varies > > > from device to device. It is no longer necessary to redefine all > > > firmware regions to shift their addresses. > > > > > > 2. When some of the functionality (e.g. WCNSS, Modem, Venus) is not > > > enabled or needed for a device, the reserved memory can stay > > > disabled, freeing up the unused reservation for Linux. > > > > > > 3. Devices with special requirements for one of the firmware regions > > > are handled automatically. For example, msm8916-longcheer-l8150 > > > has non-relocatable "wcnss" firmware that must be loaded exactly > > > at address 0x8b600000. When this is defined as a static region, > > > the other dynamic allocations automatically adjust to a different > > > place with suitable alignment. > > > > > > All in all this approach significantly reduces the boilerplate necessary > > > to define the different firmware regions, and makes it easier to enable > > > functionality on the different devices. > > > > > > Signed-off-by: Stephan Gerhold <stephan@gerhold.net> > > > --- > > [...] > > > > > mpss_mem: mpss@86800000 { > > > + /* > > > + * The memory region for the mpss firmware is generally > > > + * relocatable and could be allocated dynamically. > > > + * However, many firmware versions tend to fail when > > > + * loaded to some special addresses, so it is hard to > > > + * define reliable alloc-ranges. > > > + * > > > + * alignment = <0x0 0x400000>; > > > + * alloc-ranges = <0x0 0x86800000 0x0 0x8000000>; > > > + */ > > Do we know of any devices that this would actually work on? Yes, the "modem" firmware on DB410c seems to be fine with literally all correctly aligned addresses I've tested so far. But when I manually experimented with other addresses on actual smartphones it exploded on certain addresses, specific to the firmware version / device. > I have the same question here. > > How was this tested ? > Bryan, your question sounds more general, about the dynamic allocation of the firmware regions in general (also for wcnss etc). I'll just explain my tests for both with more detail :D For wcnss/venus a different memory region has been used in postmarketOS for years because I shifted it early on to make room for the larger modem firmware. I've never heard of any problems with this on the 50+ different MSM8916-related devices we support there, with many different firmware versions. When preparing this patch set I experimented some more and noticed there is a limit (I think around 0x90000000) where TZ refuses to load/verify the firmware. The alloc-ranges is chosen conservatively to avoid potential trouble. Also because I didn't see any use case to have a huge range specified there... For mpss it's more tricky. First, if you'd comment out the alignment and alloc-ranges it would most likely work correctly because Linux just allocates it at the start of the range, on 0x86800000 like it was before. However, the DT spec doesn't strictly specify where inside the range the region is allocated, so I manually experimented with some other addresses within the range: - On DB410c it works just fine. All addresses I tried work without any problems. - On longcheer-l8150 the modem firmare works fine when the memory region starts somewhere between 0x86800000 and 0x8a800000. It also works again after 0x8e800000. But on anything between 0x8a800000 and 0x8e800000 it's broken for who knows what reason. - On some Samsung devices only 0x86800000 and maybe one or two other addresses worked, again for who knows what reason. Most other addresses were broken. The symptom is usually some timeout while starting, the actual signature verification seems to work fine. I believe that in theory it's supposed to be relocatable, but in practice they hardcoded some addresses or did some other funny stuff in some of the firmware versions. To be safe my conclusion was to keep mpss at a fixed address and only allocate the others dynamically. This is how the patch implements it. Thanks, Stephan
On 13.09.2023 12:14, Stephan Gerhold wrote: > On Wed, Sep 13, 2023 at 10:12:12AM +0100, Bryan O'Donoghue wrote: >> On 13/09/2023 10:06, Konrad Dybcio wrote: >>> On 11.09.2023 19:41, Stephan Gerhold wrote: >>>> Most of the reserved firmware memory on MSM8916 can be relocated when >>>> respecting the required alignment. To avoid having to precompute the >>>> reserved memory regions in every board DT, describe the actual >>>> requirements (size, alignment, alloc-ranges) using the dynamic reserved >>>> memory allocation. >>>> >>>> This approach has several advantages: >>>> >>>> 1. We can define "templates" for the reserved memory regions in >>>> msm8916.dtsi and keep only device-specific details in the board DT. >>>> This is useful for the "mpss" region size for example, which varies >>>> from device to device. It is no longer necessary to redefine all >>>> firmware regions to shift their addresses. >>>> >>>> 2. When some of the functionality (e.g. WCNSS, Modem, Venus) is not >>>> enabled or needed for a device, the reserved memory can stay >>>> disabled, freeing up the unused reservation for Linux. >>>> >>>> 3. Devices with special requirements for one of the firmware regions >>>> are handled automatically. For example, msm8916-longcheer-l8150 >>>> has non-relocatable "wcnss" firmware that must be loaded exactly >>>> at address 0x8b600000. When this is defined as a static region, >>>> the other dynamic allocations automatically adjust to a different >>>> place with suitable alignment. >>>> >>>> All in all this approach significantly reduces the boilerplate necessary >>>> to define the different firmware regions, and makes it easier to enable >>>> functionality on the different devices. >>>> >>>> Signed-off-by: Stephan Gerhold <stephan@gerhold.net> >>>> --- >>> [...] >>> >>>> mpss_mem: mpss@86800000 { >>>> + /* >>>> + * The memory region for the mpss firmware is generally >>>> + * relocatable and could be allocated dynamically. >>>> + * However, many firmware versions tend to fail when >>>> + * loaded to some special addresses, so it is hard to >>>> + * define reliable alloc-ranges. >>>> + * >>>> + * alignment = <0x0 0x400000>; >>>> + * alloc-ranges = <0x0 0x86800000 0x0 0x8000000>; >>>> + */ >>> Do we know of any devices that this would actually work on? > > Yes, the "modem" firmware on DB410c seems to be fine with literally all > correctly aligned addresses I've tested so far. But when I manually > experimented with other addresses on actual smartphones it exploded on > certain addresses, specific to the firmware version / device. Moreover, the "modem" on DB410c would probably be fine with *anything* you try to give it.. [...] > > - On DB410c it works just fine. All addresses I tried work without any > problems. > > - On longcheer-l8150 the modem firmare works fine when the memory > region starts somewhere between 0x86800000 and 0x8a800000. It also > works again after 0x8e800000. But on anything between 0x8a800000 and > 0x8e800000 it's broken for who knows what reason. > > - On some Samsung devices only 0x86800000 and maybe one or two other > addresses worked, again for who knows what reason. Most other > addresses were broken. Were you able to find a phone (likely a very reference-design-based one) that this worked on, btw? [...] > To be safe my conclusion was to keep mpss at a fixed address and only > allocate the others dynamically. This is how the patch implements it. That sounds like the sane approach indeed. Konrad
On Wed, Sep 13, 2023 at 09:39:50PM +0200, Konrad Dybcio wrote: > On 13.09.2023 12:14, Stephan Gerhold wrote: > > On Wed, Sep 13, 2023 at 10:12:12AM +0100, Bryan O'Donoghue wrote: > >> On 13/09/2023 10:06, Konrad Dybcio wrote: > >>> On 11.09.2023 19:41, Stephan Gerhold wrote: > >>>> Most of the reserved firmware memory on MSM8916 can be relocated when > >>>> respecting the required alignment. To avoid having to precompute the > >>>> reserved memory regions in every board DT, describe the actual > >>>> requirements (size, alignment, alloc-ranges) using the dynamic reserved > >>>> memory allocation. > >>>> > >>>> This approach has several advantages: > >>>> > >>>> 1. We can define "templates" for the reserved memory regions in > >>>> msm8916.dtsi and keep only device-specific details in the board DT. > >>>> This is useful for the "mpss" region size for example, which varies > >>>> from device to device. It is no longer necessary to redefine all > >>>> firmware regions to shift their addresses. > >>>> > >>>> 2. When some of the functionality (e.g. WCNSS, Modem, Venus) is not > >>>> enabled or needed for a device, the reserved memory can stay > >>>> disabled, freeing up the unused reservation for Linux. > >>>> > >>>> 3. Devices with special requirements for one of the firmware regions > >>>> are handled automatically. For example, msm8916-longcheer-l8150 > >>>> has non-relocatable "wcnss" firmware that must be loaded exactly > >>>> at address 0x8b600000. When this is defined as a static region, > >>>> the other dynamic allocations automatically adjust to a different > >>>> place with suitable alignment. > >>>> > >>>> All in all this approach significantly reduces the boilerplate necessary > >>>> to define the different firmware regions, and makes it easier to enable > >>>> functionality on the different devices. > >>>> > >>>> Signed-off-by: Stephan Gerhold <stephan@gerhold.net> > >>>> --- > >>> [...] > >>> > >>>> mpss_mem: mpss@86800000 { > >>>> + /* > >>>> + * The memory region for the mpss firmware is generally > >>>> + * relocatable and could be allocated dynamically. > >>>> + * However, many firmware versions tend to fail when > >>>> + * loaded to some special addresses, so it is hard to > >>>> + * define reliable alloc-ranges. > >>>> + * > >>>> + * alignment = <0x0 0x400000>; > >>>> + * alloc-ranges = <0x0 0x86800000 0x0 0x8000000>; > >>>> + */ > >>> Do we know of any devices that this would actually work on? > [...] > > - On DB410c it works just fine. All addresses I tried work without any > > problems. > > > > - On longcheer-l8150 the modem firmare works fine when the memory > > region starts somewhere between 0x86800000 and 0x8a800000. It also > > works again after 0x8e800000. But on anything between 0x8a800000 and > > 0x8e800000 it's broken for who knows what reason. > > [...] > Were you able to find a phone (likely a very reference-design-based > one) that this worked on, btw? Actually I would count the Longcheer devices (l8150 = Wileyfox Swift and l8910 = BQ Aquaris X5) to the category of close-to-QRD-based devices. Based on quick tests both behave like described above (only 0x8a800000-0x8e800000 is broken). Same for wingtech-wt88047. In other words, for those using the dynamic allocation would work fine, because the alloc-ranges = <0x0 0x86800000 0x0 0x8000000>; only includes working start addresses from 0x86800000 to ~0x89800000 (with a size of 0x5000000). I guess I could use it for them and only make other devices use a fixed address. But I also don't quite have the capacity to test every device to see if relocating the region works or not. I think it's still easiest to allocate mpss on a fixed address everywhere. The only real disadvantage is that overriding "reg", e.g. &mpss_mem { reg = <0x0 0x86800000 0x0 0x5100000>; }; is a bit more ugly than overriding size: &mpss_mem { size = <0x0 0x5100000>; }; but well, this is a very minor disadvantage. Thanks, Stephan
On 14.09.2023 16:09, Stephan Gerhold wrote: > On Wed, Sep 13, 2023 at 09:39:50PM +0200, Konrad Dybcio wrote: >> On 13.09.2023 12:14, Stephan Gerhold wrote: >>> On Wed, Sep 13, 2023 at 10:12:12AM +0100, Bryan O'Donoghue wrote: >>>> On 13/09/2023 10:06, Konrad Dybcio wrote: >>>>> On 11.09.2023 19:41, Stephan Gerhold wrote: >>>>>> Most of the reserved firmware memory on MSM8916 can be relocated when >>>>>> respecting the required alignment. To avoid having to precompute the >>>>>> reserved memory regions in every board DT, describe the actual >>>>>> requirements (size, alignment, alloc-ranges) using the dynamic reserved >>>>>> memory allocation. >>>>>> >>>>>> This approach has several advantages: >>>>>> >>>>>> 1. We can define "templates" for the reserved memory regions in >>>>>> msm8916.dtsi and keep only device-specific details in the board DT. >>>>>> This is useful for the "mpss" region size for example, which varies >>>>>> from device to device. It is no longer necessary to redefine all >>>>>> firmware regions to shift their addresses. >>>>>> >>>>>> 2. When some of the functionality (e.g. WCNSS, Modem, Venus) is not >>>>>> enabled or needed for a device, the reserved memory can stay >>>>>> disabled, freeing up the unused reservation for Linux. >>>>>> >>>>>> 3. Devices with special requirements for one of the firmware regions >>>>>> are handled automatically. For example, msm8916-longcheer-l8150 >>>>>> has non-relocatable "wcnss" firmware that must be loaded exactly >>>>>> at address 0x8b600000. When this is defined as a static region, >>>>>> the other dynamic allocations automatically adjust to a different >>>>>> place with suitable alignment. >>>>>> >>>>>> All in all this approach significantly reduces the boilerplate necessary >>>>>> to define the different firmware regions, and makes it easier to enable >>>>>> functionality on the different devices. >>>>>> >>>>>> Signed-off-by: Stephan Gerhold <stephan@gerhold.net> >>>>>> --- >>>>> [...] >>>>> >>>>>> mpss_mem: mpss@86800000 { >>>>>> + /* >>>>>> + * The memory region for the mpss firmware is generally >>>>>> + * relocatable and could be allocated dynamically. >>>>>> + * However, many firmware versions tend to fail when >>>>>> + * loaded to some special addresses, so it is hard to >>>>>> + * define reliable alloc-ranges. >>>>>> + * >>>>>> + * alignment = <0x0 0x400000>; >>>>>> + * alloc-ranges = <0x0 0x86800000 0x0 0x8000000>; >>>>>> + */ >>>>> Do we know of any devices that this would actually work on? >> [...] >>> - On DB410c it works just fine. All addresses I tried work without any >>> problems. >>> >>> - On longcheer-l8150 the modem firmare works fine when the memory >>> region starts somewhere between 0x86800000 and 0x8a800000. It also >>> works again after 0x8e800000. But on anything between 0x8a800000 and >>> 0x8e800000 it's broken for who knows what reason. >>> [...] >> Were you able to find a phone (likely a very reference-design-based >> one) that this worked on, btw? > > Actually I would count the Longcheer devices (l8150 = Wileyfox Swift and > l8910 = BQ Aquaris X5) to the category of close-to-QRD-based devices. > Based on quick tests both behave like described above (only > 0x8a800000-0x8e800000 is broken). Same for wingtech-wt88047. > > In other words, for those using the dynamic allocation would work fine, > because the alloc-ranges = <0x0 0x86800000 0x0 0x8000000>; only includes > working start addresses from 0x86800000 to ~0x89800000 (with a size of > 0x5000000). > > I guess I could use it for them and only make other devices use a fixed > address. But I also don't quite have the capacity to test every device > to see if relocating the region works or not. > > I think it's still easiest to allocate mpss on a fixed address > everywhere. The only real disadvantage is that overriding "reg", e.g. > > &mpss_mem { > reg = <0x0 0x86800000 0x0 0x5100000>; > }; > > is a bit more ugly than overriding size: > > &mpss_mem { > size = <0x0 0x5100000>; > }; > > but well, this is a very minor disadvantage. So in other words, this only *really* works on apq8016? Konrad
On Fri, Sep 15, 2023 at 03:52:36PM +0200, Konrad Dybcio wrote: > On 14.09.2023 16:09, Stephan Gerhold wrote: > > On Wed, Sep 13, 2023 at 09:39:50PM +0200, Konrad Dybcio wrote: > >> On 13.09.2023 12:14, Stephan Gerhold wrote: > >>> On Wed, Sep 13, 2023 at 10:12:12AM +0100, Bryan O'Donoghue wrote: > >>>> On 13/09/2023 10:06, Konrad Dybcio wrote: > >>>>> On 11.09.2023 19:41, Stephan Gerhold wrote: > >>>>>> Most of the reserved firmware memory on MSM8916 can be relocated when > >>>>>> respecting the required alignment. To avoid having to precompute the > >>>>>> reserved memory regions in every board DT, describe the actual > >>>>>> requirements (size, alignment, alloc-ranges) using the dynamic reserved > >>>>>> memory allocation. > >>>>>> > >>>>>> This approach has several advantages: > >>>>>> > >>>>>> 1. We can define "templates" for the reserved memory regions in > >>>>>> msm8916.dtsi and keep only device-specific details in the board DT. > >>>>>> This is useful for the "mpss" region size for example, which varies > >>>>>> from device to device. It is no longer necessary to redefine all > >>>>>> firmware regions to shift their addresses. > >>>>>> > >>>>>> 2. When some of the functionality (e.g. WCNSS, Modem, Venus) is not > >>>>>> enabled or needed for a device, the reserved memory can stay > >>>>>> disabled, freeing up the unused reservation for Linux. > >>>>>> > >>>>>> 3. Devices with special requirements for one of the firmware regions > >>>>>> are handled automatically. For example, msm8916-longcheer-l8150 > >>>>>> has non-relocatable "wcnss" firmware that must be loaded exactly > >>>>>> at address 0x8b600000. When this is defined as a static region, > >>>>>> the other dynamic allocations automatically adjust to a different > >>>>>> place with suitable alignment. > >>>>>> > >>>>>> All in all this approach significantly reduces the boilerplate necessary > >>>>>> to define the different firmware regions, and makes it easier to enable > >>>>>> functionality on the different devices. > >>>>>> > >>>>>> Signed-off-by: Stephan Gerhold <stephan@gerhold.net> > >>>>>> --- > >>>>> [...] > >>>>> > >>>>>> mpss_mem: mpss@86800000 { > >>>>>> + /* > >>>>>> + * The memory region for the mpss firmware is generally > >>>>>> + * relocatable and could be allocated dynamically. > >>>>>> + * However, many firmware versions tend to fail when > >>>>>> + * loaded to some special addresses, so it is hard to > >>>>>> + * define reliable alloc-ranges. > >>>>>> + * > >>>>>> + * alignment = <0x0 0x400000>; > >>>>>> + * alloc-ranges = <0x0 0x86800000 0x0 0x8000000>; > >>>>>> + */ > >>>>> Do we know of any devices that this would actually work on? > >> [...] > >>> - On DB410c it works just fine. All addresses I tried work without any > >>> problems. > >>> > >>> - On longcheer-l8150 the modem firmare works fine when the memory > >>> region starts somewhere between 0x86800000 and 0x8a800000. It also > >>> works again after 0x8e800000. But on anything between 0x8a800000 and > >>> 0x8e800000 it's broken for who knows what reason. > >>> [...] > >> Were you able to find a phone (likely a very reference-design-based > >> one) that this worked on, btw? > > > > Actually I would count the Longcheer devices (l8150 = Wileyfox Swift and > > l8910 = BQ Aquaris X5) to the category of close-to-QRD-based devices. > > Based on quick tests both behave like described above (only > > 0x8a800000-0x8e800000 is broken). Same for wingtech-wt88047. > > > > In other words, for those using the dynamic allocation would work fine, > > because the alloc-ranges = <0x0 0x86800000 0x0 0x8000000>; only includes > > working start addresses from 0x86800000 to ~0x89800000 (with a size of > > 0x5000000). > > > > I guess I could use it for them and only make other devices use a fixed > > address. But I also don't quite have the capacity to test every device > > to see if relocating the region works or not. > > > > I think it's still easiest to allocate mpss on a fixed address > > everywhere. The only real disadvantage is that overriding "reg", e.g. > > > > &mpss_mem { > > reg = <0x0 0x86800000 0x0 0x5100000>; > > }; > > > > is a bit more ugly than overriding size: > > > > &mpss_mem { > > size = <0x0 0x5100000>; > > }; > > > > but well, this is a very minor disadvantage. > So in other words, this only *really* works on apq8016? > Hm no? As I wrote, with alloc-ranges = <0x0 0x86800000 0x0 0x8000000> it also works on the close-to-QRD MSM8916 devices. There are some addresses that don't work but those might also exist on APQ8016. I haven't tested placing the firmware all over RAM on all sorts of obscure addresses (and there is probably little advantage doing so). With the limited alloc-ranges it would likely work on all devices that are close to the reference design/firmware from Qualcomm. Thanks, Stephan
diff --git a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts index a0bb8de54fb6..503155aefa55 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts +++ b/arch/arm64/boot/dts/qcom/msm8916-longcheer-l8150.dts @@ -23,9 +23,14 @@ chosen { stdout-path = "serial0"; }; + /* + * For some reason, the signed wcnss firmware is not relocatable. + * It must be loaded at 0x8b600000. All other firmware is relocatable, + * so place wcnss at the fixed address and then all other firmware + * regions will be automatically allocated at a fitting place. + */ reserved-memory { - /* wcnss.mdt is not relocatable, so it must be loaded at 0x8b600000 */ - /delete-node/ wcnss@89300000; + /delete-node/ wcnss; wcnss_mem: wcnss@8b600000 { reg = <0x0 0x8b600000 0x0 0x600000>; diff --git a/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi b/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi index 69f268db4df9..1d92c2e57216 100644 --- a/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi @@ -17,13 +17,6 @@ chosen { stdout-path = "serial0"; }; - reserved-memory { - mpss_mem: mpss@86800000 { - reg = <0x0 0x86800000 0x0 0x5500000>; - no-map; - }; - }; - gpio-keys { compatible = "gpio-keys"; @@ -91,6 +84,10 @@ &mpss { status = "okay"; }; +&mpss_mem { + reg = <0x0 0x86800000 0x0 0x5500000>; +}; + &pm8916_usbin { status = "okay"; }; diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi index 0257cbbb4971..c237f3e48c86 100644 --- a/arch/arm64/boot/dts/qcom/msm8916.dtsi +++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi @@ -74,17 +74,31 @@ rfsa@867e0000 { }; mpss_mem: mpss@86800000 { + /* + * The memory region for the mpss firmware is generally + * relocatable and could be allocated dynamically. + * However, many firmware versions tend to fail when + * loaded to some special addresses, so it is hard to + * define reliable alloc-ranges. + * + * alignment = <0x0 0x400000>; + * alloc-ranges = <0x0 0x86800000 0x0 0x8000000>; + */ reg = <0x0 0x86800000 0x0 0x2b00000>; no-map; }; - wcnss_mem: wcnss@89300000 { - reg = <0x0 0x89300000 0x0 0x600000>; + wcnss_mem: wcnss { + size = <0x0 0x600000>; + alignment = <0x0 0x100000>; + alloc-ranges = <0x0 0x86800000 0x0 0x8000000>; no-map; }; - venus_mem: venus@89900000 { - reg = <0x0 0x89900000 0x0 0x600000>; + venus_mem: venus { + size = <0x0 0x600000>; + alignment = <0x0 0x100000>; + alloc-ranges = <0x0 0x86800000 0x0 0x8000000>; no-map; };
Most of the reserved firmware memory on MSM8916 can be relocated when respecting the required alignment. To avoid having to precompute the reserved memory regions in every board DT, describe the actual requirements (size, alignment, alloc-ranges) using the dynamic reserved memory allocation. This approach has several advantages: 1. We can define "templates" for the reserved memory regions in msm8916.dtsi and keep only device-specific details in the board DT. This is useful for the "mpss" region size for example, which varies from device to device. It is no longer necessary to redefine all firmware regions to shift their addresses. 2. When some of the functionality (e.g. WCNSS, Modem, Venus) is not enabled or needed for a device, the reserved memory can stay disabled, freeing up the unused reservation for Linux. 3. Devices with special requirements for one of the firmware regions are handled automatically. For example, msm8916-longcheer-l8150 has non-relocatable "wcnss" firmware that must be loaded exactly at address 0x8b600000. When this is defined as a static region, the other dynamic allocations automatically adjust to a different place with suitable alignment. All in all this approach significantly reduces the boilerplate necessary to define the different firmware regions, and makes it easier to enable functionality on the different devices. Signed-off-by: Stephan Gerhold <stephan@gerhold.net> --- .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 9 +++++++-- arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi | 11 ++++------- arch/arm64/boot/dts/qcom/msm8916.dtsi | 22 ++++++++++++++++++---- 3 files changed, 29 insertions(+), 13 deletions(-)