Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean up the VCHIQ 2711 DMA support #3629

Merged
merged 2 commits into from
May 22, 2020
Merged

Conversation

pelwell
Copy link
Contributor

@pelwell pelwell commented May 20, 2020

Following a suggestion from @vianpl, these commits tidy up the way the 2711-specific VCHIQ code obtains DMA addresses, which removes the need to move the DT node and generally looks better.

Manage the split between addresses for the VPU and addresses for the
40-bit DMA controller with a dedicated DMA device pointer that on non-
BCM2711 platforms is the same as the main VCHIQ device. This allows
the VCHIQ node to stay in the usual place in the DT, and removes the
ugly VC_SAFE macros.

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
Now that the enhanced BCM2711 DMA controller is located by compatible
string and used directly for generating bulk transfer addresses,
remove the workaround of moving the vchiq node.

Signed-off-by: Phil Elwell <phil@raspberrypi.com>
@pelwell
Copy link
Contributor Author

pelwell commented May 20, 2020

@pinchartl @6by9 A version of this should probably go in the next patch set.

@popcornmix
Copy link
Collaborator

Looks nicer.

@pelwell pelwell merged commit 79495a5 into raspberrypi:rpi-5.4.y May 22, 2020
popcornmix added a commit to raspberrypi/firmware that referenced this pull request Jun 3, 2020
kernel: vc4: Set driver_name for card
See: raspberrypi/linux#3656

kernel: configs: Add SND_SOC_MAX98357A=m
See: https://www.raspberrypi.org/forums/viewtopic.php?f=107&t=275919

kernel: Add Micro Crystal RV-1805 to i2c-rtc overlays
See: raspberrypi/linux#3651

kernel: media: bcm2835-isp: fix bytes per line calculations for some image formats
See: raspberrypi/linux#3645

kernel: media: bcm2835-unicam: change minimum number of vb2_queue buffers to 1
See: raspberrypi/linux#3638

kernel: media: i2c: imx477: Return correct result on sensor id verification
See: raspberrypi/linux#3630

kernel: Clean up the VCHIQ 2711 DMA support
See: raspberrypi/linux#3629

kernel: overlays: i2c-rtc-gpio: Fix trickle-resistor-ohms param
See: raspberrypi/linux#3642

kernel: Enable hwmon for thermal zones
See: raspberrypi/linux#3307
popcornmix added a commit to Hexxeh/rpi-firmware that referenced this pull request Jun 3, 2020
kernel: vc4: Set driver_name for card
See: raspberrypi/linux#3656

kernel: configs: Add SND_SOC_MAX98357A=m
See: https://www.raspberrypi.org/forums/viewtopic.php?f=107&t=275919

kernel: Add Micro Crystal RV-1805 to i2c-rtc overlays
See: raspberrypi/linux#3651

kernel: media: bcm2835-isp: fix bytes per line calculations for some image formats
See: raspberrypi/linux#3645

kernel: media: bcm2835-unicam: change minimum number of vb2_queue buffers to 1
See: raspberrypi/linux#3638

kernel: media: i2c: imx477: Return correct result on sensor id verification
See: raspberrypi/linux#3630

kernel: Clean up the VCHIQ 2711 DMA support
See: raspberrypi/linux#3629

kernel: overlays: i2c-rtc-gpio: Fix trickle-resistor-ohms param
See: raspberrypi/linux#3642

kernel: Enable hwmon for thermal zones
See: raspberrypi/linux#3307
@pelwell pelwell deleted the vchiq branch September 15, 2021 07:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants