From patchwork Sun Jul 27 15:07:20 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 4631061 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 31BB1C0338 for ; Sun, 27 Jul 2014 15:10:46 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 4BF592011D for ; Sun, 27 Jul 2014 15:10:45 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 696DA20117 for ; Sun, 27 Jul 2014 15:10:44 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XBQ3Y-0005H7-5M; Sun, 27 Jul 2014 15:08:12 +0000 Received: from mail.linuxfoundation.org ([140.211.169.12]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XBQ3V-00059I-0R for linux-arm-kernel@lists.infradead.org; Sun, 27 Jul 2014 15:08:09 +0000 Received: from localhost (c-24-22-230-10.hsd1.wa.comcast.net [24.22.230.10]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 8C4D29F6; Sun, 27 Jul 2014 15:07:45 +0000 (UTC) Date: Sun, 27 Jul 2014 08:07:20 -0700 From: Greg Kroah-Hartman To: James Bottomley Subject: Re: [PATCH 4/5] [SCSI] Do not use platform_bus as a parent Message-ID: <20140727150720.GC1723@kroah.com> References: <1406298233-27876-1-git-send-email-pawel.moll@arm.com> <1406298233-27876-4-git-send-email-pawel.moll@arm.com> <1406299616.1789.13.camel@jarvis.lan> <20140726201150.GA21870@kroah.com> <1406433177.11069.3.camel@jarvis> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1406433177.11069.3.camel@jarvis> User-Agent: Mutt/1.5.23 (2014-03-12) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140727_080809_075657_735D33BF X-CRM114-Status: GOOD ( 27.49 ) X-Spam-Score: -2.9 (--) Cc: paul@pwsan.com, Pawel Moll , Arnd Bergmann , Stephen Warren , Catalin Marinas , Peter De Schrijver , linux-kernel@vger.kernel.org, linux-tegra@vger.kernel.org, arm@kernel.org, linux-scsi@vger.kernel.org, Olof Johansson , linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On Sun, Jul 27, 2014 at 07:52:57AM +0400, James Bottomley wrote: > On Sat, 2014-07-26 at 13:11 -0700, Greg Kroah-Hartman wrote: > > On Fri, Jul 25, 2014 at 07:46:56AM -0700, James Bottomley wrote: > > > On Fri, 2014-07-25 at 15:23 +0100, Pawel Moll wrote: > > > > The host devices without a parent were "forcefully adopted" > > > > by platform bus. This patch removes this assignment. In > > > > effect the dev_dev may be NULL now, which means ISA. > > > > > > > > Cc: James E.J. Bottomley > > > > Cc: linux-scsi@vger.kernel.org > > > > Signed-off-by: Pawel Moll > > > > --- > > > > > > > > This patch is a part of effort to remove references to platform_bus > > > > and make it static. > > > > > > > > James, could you please have a look and advice if the change is > > > > correct? Would you happen to know the "real reasons" behind > > > > using the root platform_bus device a parent? > > > > > > Yes, for DMA purposes, the parent cannot now be NULL; we'll get a panic > > > in the DMA transfers if it is. A lot of the legacy ISA device on x86 > > > and I thought some ARM SOC devices don't pass in the parent device, so > > > we hang them off a known parent. > > > > The "generic" platform bus device is not a "known parent". I don't > > understand the difference between just setting the parent to be NULL, > > which will then have a "proper" parent pointer filled in by the driver > > core when the device is registered, or faking it out here. What is the > > difference? > > If you set the parent to NULL, the host template dma_dev will end up > NULL as well and that will trigger a NULL deref panic in the dma segment > routines. > > If you want to remove platform_bus, we have to have a well known device > to set dma_dev to at scsi_host_add time. Why not set the dma_dev after you call device_add()? That way you will pick up the right parent no matter what. > > In the end, the device always ends up with a parent pointer, right? > > The parent pointer isn't the problem ... assigning the correct dma > device is. Ah, ok, it's a scsi core thing, not a driver core thing, that's less confusing now. For a "fallback" of a platform device, if you switch the lines around you should be fine, something like this patch perhaps: diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c index 3cbb57a8b846..d8d3b294f5bc 100644 --- a/drivers/scsi/hosts.c +++ b/drivers/scsi/hosts.c @@ -218,16 +218,16 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev, goto fail; if (!shost->shost_gendev.parent) - shost->shost_gendev.parent = dev ? dev : &platform_bus; - if (!dma_dev) - dma_dev = shost->shost_gendev.parent; - - shost->dma_dev = dma_dev; + shost->shost_gendev.parent = dev; error = device_add(&shost->shost_gendev); if (error) goto out; + if (!dma_dev) + dma_dev = shost->shost_gendev.parent; + shost->dma_dev = dma_dev; + pm_runtime_set_active(&shost->shost_gendev); pm_runtime_enable(&shost->shost_gendev); device_enable_async_suspend(&shost->shost_gendev);