From nobody Wed Dec 17 04:20:29 2025 Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 138443375C3 for ; Wed, 29 Oct 2025 10:31:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.167.242.64 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761733888; cv=none; b=RgpTTNoYc4FQKcZltTZy1NPQbwKfeLt3gXoi3x7HgSCPXq7LnDLv6rIAnp3xlEsM61TUWvrMJfOCxRXXqwf/WxzBVxv/spWakM9BxEX6uY6QXcRF4Ag72xMjG7vqnjpOYvSdqb/wn6ooxRrchqq5q53uUbnYHIXBydsfA2iWo78= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761733888; c=relaxed/simple; bh=QrX3ihJUHZKLUD2evYwTzbqtdfbAC8+udCaDcM4ubdM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=Q46WnAf6X1vkeSPQ9AyPGne+8EkG458spLSUjwajKO9GpizIcNL7TaKDU+EItb8qcMJyJ6GCGKLzyKQb9eg7quU4w/KtO1Vqc4yPGVJfD0YFkM6yUa0Z2nBZB+3662786Ur+4bGlBmV2rp/z18sfWjHwyseIy378DiTYEBaYMlI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ideasonboard.com; spf=pass smtp.mailfrom=ideasonboard.com; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b=rim3xw4K; arc=none smtp.client-ip=213.167.242.64 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ideasonboard.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ideasonboard.com header.i=@ideasonboard.com header.b="rim3xw4K" Received: from mail.ideasonboard.com (unknown [IPv6:2401:4900:1c69:314e:ee86:ae6e:30:9d13]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 4A6441E1B; Wed, 29 Oct 2025 11:29:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1761733775; bh=QrX3ihJUHZKLUD2evYwTzbqtdfbAC8+udCaDcM4ubdM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=rim3xw4Kt0UJehY2QUR96DYDSPy8IDce6YWAjXIgMyH9KQeC1A766lZ6BUqMjyLrI qG97EekKuKpuuAc8CKkZao9LgBGJox0uXjI7N2qn4nqnaS+dh40gHW9mPm2SCR50Gd JOLOndRZENoTSrgws9sVRakruomUaYz5yaSDRM8w= From: Jai Luthra Date: Wed, 29 Oct 2025 16:00:08 +0530 Subject: [PATCH v3 4/7] include: linux: Destage VCHIQ interface headers Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20251029-vchiq-destage-v3-4-da8d6c83c2c5@ideasonboard.com> References: <20251029-vchiq-destage-v3-0-da8d6c83c2c5@ideasonboard.com> In-Reply-To: <20251029-vchiq-destage-v3-0-da8d6c83c2c5@ideasonboard.com> To: Florian Fainelli , Broadcom internal kernel review list , Greg Kroah-Hartman , Ray Jui , Scott Branden Cc: linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org, kernel-list@raspberrypi.com, Stefan Wahren , Dave Stevenson , Laurent Pinchart , Kieran Bingham , Phil Elwell , Umang Jain , Jai Luthra , Umang Jain X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=12088; i=jai.luthra@ideasonboard.com; h=from:subject:message-id; bh=QrX3ihJUHZKLUD2evYwTzbqtdfbAC8+udCaDcM4ubdM=; b=owEBbQKS/ZANAwAKAUPekfkkmnFFAcsmYgBpAezcCHWeug9gVk/7H1tKOOjbSxyJUqG8/prli AAg7LxxFqSJAjMEAAEKAB0WIQRN4NgY5dV16NRar8VD3pH5JJpxRQUCaQHs3AAKCRBD3pH5JJpx RSepD/sGWry2zbnUgFeuyt63eRtML7RpF4EKSXDcn2kyj8Yt0TM4RyFd8QwHRjz8+G8p5NwLKhq UFxQGug7yt4JI6V8oT9vaOiYQuBkRkMqHBKGGxqwuuzZyOqw7zNAk/OJ0+K8m63CiUEWb4CKvNn ja56cIfzHyje5jmpJZezsEha/LZCzmnCQMMGa0XyA5oeq4HFb5l6S00F9BOEJ9by/Ps9Bu0JwaL AvR2//BMTHNW4+DnT6cFXq17sKLJYCyINqjwIPkmrgn75FSX+TCi3o2ZiReVoF/XV9fHFAtyHe3 jkzs9um9iv9Lh/fc8+xikzfWjmUg8CiNjwzJblS5B01OP04nOnJ34Nr6Tenytl8eI0XS1MBxjcL u9uVxARso50IYfNM4LSG6FPD3jmCqShCmSx1if8zCR4duqODIXX1GEeEx1A4pSTAigIUsIlnlqG Fwgmh/G+OlrJjL8DMUF/mXbjaWhWNosjFcDkC9bge3ofDq0Ba7nOCDf2Wob70isgf+itgD2g0mI HcFZ7gdbikGgS1bxrVNHm6J1eipCccw8LDlEyZEtdcuESxT2joEI6Ch629hzWU4wlM+tF+NcTAx yi9NnEc8+w3WQ94E8mbewB0SPTGrkfGMOJPEK1RXXWhrqMUPtKJSwAM/r67NE+1cLBR+f0HE8C4 MiTnnyUFjp4qmIg== X-Developer-Key: i=jai.luthra@ideasonboard.com; a=openpgp; fpr=4DE0D818E5D575E8D45AAFC543DE91F9249A7145 Move the VCHIQ headers from drivers/staging/vc04_services/include to include/linux/raspberrypi This is done so that they can be shared between the VCHIQ interface (which is going to be de-staged in a subsequent commit from staging) and the VCHIQ drivers left in the staging/vc04_services (namely bcm2835-audio, bcm2835-camera). The include/linux/raspberrypi/ provides a central location to serve both of these areas. Co-developed-by: Umang Jain Signed-off-by: Umang Jain Reviewed-by: Laurent Pinchart Signed-off-by: Jai Luthra --- MAINTAINERS = | 1 + drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c = | 5 +++-- drivers/staging/vc04_services/bcm2835-audio/bcm2835.c = | 3 ++- drivers/staging/vc04_services/bcm2835-audio/bcm2835.h = | 3 +-- drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c = | 9 +++++---- drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.c = | 4 ++-- drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c = | 4 ++-- drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c = | 6 +++--- drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c = | 7 ++++--- drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h = | 3 +-- drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c = | 5 +++-- {drivers/staging/vc04_services/include =3D> include}/linux/raspberrypi/vch= iq.h | 0 {drivers/staging/vc04_services/interface/vchiq_arm =3D> include/linux/rasp= berrypi}/vchiq_arm.h | 0 {drivers/staging/vc04_services/interface/vchiq_arm =3D> include/linux/rasp= berrypi}/vchiq_bus.h | 0 {drivers/staging/vc04_services/interface/vchiq_arm =3D> include/linux/rasp= berrypi}/vchiq_cfg.h | 0 {drivers/staging/vc04_services/interface/vchiq_arm =3D> include/linux/rasp= berrypi}/vchiq_core.h | 2 +- {drivers/staging/vc04_services/interface/vchiq_arm =3D> include/linux/rasp= berrypi}/vchiq_debugfs.h | 0 17 files changed, 28 insertions(+), 24 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 3da2c26a796b82b9de4143c1591a9b1d44d42194..cd223e119d48ec24ed00119fbc9= 5653fff88cf34 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4829,6 +4829,7 @@ T: git https://github.com/broadcom/stblinux.git F: Documentation/devicetree/bindings/pci/brcm,stb-pcie.yaml F: drivers/pci/controller/pcie-brcmstb.c F: drivers/staging/vc04_services +F: include/linux/raspberrypi/vchiq* N: bcm2711 N: bcm2712 N: bcm283* diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c b/= drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c index 0dbe76ee557032d7861acfc002cc203ff2e6971d..7368b384497f7b1439252a857f5= 845d3c4108c75 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835-vchiq.c @@ -4,11 +4,12 @@ #include #include #include + +#include + #include "bcm2835.h" #include "vc_vchi_audioserv_defs.h" =20 -#include "../interface/vchiq_arm/vchiq_arm.h" - struct bcm2835_audio_instance { struct device *dev; unsigned int service_handle; diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c b/driver= s/staging/vc04_services/bcm2835-audio/bcm2835.c index b74cb104e9de00e7688a320949111a419cca084a..f292a6618166fe2581dffce8738= 73c67af3d3b54 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.c @@ -6,7 +6,8 @@ #include #include =20 -#include "../interface/vchiq_arm/vchiq_bus.h" +#include + #include "bcm2835.h" =20 static bool enable_hdmi; diff --git a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h b/driver= s/staging/vc04_services/bcm2835-audio/bcm2835.h index 49ec5b496edb4ba8634171b1390c4e15181e4048..5a1348747ff4e0b63b244156a22= 52bb276863514 100644 --- a/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h +++ b/drivers/staging/vc04_services/bcm2835-audio/bcm2835.h @@ -5,13 +5,12 @@ #define __SOUND_ARM_BCM2835_H =20 #include +#include #include #include #include #include =20 -#include "../include/linux/raspberrypi/vchiq.h" - #define MAX_SUBSTREAMS (8) #define AVAIL_SUBSTREAMS_MASK (0xff) =20 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c = b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c index a2074069e79e80456a382523b68a6f62116f796c..6a7b96d3dae6275a483ef15dc61= 9c5510454765e 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c @@ -30,11 +30,12 @@ #include #include =20 -#include "vchiq_core.h" +#include +#include +#include +#include + #include "vchiq_ioctl.h" -#include "vchiq_arm.h" -#include "vchiq_bus.h" -#include "vchiq_debugfs.h" =20 #define DEVICE_NAME "vchiq" =20 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.c = b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.c index 41ece91ab88aa647a348910a0b913d0b28a8c761..f50e637d505cc58e86351de4e22= ac57152570075 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.c @@ -11,8 +11,8 @@ #include #include =20 -#include "vchiq_arm.h" -#include "vchiq_bus.h" +#include +#include =20 static int vchiq_bus_type_match(struct device *dev, const struct device_dr= iver *drv) { diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c= b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c index e2cac0898b8faa3c255de6b8562c7096a9683c49..dc2c304c886edf59115fdd66c88= 42cb8eeeacff8 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.c @@ -15,8 +15,8 @@ #include #include =20 -#include "vchiq_arm.h" -#include "vchiq_core.h" +#include +#include =20 #define VCHIQ_SLOT_HANDLER_STACK 8192 =20 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugf= s.c b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c index d5f7f61c5626934b819e8ff322e22ae3d6158b31..c82326a9b6d9cfba7d4233a4853= 0f85443eb2f5a 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs.c @@ -5,9 +5,9 @@ */ =20 #include -#include "vchiq_core.h" -#include "vchiq_arm.h" -#include "vchiq_debugfs.h" +#include +#include +#include =20 #ifdef CONFIG_DEBUG_FS =20 diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c = b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c index 3b20ba5c736221ce1cacfc9ce86eca623382a30b..0f3dde2657d6b81fab64daa17d2= 6592712fe8473 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_dev.c @@ -11,10 +11,11 @@ #include #include =20 -#include "vchiq_core.h" +#include +#include +#include + #include "vchiq_ioctl.h" -#include "vchiq_arm.h" -#include "vchiq_debugfs.h" =20 static const char *const ioctl_names[] =3D { "CONNECT", diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.= h b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h index afb71a83cfe7035e5dd61003fa99fd514ca18047..d0c759f6d8ea79e43247048f8b3= 903df67dd84c8 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_ioctl.h @@ -5,8 +5,7 @@ #define VCHIQ_IOCTLS_H =20 #include - -#include "../../include/linux/raspberrypi/vchiq.h" +#include =20 #define VCHIQ_IOC_MAGIC 0xc4 #define VCHIQ_INVALID_HANDLE (~0) diff --git a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c b/driver= s/staging/vc04_services/vchiq-mmal/mmal-vchiq.c index c2b5a37915f236caaf5c6117f71d87867127d94d..cd073ed3ea2dd9c45b137f1a32e= 236e520b7b320 100644 --- a/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c +++ b/drivers/staging/vc04_services/vchiq-mmal/mmal-vchiq.c @@ -22,11 +22,12 @@ #include #include #include +#include #include #include =20 -#include "../include/linux/raspberrypi/vchiq.h" -#include "../interface/vchiq_arm/vchiq_arm.h" +#include + #include "mmal-common.h" #include "mmal-vchiq.h" #include "mmal-msg.h" diff --git a/drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.= h b/include/linux/raspberrypi/vchiq.h similarity index 100% rename from drivers/staging/vc04_services/include/linux/raspberrypi/vchiq.h rename to include/linux/raspberrypi/vchiq.h diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h = b/include/linux/raspberrypi/vchiq_arm.h similarity index 100% rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.h rename to include/linux/raspberrypi/vchiq_arm.h diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.h = b/include/linux/raspberrypi/vchiq_bus.h similarity index 100% rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.h rename to include/linux/raspberrypi/vchiq_bus.h diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_cfg.h = b/include/linux/raspberrypi/vchiq_cfg.h similarity index 100% rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_cfg.h rename to include/linux/raspberrypi/vchiq_cfg.h diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h= b/include/linux/raspberrypi/vchiq_core.h similarity index 99% rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h rename to include/linux/raspberrypi/vchiq_core.h index e3ed50d26c37eb767df43c6cea6b5f0826fada61..e7bf7a114985a59034af3a51a70= 5bb1ad7479cf4 100644 --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_core.h +++ b/include/linux/raspberrypi/vchiq_core.h @@ -15,7 +15,7 @@ #include #include =20 -#include "../../include/linux/raspberrypi/vchiq.h" +#include "vchiq.h" #include "vchiq_cfg.h" =20 /* Do this so that we can test-build the code on non-rpi systems */ diff --git a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugf= s.h b/include/linux/raspberrypi/vchiq_debugfs.h similarity index 100% rename from drivers/staging/vc04_services/interface/vchiq_arm/vchiq_debugfs= .h rename to include/linux/raspberrypi/vchiq_debugfs.h --=20 2.51.0