Skip to content

firmware: rp1: Rename to rp1-fw to avoid module name collision#6879

Merged
pelwell merged 1 commit into
raspberrypi:rpi-6.12.yfrom
6by9:rpi-6.12.y-rp1
Jun 2, 2025
Merged

firmware: rp1: Rename to rp1-fw to avoid module name collision#6879
pelwell merged 1 commit into
raspberrypi:rpi-6.12.yfrom
6by9:rpi-6.12.y-rp1

Conversation

@6by9

@6by9 6by9 commented Jun 2, 2025

Copy link
Copy Markdown
Contributor

There is already the driver in drivers/mfd/rp1.ko, so having drivers/firmware/rp1.ko can cause issues when using modinfo and similar, and we can get errors with "Module rp1 is already loaded" when trying to load it.

Rename the module so that the name is unique.


Appears to be the cause of #6878. drm-rp1-dpi now needs rp1-pio, which needs rp1's firmware driver. The module dependencies don't load rp1's firmware driver as it believes rp1 is already loaded, except it's the mfd one. Trying to load it manually throws an error that the module is loaded.

modinfo is confused too

pi@usb-bookworm:~ $ modinfo rp1
filename:       /lib/modules/6.12.30-v8+/kernel/drivers/firmware/rp1.ko.xz
license:        GPL
file:           drivers/mfd/rp1
description:    RP1 wrapper
author:         Phil Elwell <phil@raspberrypi.com>

so is it the firmware driver or the mfd one?!

Keeping names unique makes life simpler.

There is already the driver in drivers/mfd/rp1.ko, so having
drivers/firmware/rp1.ko can cause issues when using modinfo
and similar, and we can get errors with "Module rp1 is already
loaded" when trying to load it.

Rename the module so that the name is unique.

Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
@pelwell pelwell merged commit 564a5ad into raspberrypi:rpi-6.12.y Jun 2, 2025
12 checks passed
popcornmix added a commit to raspberrypi/firmware that referenced this pull request Jun 3, 2025
kernel: overlays: sc16is75x: Add generic SPI overlay
See: raspberrypi/linux#6865

kernel: add mira220 image sensor
See: raspberrypi/linux#6717

kernel: defconfigs: Enable WATCHDOG_SYSFS
See: raspberrypi/linux#6875

kernel: drivers: pci: hailo: Better lock handling when calling find_vdma()
See: raspberrypi/linux#6868

kernel: drivers: media: imx500: Enable sensor temperature monitoring
See: raspberrypi/linux#6877

kernel: firmware: rp1: Rename to rp1-fw to avoid module name collision
See: raspberrypi/linux#6879

kernel: Candidate fixes for camera sync issues
See: raspberrypi/linux#6863
popcornmix added a commit to raspberrypi/rpi-firmware that referenced this pull request Jun 3, 2025
kernel: overlays: sc16is75x: Add generic SPI overlay
See: raspberrypi/linux#6865

kernel: add mira220 image sensor
See: raspberrypi/linux#6717

kernel: defconfigs: Enable WATCHDOG_SYSFS
See: raspberrypi/linux#6875

kernel: drivers: pci: hailo: Better lock handling when calling find_vdma()
See: raspberrypi/linux#6868

kernel: drivers: media: imx500: Enable sensor temperature monitoring
See: raspberrypi/linux#6877

kernel: firmware: rp1: Rename to rp1-fw to avoid module name collision
See: raspberrypi/linux#6879

kernel: Candidate fixes for camera sync issues
See: raspberrypi/linux#6863
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