History

Merge tag 'rproc-v5.1' of git://github.com/andersson/remoteproc

Pull remoteproc updates from Bjorn Andersson: "This contains the last patches in Loic's remoteproc resource table handling changes, a number of updates to documentation, support for invoking the crash handler (for testing purposes), a fix for the handling of virtio devices during recovery, performance state votes in Qualcomm modem driver, support for specifying board specific firmware path for Qualcomm modem driver and improved support for graceful shutdown of Qualcomm remoteprocs" * tag 'rproc-v5.1' of git://github.com/andersson/remoteproc: (33 commits) remoteproc: fix for "dma-mapping: remove the DMA_MEMORY_EXCLUSIVE flag" remoteproc: fix rproc_check_carveout_da() returned error and comments remoteproc: fix trace buffer va initialization remoteproc: fix rproc_alloc_carveout() for rproc with iommu domain remoteproc: add warning on resource table cast remoteproc: fix rproc_alloc_carveout() bad variable cast remoteproc: fix rproc_da_to_va in case of unallocated carveout remoteproc: correct rproc_mem_entry_init() comments remoteproc: fix recovery procedure rpmsg: virtio: change header file sort style rpmsg: virtio: allocate buffer from parent remoteproc: st: add reserved memory support remoteproc: create vdev subdevice with specific dma memory pool remoteproc: q6v5_adsp: Remove voting for lpass_aon clock dt-binding: remoteproc: Remove lpass_aon clock from adsp pil clock list remoteproc: q6v5-mss: Active powerdomain for SDM845 remoteproc: q6v5-mss: Vote for rpmh power domains remoteproc: qcom: Add support for parsing fw dt bindings remoteproc: qcom_q6v5: don't auto boot remote processor remoteproc: qcom: Wait for shutdown-ack/ind on sysmon shutdown ...

Linus Torvalds committed 7 years ago

Commit 2f194642 parents dc2535b d664ce715 files · +706 −120Browse files

Showing the changes to include/linux (1 of 15 files). Show all

Unified · Split

include/linux/remoteproc.h+4−4
@@ -345,9 +345,9 @@ struct firmware; · 344 unmodified lines
345345 * @stop: power off the device
346346 * @kick: kick a virtqueue (virtqueue id given as a parameter)
347347 * @da_to_va: optional platform hook to perform address translations
348− * @load_rsc_table: load resource table from firmware image
348+ * @parse_fw: parse firmware to extract information (e.g. resource table)
349349 * @find_loaded_rsc_table: find the loaded resouce table
350− * @load: load firmeware to memory, where the remote processor
350+ * @load: load firmware to memory, where the remote processor
351351 * expects to find it
352352 * @sanity_check: sanity check the fw image
353353 * @get_boot_addr: get boot address to entry point specified in firmware
@@ -554,11 +554,11 @@ struct rproc_vdev { · 200 unmodified lines
554554 struct kref refcount;
555555
556556 struct rproc_subdev subdev;
557+ struct device dev;
557558
558559 unsigned int id;
559560 struct list_head node;
560561 struct rproc *rproc;
561− struct virtio_device vdev;
562562 struct rproc_vring vring[RVDEV_NUM_VRINGS];
563563 u32 rsc_offset;
564564 u32 index;
@@ -601,7 +601,7 @@ int rproc_coredump_add_custom_segment(struct rproc *rproc, · 36 unmodified lines
601601
602602 static inline struct rproc_vdev *vdev_to_rvdev(struct virtio_device *vdev)
603603 {
604− return container_of(vdev, struct rproc_vdev, vdev);
604+ return container_of(vdev->dev.parent, struct rproc_vdev, dev);
605605 }
606606
607607 static inline struct rproc *vdev_to_rproc(struct virtio_device *vdev)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t