From mboxrd@z Thu Jan 1 00:00:00 1970 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 B94843FDF for ; Thu, 14 Sep 2023 08:23:08 +0000 (UTC) Received: from [192.168.1.110] (unknown [103.86.18.170]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id 7FE8710A0; Thu, 14 Sep 2023 10:21:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1694679693; bh=nZmUcGdGil+IV3hOMk1J09Htu1fHl8OG/jy6x8mr4ak=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=urY+/D7wmLF+3Fs7nh3G/UViSGV87AVig0VYbrdvfQULbKAIkIvy9e9Sf2LxTC3rU iwhgwTUMwqGEgaJGsVWiyYoCnn9+2EQhboKVAD49m0oORXJEsJQBfDqJPaReJRNkl2 o5JuXXXQnZUIerpTCvZdFDtk91JS5IRTMm3ejCrQ= Message-ID: Date: Thu, 14 Sep 2023 13:52:57 +0530 Precedence: bulk X-Mailing-List: linux-staging@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: [PATCH v11 2/5] staging: vc04_services: vchiq_arm: Register vchiq_bus_type To: Stefan Wahren , linux-staging@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org, linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Stefan Wahren , Greg Kroah-Hartman , Florian Fainelli , Adrien Thierry , Dan Carpenter , Dave Stevenson , Kieran Bingham , Laurent Pinchart References: <20230913195354.835884-1-umang.jain@ideasonboard.com> <20230913195354.835884-3-umang.jain@ideasonboard.com> <0793697d-08b9-49bf-eef7-2abf33dfa747@gmx.net> Content-Language: en-US From: Umang Jain In-Reply-To: <0793697d-08b9-49bf-eef7-2abf33dfa747@gmx.net> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Hi Stefan On 9/14/23 2:31 AM, Stefan Wahren wrote: > Hi Umang, > > Am 13.09.23 um 21:53 schrieb Umang Jain: >> Register the vchiq_bus_type bus with the vchiq interface. >> The bcm2835-camera and bcm2835_audio will be registered to this bus type >> going ahead. >> >> Signed-off-by: Umang Jain >> Reviewed-by: Kieran Bingham >> --- >>   .../vc04_services/interface/vchiq_arm/vchiq_arm.c   | 13 ++++++++++++- >>   .../interface/vchiq_arm/vchiq_device.c              |  7 ------- >>   2 files changed, 12 insertions(+), 8 deletions(-) >> >> 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 aa2313f3bcab..d993a91de237 100644 >> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c >> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_arm.c >> @@ -12,6 +12,7 @@ >>   #include >>   #include >>   #include >> +#include >>   #include >>   #include >>   #include >> @@ -34,6 +35,7 @@ >>   #include "vchiq_ioctl.h" >>   #include "vchiq_arm.h" >>   #include "vchiq_debugfs.h" >> +#include "vchiq_device.h" >>   #include "vchiq_connected.h" >>   #include "vchiq_pagelist.h" >> >> @@ -1870,9 +1872,17 @@ static int __init vchiq_driver_init(void) >>   { >>       int ret; >> >> +    ret = bus_register(&vchiq_bus_type); >> +    if (ret) { >> +        pr_err("Failed to register %s\n", vchiq_bus_type.name); >> +        return ret; >> +    } >> + >>       ret = platform_driver_register(&vchiq_driver); >> -    if (ret) >> +    if (ret) { >>           pr_err("Failed to register vchiq driver\n"); >> +        bus_unregister(&vchiq_bus_type); >> +    } >> >>       return ret; >>   } >> @@ -1880,6 +1890,7 @@ module_init(vchiq_driver_init); >> >>   static void __exit vchiq_driver_exit(void) >>   { >> +    bus_unregister(&vchiq_bus_type); >>       platform_driver_unregister(&vchiq_driver); >>   } >>   module_exit(vchiq_driver_exit); >> diff --git >> a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_device.c >> b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_device.c >> index aad55c461905..b8c46f39e74a 100644 >> --- a/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_device.c >> +++ b/drivers/staging/vc04_services/interface/vchiq_arm/vchiq_device.c >> @@ -74,13 +74,6 @@ vchiq_device_register(struct device *parent, const >> char *name) >>       device->dev.bus = &vchiq_bus_type; >>       device->dev.release = vchiq_device_release; >> >> -    of_dma_configure(&device->dev, parent->of_node, true); >> -    ret = dma_set_mask_and_coherent(&device->dev, DMA_BIT_MASK(32)); >> -    if (ret) { >> -        dev_err(&device->dev, "32-bit DMA enable failed\n"); >> -        return NULL; >> -    } >> - > > this code was added in the patch before and now it's removed again. > Please avoid this. Ouch, fixup! got incorrectly squashed in this patch, should have been squashed in earlier patch, apologies. > >>       ret = device_register(&device->dev); >>       if (ret) { >>           dev_err(parent, "Cannot register %s: %d\n", name, ret); >