From b4035eb077749b75366c1e6a475c5add08072f5f Mon Sep 17 00:00:00 2001 From: Venkata Rao Kakani Date: Mon, 1 Feb 2021 12:13:04 +0530 Subject: [PATCH 1/2] dt-bindings: enable guest disks renaming Enable guest partitions renaming to boot la guest with avb 2.0 compliance. Change-Id: Ib5c58f028c0f0e6879eaf33ea02d2760df859f24 --- bindings/soc/qcom/blocknames.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 bindings/soc/qcom/blocknames.txt diff --git a/bindings/soc/qcom/blocknames.txt b/bindings/soc/qcom/blocknames.txt new file mode 100644 index 000000000000..db6fc05c5b61 --- /dev/null +++ b/bindings/soc/qcom/blocknames.txt @@ -0,0 +1,19 @@ +* rename block devices + +Required properties: + +- compatible: "qcom,blkdev-rename" compatibility string +- actual-dev: Name of the disk assigned by generic driver +- rename-dev: Re-name of the disk to set for disks + +Example: + +rename_blk: rename_blk { + compatible = "qcom,blkdev-rename"; + actual-dev = "vda", "vdb", "vdc", + "vdd", "vde", "vdf", + "vdg", "vdh"; + rename-dev = "la_system", "la_userdata", "la_vendor", + "la_persist", "modem", "bluetooth", + "la_misc", "vbmeta"; +}; From 23c657f8e45bc1df81146b3f46286db74449d35c Mon Sep 17 00:00:00 2001 From: Venkata Rao Kakani Date: Mon, 1 Feb 2021 12:14:59 +0530 Subject: [PATCH 2/2] ARM: dts: msm: enable guest disks renaming Enable guest partitions renaming to boot la guest with avb 2.0 compliance. Change-Id: Iac0b627834cfe35c22b2466f8b243dcaae79568a --- qcom/sa8155-vm-la-mt.dtsi | 12 ++++++++++++ qcom/sa8155-vm-la.dtsi | 11 +++++++++++ qcom/sa8195-vm-la-mt.dtsi | 12 ++++++++++++ qcom/sa8195-vm-la.dtsi | 12 ++++++++++++ 4 files changed, 47 insertions(+) diff --git a/qcom/sa8155-vm-la-mt.dtsi b/qcom/sa8155-vm-la-mt.dtsi index 63e1d6eabba3..df8396983d51 100644 --- a/qcom/sa8155-vm-la-mt.dtsi +++ b/qcom/sa8155-vm-la-mt.dtsi @@ -4,3 +4,15 @@ label = "pmem_shared_mem"; }; }; + +/ { + rename_blk: rename_blk { + compatible = "qcom,blkdev-rename"; + actual-dev = "vda", "vdb", "vdc", + "vdd", "vde", "vdf", + "vdg", "vdh"; + rename-dev = "system", "userdata", "vendor", + "persist", "modem", "bluetooth", + "misc", "vbmeta"; + }; +}; diff --git a/qcom/sa8155-vm-la.dtsi b/qcom/sa8155-vm-la.dtsi index ee0d8a882248..1bdfe711879d 100644 --- a/qcom/sa8155-vm-la.dtsi +++ b/qcom/sa8155-vm-la.dtsi @@ -5,6 +5,17 @@ }; }; +/ { + rename_blk: rename_blk { + compatible = "qcom,blkdev-rename"; + actual-dev = "vda", "vdb", "vdc", + "vdd", "vde", "vdf", + "vdg", "vdh"; + rename-dev = "system", "userdata", "vendor", + "persist", "modem", "bluetooth", + "misc", "vbmeta"; + }; +}; &usb0 { status = "ok"; }; diff --git a/qcom/sa8195-vm-la-mt.dtsi b/qcom/sa8195-vm-la-mt.dtsi index e975abfa0bd4..75ca621962f9 100644 --- a/qcom/sa8195-vm-la-mt.dtsi +++ b/qcom/sa8195-vm-la-mt.dtsi @@ -4,3 +4,15 @@ label = "pmem_shared_mem"; }; }; + +/ { + rename_blk: rename_blk { + compatible = "qcom,blkdev-rename"; + actual-dev = "vda", "vdb", "vdc", + "vdd", "vde", "vdf", + "vdg", "vdh"; + rename-dev = "system", "userdata", "vendor", + "persist", "modem", "bluetooth", + "misc", "vbmeta"; + }; +}; diff --git a/qcom/sa8195-vm-la.dtsi b/qcom/sa8195-vm-la.dtsi index 7d003a2eb6b1..6be2d077d42d 100644 --- a/qcom/sa8195-vm-la.dtsi +++ b/qcom/sa8195-vm-la.dtsi @@ -5,6 +5,18 @@ }; }; +/ { + rename_blk: rename_blk { + compatible = "qcom,blkdev-rename"; + actual-dev = "vda", "vdb", "vdc", + "vdd", "vde", "vdf", + "vdg", "vdh"; + rename-dev = "system", "userdata", "vendor", + "persist", "modem", "bluetooth", + "misc", "vbmeta"; + }; +}; + &usb0 { status = "ok"; };