mvebu: add dual-boot support for Fortinet FortiGate/FortiWiFi 30E/5xE devices #16538
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add fortigate-fw mtdsplit driver to handle dual-boot by splitting
kernel/rootfs partitions with NVMEM cells provided by "firmware-info"
partition.
DeviceTree properties:
- nvmem-cells : specify NVMEM cells
- nvmem-cell-names : specify names of NVMEM cells
- fortinet,image-index: specify an image index of this partition (0/1)
NVMEM cells:
- "magic" : magic number of firmware information area ("FSOC")
- "active-image" : image index for booting (0/1)
- "kernel-offset": kernel offset in block count (blocksize: 0x200)
- "kernel-length": kernel length in block count (blocksize: 0x200)
DeviceTree example:
partitions {
compatible = "fixed-partitions"+
#address-cells = <1>;
#size-cells = <1>;
partition@1c0000 {
reg = <0x1c0000 0x10000>;
label = "firmware-info";
nvmem-layout {
compatible = "fixed-layout";
#address-cells = <1>;
#size-cells = <1>;
fwinfo_magic: magic@160 {
reg = <0x160 0x4>;
};
fwinfo_active_image: active-image@170 {
reg = <0x170 0x1>;
};
fwinfo_kernel1_offset: kernel-offset@180 {
reg = <0x180 0x4>;
};
fwinfo_kernel1_size: kernel-size@184 {
reg = <0x184 0x4>;
};
fwinfo_kernel2_offset: kernel-offset@190 {
reg = <0x190 0x4>;
};
fwinfo_kernel2_size: kernel-size@194 {
reg = <0x194 0x4>;
};
};
};
partition@200000 {
compatible = "fortinet,fortigate-firmware";
reg = <0x200000 0x1e00000>;
label = "firmware";
nvmem-cells = <&fwinfo_magic>,
<&fwinfo_active_image>,
<&fwinfo_kernel1_offset>,
<&fwinfo_kernel1_size>;
nvmem-cell-names = "magic",
"active-image",
"kernel-offset",
"kernel-length";
fortinet,image-index = <0>;
};
partition@2000000 {
compatible = "fortinet,fortigate-firmware";
reg = <0x2000000 0x1e00000>;
label = "firmware2";
nvmem-cells = <&fwinfo_magic>,
<&fwinfo_active_image>,
<&fwinfo_kernel2_offset>,
<&fwinfo_kernel2_size>;
nvmem-cell-names = "magic",
"active-image",
"kernel-offset",
"kernel-length";
fortinet,image-index = <1>;
};
};
Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
Enable fortigate-fw mtdsplit driver on mvebu/cortexa9 subtarget to handle dual-boot on Fortinet FortiGate/FortiWiFi devices. Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
Add fwinfo NVMEM and firmware partition nodes to the common dtsi for Fortinet FortiGate/FortiWiFi 30E/5xE devices, to provide required information for fortigate-fw mtdsplit driver. firmware* partitions replace each kernel/rootfs partition nodes. Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
Set DEVICE_COMPAT_MESSAGE with "mtdsplit" in the common definition for Fortinet FortiGate/FortiWiFi 30E/5xE devices. This makes generated images detectable as newer images that has "firmware"/"firmware2" partitions instead of each kernel/rootfs partitions by sysupgrade script for Fortinet FortiGate/FortiWiFi devices (fortinet.sh). Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
Update the sysupgrade script for Fortinet devices (fortinet.sh) to handle dual-boot for that devices. The new script able to handle downgrading with the firmware images older than dual-boot support for Fortinet FortiGate/FortiWiFi devices. BTW, rootfs offset/length values not required for booting OpenWrt are not handled on the new script. Additionally, add functions to check compatibility of the specified image and the current device. Signed-off-by: INAGAKI Hiroshi <musashino.open@gmail.com>
github-actions
bot
added
kernel
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patch series adds dual-boot support for those devices.