| Message ID | 1624564058-24095-7-git-send-email-sibis@codeaurora.org |
|---|---|
| State | New |
| Headers | show |
| Series | Add Modem support on SC7280 SoCs | expand |
On Fri, Jun 25, 2021 at 01:17:35AM +0530, Sibi Sankar wrote: > Subject: arm64: dts: qcom: sc7280: Update reserved memory map That's very vague. Also personally I'm not a fan of patches that touch SoC and board files with a commit message that only mentions the SoC, as is frequently done for IDP boards. Why not split this in (at least) two, one for adding the missing memory regions to the SoC, and one for the IDP. > Add missing regions and remove unused regions from the reserved memory > map, as described in version 1. What is this 'version 1'?
On 2021-06-28 23:41, Matthias Kaehlcke wrote: > On Fri, Jun 25, 2021 at 01:17:35AM +0530, Sibi Sankar wrote: > >> Subject: arm64: dts: qcom: sc7280: Update reserved memory map > > That's very vague. Also personally I'm not a fan of patches that touch > SoC and board files with a commit message that only mentions the SoC, > as > is frequently done for IDP boards. Why not split this in (at least) > two, > one for adding the missing memory regions to the SoC, and one for the > IDP. > sure will split this up. >> Add missing regions and remove unused regions from the reserved memory >> map, as described in version 1. > > What is this 'version 1'? lol, it's the memory map version number and it's not entirely internal to qc so we have been mentioning them in commit messages from older SoCs. I'll just drop it when I re-spin the series since it doesn't add much value. -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project.
On Wed 30 Jun 15:02 CDT 2021, Sibi Sankar wrote: > On 2021-06-28 23:41, Matthias Kaehlcke wrote: > > On Fri, Jun 25, 2021 at 01:17:35AM +0530, Sibi Sankar wrote: > > > > > Subject: arm64: dts: qcom: sc7280: Update reserved memory map > > > > That's very vague. Also personally I'm not a fan of patches that touch > > SoC and board files with a commit message that only mentions the SoC, as > > is frequently done for IDP boards. Why not split this in (at least) two, > > one for adding the missing memory regions to the SoC, and one for the > > IDP. > > > > sure will split this up. > > > > Add missing regions and remove unused regions from the reserved memory > > > map, as described in version 1. > > > > What is this 'version 1'? > > lol, it's the memory map version number > and it's not entirely internal to qc so > we have been mentioning them in commit > messages from older SoCs. I'll just drop > it when I re-spin the series since it > doesn't add much value. > Every now and then we run into issues with the reserved-memory layout, where knowing were the numbers comes from is useful information to have in order to characterize the issue and come up with a fix. So including information about where those numbers came from is useful, even if it's referencing a version of a document that's not public. Regards, Bjorn
diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dts b/arch/arm64/boot/dts/qcom/sc7280-idp.dts index 3900cfc09562..191e8a92d153 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dts +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dts @@ -30,6 +30,58 @@ }; }; +/* + * Reserved memory changes + * + * Delete all unused memory nodes and define the peripheral memory regions + * required by the board dts. + * + */ + +/delete-node/ &hyp_mem; +/delete-node/ &xbl_mem; +/delete-node/ &reserved_xbl_uefi_log; +/delete-node/ &sec_apps_mem; + +/* Increase the size from 2.5MB to 8MB */ +&rmtfs_mem { + reg = <0x0 0x9c900000 0x0 0x800000>; +}; + +/ { + reserved-memory { + adsp_mem: memory@86700000 { + reg = <0x0 0x86700000 0x0 0x2800000>; + no-map; + }; + + camera_mem: memory@8ad00000 { + reg = <0x0 0x8ad00000 0x0 0x500000>; + no-map; + }; + + venus_mem: memory@8b200000 { + reg = <0x0 0x8b200000 0x0 0x500000>; + no-map; + }; + + mpss_mem: memory@8b800000 { + reg = <0x0 0x8b800000 0x0 0xf600000>; + no-map; + }; + + wpss_mem: memory@9ae00000 { + reg = <0x0 0x9ae00000 0x0 0x1900000>; + no-map; + }; + + mba_mem: memory@9c700000 { + reg = <0x0 0x9c700000 0x0 0x200000>; + no-map; + }; + }; +}; + &apps_rsc { pm7325-regulators { compatible = "qcom,pm7325-rpmh-regulators"; diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi index d1adf64e21e9..5ed7a511bfc9 100644 --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi @@ -42,6 +42,16 @@ #size-cells = <2>; ranges; + hyp_mem: memory@80000000 { + reg = <0x0 0x80000000 0x0 0x600000>; + no-map; + }; + + xbl_mem: memory@80600000 { + reg = <0x0 0x80600000 0x0 0x200000>; + no-map; + }; + aop_mem: memory@80800000 { reg = <0x0 0x80800000 0x0 0x60000>; no-map; @@ -53,6 +63,16 @@ no-map; }; + reserved_xbl_uefi_log: memory@80880000 { + reg = <0x0 0x80884000 0x0 0x10000>; + no-map; + }; + + sec_apps_mem: memory@808ff000 { + reg = <0x0 0x808ff000 0x0 0x1000>; + no-map; + }; + smem_mem: memory@80900000 { reg = <0x0 0x80900000 0x0 0x200000>; no-map; @@ -62,6 +82,20 @@ no-map; reg = <0x0 0x80b00000 0x0 0x100000>; }; + + wlan_fw_mem: memory@80c00000 { + reg = <0x0 0x80c00000 0x0 0xc00000>; + no-map; + }; + + rmtfs_mem: memory@9c900000 { + compatible = "qcom,rmtfs-mem"; + reg = <0x0 0x9c900000 0x0 0x280000>; + no-map; + + qcom,client-id = <1>; + qcom,vmid = <15>; + }; }; cpus {
Add missing regions and remove unused regions from the reserved memory map, as described in version 1. Signed-off-by: Sibi Sankar <sibis@codeaurora.org> --- arch/arm64/boot/dts/qcom/sc7280-idp.dts | 52 +++++++++++++++++++++++++++++++++ arch/arm64/boot/dts/qcom/sc7280.dtsi | 34 +++++++++++++++++++++ 2 files changed, 86 insertions(+)