remoteproc: add rproc_coredump_set_elf_info (418fd787) · Commits · 戴 / test

drivers/remoteproc/remoteproc_core.c

+30 −2

Original line number	Diff line number	Diff line
		@@ -1565,6 +1565,28 @@ int rproc_coredump_add_custom_segment(struct rproc *rproc,
		}
		EXPORT_SYMBOL(rproc_coredump_add_custom_segment);

		/**
		* rproc_coredump_set_elf_info() - set coredump elf information
		* @rproc: handle of a remote processor
		* @class: elf class for coredump elf file
		* @machine: elf machine for coredump elf file
		*
		* Set elf information which will be used for coredump elf file.
		*
		* Return: 0 on success, negative errno on error.
		*/
		int rproc_coredump_set_elf_info(struct rproc *rproc, u8 class, u16 machine)
		{
		if (class != ELFCLASS64 && class != ELFCLASS32)
		return -EINVAL;

		rproc->elf_class = class;
		rproc->elf_machine = machine;

		return 0;
		}
		EXPORT_SYMBOL(rproc_coredump_set_elf_info);

		/**
		* rproc_coredump() - perform coredump
		* @rproc: rproc handle
		@@ -1587,6 +1609,11 @@ static void rproc_coredump(struct rproc *rproc)
		if (list_empty(&rproc->dump_segments))
		return;

		if (class == ELFCLASSNONE) {
		dev_err(&rproc->dev, "Elf class is not set\n");
		return;
		}

		data_size = elf_size_of_hdr(class);
		list_for_each_entry(segment, &rproc->dump_segments, node) {
		data_size += elf_size_of_phdr(class) + segment->size;
		@@ -1605,7 +1632,7 @@ static void rproc_coredump(struct rproc *rproc)
		elf_hdr_init_ident(ehdr, class);

		elf_hdr_set_e_type(class, ehdr, ET_CORE);
		elf_hdr_set_e_machine(class, ehdr, EM_NONE);
		elf_hdr_set_e_machine(class, ehdr, rproc->elf_machine);
		elf_hdr_set_e_version(class, ehdr, EV_CURRENT);
		elf_hdr_set_e_entry(class, ehdr, rproc->bootaddr);
		elf_hdr_set_e_phoff(class, ehdr, elf_size_of_hdr(class));
		@@ -2047,7 +2074,8 @@ struct rproc rproc_alloc(struct device dev, const char *name,
		rproc->name = name;
		rproc->priv = &rproc[1];
		rproc->auto_boot = true;
		rproc->elf_class = ELFCLASS32;
		rproc->elf_class = ELFCLASSNONE;
		rproc->elf_machine = EM_NONE;

		device_initialize(&rproc->dev);
		rproc->dev.parent = dev;

drivers/remoteproc/remoteproc_elf_loader.c

+0 −3

Original line number	Diff line number	Diff line
		@@ -248,9 +248,6 @@ int rproc_elf_load_segments(struct rproc rproc, const struct firmware fw)
		memset(ptr + filesz, 0, memsz - filesz);
		}

		if (ret == 0)
		rproc->elf_class = class;

		return ret;
		}
		EXPORT_SYMBOL(rproc_elf_load_segments);

include/linux/remoteproc.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -518,6 +518,7 @@ struct rproc {
		struct list_head dump_segments;
		int nb_vdev;
		u8 elf_class;
		u16 elf_machine;
		};

		/**
		@@ -622,6 +623,7 @@ int rproc_coredump_add_custom_segment(struct rproc *rproc,
		struct rproc_dump_segment *segment,
		void *dest),
		void *priv);
		int rproc_coredump_set_elf_info(struct rproc *rproc, u8 class, u16 machine);

		static inline struct rproc_vdev vdev_to_rvdev(struct virtio_device vdev)
		{

Admin message