@@ -8,6 +8,7 @@
* Wolfgang Denk, DENX Software Engineering, wd@denx.de.
*/
+#include <blkmap.h>
#include <command.h>
#include <fdt_support.h>
#include <fdtdec.h>
@@ -649,6 +650,14 @@ int image_setup_libfdt(struct bootm_headers *images, void *blob, bool lmb)
if (!ft_verify_fdt(blob))
goto err;
+ if (CONFIG_IS_ENABLED(BLKMAP) && CONFIG_IS_ENABLED(EFI_LOADER)) {
+ fdt_ret = fdt_efi_pmem_setup(blob);
+ if (fdt_ret) {
+ log_err("pmem node fixup failed\n");
+ goto err;
+ }
+ }
+
/* after here we are using a livetree */
if (!of_live_active() && CONFIG_IS_ENABLED(EVENT)) {
struct event_ft_fixup fixup;
@@ -14,59 +14,6 @@
#include <dm/lists.h>
#include <dm/root.h>
-struct blkmap;
-
-/**
- * struct blkmap_slice - Region mapped to a blkmap
- *
- * Common data for a region mapped to a blkmap, specialized by each
- * map type.
- *
- * @node: List node used to associate this slice with a blkmap
- * @blknr: Start block number of the mapping
- * @blkcnt: Number of blocks covered by this mapping
- * @type: Type of blkmap slice
- */
-struct blkmap_slice {
- struct list_head node;
-
- lbaint_t blknr;
- lbaint_t blkcnt;
- enum blkmap_slice_type type;
-
- /**
- * @read: - Read from slice
- *
- * @read.bm: Blkmap to which this slice belongs
- * @read.bms: This slice
- * @read.blknr: Start block number to read from
- * @read.blkcnt: Number of blocks to read
- * @read.buffer: Buffer to store read data to
- */
- ulong (*read)(struct blkmap *bm, struct blkmap_slice *bms,
- lbaint_t blknr, lbaint_t blkcnt, void *buffer);
-
- /**
- * @write: - Write to slice
- *
- * @write.bm: Blkmap to which this slice belongs
- * @write.bms: This slice
- * @write.blknr: Start block number to write to
- * @write.blkcnt: Number of blocks to write
- * @write.buffer: Data to be written
- */
- ulong (*write)(struct blkmap *bm, struct blkmap_slice *bms,
- lbaint_t blknr, lbaint_t blkcnt, const void *buffer);
-
- /**
- * @destroy: - Tear down slice
- *
- * @read.bm: Blkmap to which this slice belongs
- * @read.bms: This slice
- */
- void (*destroy)(struct blkmap *bm, struct blkmap_slice *bms);
-};
-
static bool blkmap_slice_contains(struct blkmap_slice *bms, lbaint_t blknr)
{
return (blknr >= bms->blknr) && (blknr < (bms->blknr + bms->blkcnt));
@@ -116,20 +63,6 @@ static int blkmap_slice_add(struct blkmap *bm, struct blkmap_slice *new)
return 0;
}
-/**
- * struct blkmap_linear - Linear mapping to other block device
- *
- * @slice: Common map data
- * @blk: Target block device of this mapping
- * @blknr: Start block number of the target device
- */
-struct blkmap_linear {
- struct blkmap_slice slice;
-
- struct udevice *blk;
- lbaint_t blknr;
-};
-
static ulong blkmap_linear_read(struct blkmap *bm, struct blkmap_slice *bms,
lbaint_t blknr, lbaint_t blkcnt, void *buffer)
{
@@ -188,21 +121,6 @@ int blkmap_map_linear(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt,
return err;
}
-/**
- * struct blkmap_mem - Memory mapping
- *
- * @slice: Common map data
- * @addr: Target memory region of this mapping
- * @remapped: True if @addr is backed by a physical to virtual memory
- * mapping that must be torn down at the end of this mapping's
- * lifetime.
- */
-struct blkmap_mem {
- struct blkmap_slice slice;
- void *addr;
- bool remapped;
-};
-
static ulong blkmap_mem_read(struct blkmap *bm, struct blkmap_slice *bms,
lbaint_t blknr, lbaint_t blkcnt, void *buffer)
{
@@ -7,6 +7,7 @@
#ifndef _BLKMAP_H
#define _BLKMAP_H
+#include <blk.h>
#include <dm/lists.h>
/* Type of blkmap slice, Linear or Memory */
@@ -30,6 +31,86 @@ struct blkmap {
struct list_head slices;
};
+/**
+ * struct blkmap_slice - Region mapped to a blkmap
+ *
+ * Common data for a region mapped to a blkmap, specialized by each
+ * map type.
+ *
+ * @node: List node used to associate this slice with a blkmap
+ * @blknr: Start block number of the mapping
+ * @blkcnt: Number of blocks covered by this mapping
+ * @type: Type of blkmap slice
+ */
+struct blkmap_slice {
+ struct list_head node;
+
+ lbaint_t blknr;
+ lbaint_t blkcnt;
+ enum blkmap_slice_type type;
+
+ /**
+ * @read: - Read from slice
+ *
+ * @read.bm: Blkmap to which this slice belongs
+ * @read.bms: This slice
+ * @read.blknr: Start block number to read from
+ * @read.blkcnt: Number of blocks to read
+ * @read.buffer: Buffer to store read data to
+ */
+ ulong (*read)(struct blkmap *bm, struct blkmap_slice *bms,
+ lbaint_t blknr, lbaint_t blkcnt, void *buffer);
+
+ /**
+ * @write: - Write to slice
+ *
+ * @write.bm: Blkmap to which this slice belongs
+ * @write.bms: This slice
+ * @write.blknr: Start block number to write to
+ * @write.blkcnt: Number of blocks to write
+ * @write.buffer: Data to be written
+ */
+ ulong (*write)(struct blkmap *bm, struct blkmap_slice *bms,
+ lbaint_t blknr, lbaint_t blkcnt, const void *buffer);
+
+ /**
+ * @destroy: - Tear down slice
+ *
+ * @read.bm: Blkmap to which this slice belongs
+ * @read.bms: This slice
+ */
+ void (*destroy)(struct blkmap *bm, struct blkmap_slice *bms);
+};
+
+/**
+ * struct blkmap_mem - Memory mapping
+ *
+ * @slice: Common map data
+ * @addr: Target memory region of this mapping
+ * @remapped: True if @addr is backed by a physical to virtual memory
+ * mapping that must be torn down at the end of this mapping's
+ * lifetime.
+ */
+struct blkmap_mem {
+ struct blkmap_slice slice;
+ void *addr;
+ bool remapped;
+};
+
+/**
+ * struct blkmap_linear - Linear mapping to other block device
+ *
+ * @slice: Common map data
+ * @blk: Target block device of this mapping
+ * @blknr: Start block number of the target device
+ */
+struct blkmap_linear {
+ struct blkmap_slice slice;
+
+ struct udevice *blk;
+ lbaint_t blknr;
+};
+
/**
* blkmap_map_linear() - Map region of other block device
*
@@ -705,4 +705,17 @@ static inline bool efi_use_host_arch(void)
*/
int efi_get_pxe_arch(void);
+/**
+ * fdt_efi_pmem_setup() - Pmem setup in DT and EFI memory map
+ * @fdt: Devicetree to add the pmem nodes to
+ *
+ * Iterate through all the blkmap devices, look for BLKMAP_MEM devices,
+ * and add pmem nodes corresponding to the blkmap slice to the
+ * devicetree along with removing the corresponding region from the
+ * EFI memory map.
+ *
+ * Returns: 0 on success, negative error on failure
+ */
+int fdt_efi_pmem_setup(void *fdt);
+
#endif /* _LINUX_EFI_H */
@@ -5,6 +5,7 @@
#define LOG_CATEGORY LOGC_EFI
+#include <blkmap.h>
#include <bootm.h>
#include <env.h>
#include <image.h>
@@ -19,6 +20,8 @@
#include <efi_loader.h>
#include <efi_variable.h>
#include <host_arch.h>
+#include <dm/uclass.h>
+#include <linux/kernel.h>
#include <linux/libfdt.h>
#include <linux/list.h>
@@ -680,3 +683,52 @@ out:
return ret;
}
+
+static int add_blkmap_pmem_nodes(void *fdt, struct blkmap *bm)
+{
+ int ret;
+ u32 size;
+ ulong addr;
+ efi_status_t status;
+ struct blkmap_mem *bmm;
+ struct blkmap_slice *bms;
+ struct blk_desc *bd = dev_get_uclass_plat(bm->blk);
+
+ list_for_each_entry(bms, &bm->slices, node) {
+ if (bms->type != BLKMAP_SLICE_MEM)
+ continue;
+
+ bmm = container_of(bms, struct blkmap_mem, slice);
+
+ addr = (ulong)(uintptr_t)bmm->addr;
+ size = (u32)bms->blkcnt << bd->log2blksz;
+
+ ret = fdt_fixup_pmem_region(fdt, addr, size);
+ if (ret)
+ return ret;
+
+ status = efi_remove_memory_map(addr, size,
+ EFI_CONVENTIONAL_MEMORY);
+ if (status != EFI_SUCCESS)
+ return -1;
+ }
+
+ return 0;
+}
+
+int fdt_efi_pmem_setup(void *fdt)
+{
+ int ret;
+ struct udevice *dev;
+ struct uclass *uc;
+ struct blkmap *bm;
+
+ uclass_id_foreach_dev(UCLASS_BLKMAP, dev, uc) {
+ bm = dev_get_plat(dev);
+ ret = add_blkmap_pmem_nodes(fdt, bm);
+ if (ret)
+ return ret;
+ }
+
+ return 0;
+}
The EFI HTTP boot puts the ISO installer image at some location in memory which needs to be added to the devicetree as persistent memory (pmem) node. The OS installer then gets information about the presence of this ISO image through the pmem node and proceeds with the installation. In U-Boot, this ISO image gets mounted as a blkmap device, with a memory mapped slice. Add a helper function which iterates through all such memory mapped blkmap slices, and calls the FDT fixup function to add the pmem node. Invoke this helper function as part of the DT fixup which happens before booting the OS. Signed-off-by: Sughosh Ganu <sughosh.ganu@linaro.org> --- Changes since V3: * Move the definition of the helper function to the efi_helper.c * Remove the region of the blkmap mem map device from the EFI memory map along with adding the pmem node boot/image-fdt.c | 9 ++++ drivers/block/blkmap.c | 82 ------------------------------------- include/blkmap.h | 81 ++++++++++++++++++++++++++++++++++++ include/efi.h | 13 ++++++ lib/efi_loader/efi_helper.c | 52 +++++++++++++++++++++++ 5 files changed, 155 insertions(+), 82 deletions(-)