Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp150275pxk; Wed, 9 Sep 2020 01:22:20 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx6TD+I6hyNnX0lTTo9/zmrmN0u3Beer+SxwqJCFZsgpHSrmlrgaPpmS4DyhH//9F2xFP59 X-Received: by 2002:a17:906:fcc7:: with SMTP id qx7mr2690460ejb.254.1599639740450; Wed, 09 Sep 2020 01:22:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1599639740; cv=none; d=google.com; s=arc-20160816; b=EKd6U265AnQVcLz7nIULYWgro70MJWNXXS9gaTp3oQ44cJTcb6plSG/7F3g4TzPcTN Dmhg2lQeX+fyDF+sXLlD8YuE/vgLw4ligjYq/m2yg4KIJa7wo42kWYA7xDtL1XOIJFHg q/GjYLQEUedi1+A9F+lDrZjHRjMzfLRUmG0uomWoO9sSzICQBvMTQg9mYP1/DBLp/Rl9 uumGaZw7zcjQ/P+Ttq9EpAkXC8fnArfNiqWFTZRAJ9G3L8Y5epXfRJemnzvrt4jYEyOa Qft7l3WCviutCU733xnkp7KppmnKmAwY8nZchMGqQqvp60xtWuXz2CoTww6lK/yVEpBq TNcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version; bh=MNqX1Kt5t6A882o2HZ+jAXfNO+3aimU6By7fOQmqm98=; b=yJYyfJYBAWZimnY3ijWIxBk4SxqpnM0RJaA+P/3TU31BfyBxUuEZhtX0KymMk9LvHL yYbKUI+iP6uJf/Y+DJaYJavE/lvQJBVFyo49P974q/I4T6yfgamdSgB9MVqjPEHKIIAa Sdy906AsoQLrFbXnrJnKsORIFwZXIHY59UHql7mezbUtWVfsMgWx+sTGVKII4ZGd/jg+ wOa6MzBg42siNztLUS9iCDApW5asP/vA+HexxpQ0iBcc5AUqNLwUV++Uy6A6WPEWAdQM cU1OllJ9a/1bsLX70mlhmmhkISwYedPoX9Fhu46BYHWMfF0Qf7SMgYIfcvB9MYuOlfq4 GAtQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l7si1127624edv.419.2020.09.09.01.21.57; Wed, 09 Sep 2020 01:22:20 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729449AbgIIIV2 (ORCPT + 99 others); Wed, 9 Sep 2020 04:21:28 -0400 Received: from mail-ot1-f65.google.com ([209.85.210.65]:34248 "EHLO mail-ot1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726036AbgIIIV2 (ORCPT ); Wed, 9 Sep 2020 04:21:28 -0400 Received: by mail-ot1-f65.google.com with SMTP id h17so1614723otr.1; Wed, 09 Sep 2020 01:21:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=MNqX1Kt5t6A882o2HZ+jAXfNO+3aimU6By7fOQmqm98=; b=f/p8QDtdCXloiyHFHH6IrAWtyomRfgy+/xB+fwvlSppu5VG0cCcH85Wf0aRgEQzz/o ZWtNWHI21ZdubUN31HlqChdiXUBp/J6nwsI8DynuUB8Xd9SxlyV9A9fBwKRcWrYXOU/t L0MLF3WrT9sseDRxsWyK36SBqkB/2uy9pB7XQ/HfWtw99bx5T3fM7cb2PCdJG1R7e002 /ljNc/XXWBds4shk6hY/qp7U/GYkLWyM86t5Hh3DL4t47WVNDQlArCDQuQQOFp6VcVXg CoI2cK0UiBkRJPDZ+jlcqDUu7yJjHAJkBGTeKYx1zb93FuLovERO0mDCPPzCk9zu9xIT czMg== X-Gm-Message-State: AOAM531/26M/bGpSxP6meJOtltBKf47eyzAfE4ttRag4FScN5hF37Cmr UbHIy8RLaOIaqPvidfxhaZRJAfmcdJA4ckC0peQ= X-Received: by 2002:a9d:3b76:: with SMTP id z109mr2012536otb.250.1599639687255; Wed, 09 Sep 2020 01:21:27 -0700 (PDT) MIME-Version: 1.0 References: <00ee44fe6ecdce1c783c3cc3b1b9a62b498dcdb2.1597736545.git.fthain@telegraphics.com.au> In-Reply-To: <00ee44fe6ecdce1c783c3cc3b1b9a62b498dcdb2.1597736545.git.fthain@telegraphics.com.au> From: Geert Uytterhoeven Date: Wed, 9 Sep 2020 10:21:15 +0200 Message-ID: Subject: Re: [PATCH] ide/macide: Convert Mac IDE driver to platform driver To: Finn Thain Cc: "David S. Miller" , Bartlomiej Zolnierkiewicz , Joshua Thompson , linux-m68k , Linux Kernel Mailing List , linux-ide@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi Finn, On Tue, Aug 18, 2020 at 9:45 AM Finn Thain wrote: > Add platform devices for the Mac IDE controller variants. Convert the > macide module into a platform driver to support two of those variants. > For the third, use a generic "pata_platform" driver instead. > This enables automatic loading of the appropriate module and begins > the process of replacing the driver with libata alternatives. > > Cc: Bartlomiej Zolnierkiewicz > Cc: Geert Uytterhoeven > Cc: Joshua Thompson > References: commit 5ed0794cde593 ("m68k/atari: Convert Falcon IDE drivers to platform drivers") > References: commit 7ad19a99ad431 ("ide: officially deprecated the legacy IDE driver") > Tested-by: Stan Johnson > Signed-off-by: Finn Thain Thanks for your patch! > --- a/arch/m68k/mac/config.c > +++ b/arch/m68k/mac/config.c > @@ -940,6 +941,50 @@ static const struct resource mac_scsi_ccl_rsrc[] __initconst = { > }, > }; > > +static const struct resource mac_ide_quadra_rsrc[] __initconst = { > + { > + .flags = IORESOURCE_MEM, > + .start = 0x50F1A000, > + .end = 0x50F1A103, > + }, { > + .flags = IORESOURCE_IRQ, > + .start = IRQ_NUBUS_F, > + .end = IRQ_NUBUS_F, > + }, > +}; > + > +static const struct resource mac_ide_pb_rsrc[] __initconst = { > + { > + .flags = IORESOURCE_MEM, > + .start = 0x50F1A000, > + .end = 0x50F1A103, > + }, { > + .flags = IORESOURCE_IRQ, > + .start = IRQ_NUBUS_C, > + .end = IRQ_NUBUS_C, > + }, > +}; As the above two variants are almost identical, perhaps it makes sense to drop one of them, drop the const, and override the irq values dynamically? > + > +static const struct resource mac_pata_baboon_rsrc[] __initconst = { > + { > + .flags = IORESOURCE_MEM, > + .start = 0x50F1A000, > + .end = 0x50F1A037, > + }, { > + .flags = IORESOURCE_MEM, > + .start = 0x50F1A038, > + .end = 0x50F1A03B, > + }, { > + .flags = IORESOURCE_IRQ | IORESOURCE_IRQ_SHAREABLE, > + .start = IRQ_BABOON_1, > + .end = IRQ_BABOON_1, > + }, > +}; > + > +static const struct pata_platform_info mac_pata_baboon_data __initconst = { > + .ioport_shift = 2, > +}; Just wondering: how is this implemented in drivers/ide/macide.c, which doesn't use the platform info? > --- a/drivers/ide/macide.c > +++ b/drivers/ide/macide.c > @@ -18,10 +18,11 @@ > #include > #include > #include > +#include > > #include > -#include > -#include > + > +#define DRV_NAME "mac_ide" > > #define IDE_BASE 0x50F1A000 /* Base address of IDE controller */ Do you still need this definition? Yes, because it's still used to access IDE_IFR. Ideally, that should be converted to use the base from the resource, too. > > @@ -109,42 +110,65 @@ static const char *mac_ide_name[] = > * Probe for a Macintosh IDE interface > */ > > -static int __init macide_init(void) > +static int mac_ide_probe(struct platform_device *pdev) > { > - unsigned long base; > - int irq; > + struct resource *mem, *irq; > struct ide_hw hw, *hws[] = { &hw }; > struct ide_port_info d = macide_port_info; > + struct ide_host *host; > + int rc; > > if (!MACH_IS_MAC) > return -ENODEV; > > - switch (macintosh_config->ide_type) { > - case MAC_IDE_QUADRA: > - base = IDE_BASE; > - irq = IRQ_NUBUS_F; > - break; > - case MAC_IDE_PB: > - base = IDE_BASE; > - irq = IRQ_NUBUS_C; > - break; > - case MAC_IDE_BABOON: > - base = BABOON_BASE; > - d.port_ops = NULL; How does the driver know not to use the special port_ops after this change? > - irq = IRQ_BABOON_1; > - break; > - default: > + mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + if (!mem) > + return -ENODEV; > + > + irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); > + if (!irq) > return -ENODEV; > + > + if (!devm_request_mem_region(&pdev->dev, mem->start, > + resource_size(mem), DRV_NAME)) { > + dev_err(&pdev->dev, "resources busy\n"); > + return -EBUSY; > } > > printk(KERN_INFO "ide: Macintosh %s IDE controller\n", > mac_ide_name[macintosh_config->ide_type - 1]); > > - macide_setup_ports(&hw, base, irq); > + macide_setup_ports(&hw, mem->start, irq->start); > + > + rc = ide_host_add(&d, hws, 1, &host); > + if (rc) > + goto release_mem; > + > + platform_set_drvdata(pdev, host); In general, it's safer to move the platform_set_drvdata() call before the ide_host_add() call, as the IDE core may start calling into your driver as soon as the host has been added. Fortunately you're using dev_get_drvdata() in the .remove() callback only, and not in other parts of the driver. > + return 0; > + > +release_mem: > + release_mem_region(mem->start, resource_size(mem)); Not needed, as you used devm_*() for allocation. > + return rc; > +} > + > +static int mac_ide_remove(struct platform_device *pdev) > +{ > + struct ide_host *host = dev_get_drvdata(&pdev->dev); > > - return ide_host_add(&d, hws, 1, NULL); > + ide_host_remove(host); > + return 0; > } Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds