Received: by 2002:a05:6a10:22f:0:0:0:0 with SMTP id 15csp1860008pxk; Sun, 13 Sep 2020 19:48:32 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxilNw9Aqz9DuLJ1MYKcSWTOzlh/BziT2CacX9fT2PoCEGHH1cHqm4Al5z11N1AAVZBHzna X-Received: by 2002:a17:906:f11:: with SMTP id z17mr12931339eji.88.1600051712086; Sun, 13 Sep 2020 19:48:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1600051712; cv=none; d=google.com; s=arc-20160816; b=gVh18rb88g4oDOyI6h6w2FKQLgXw3FXD5HQfl5m78gL7gAVOWfuYuhmESNyULU4t2a LhrRHppLxAMR0jiFRUy+Xkc3Cep4FZhCc+NemquRe1DyAMV34dqdjXUH3yqPqw0Ns1mE z8n7dIIvI+RNM4sX6g4Dl3AUld44D1j+UARL/iih7XrjfaHOA+2GLUTyrnd+XlFl3Ef1 p1OpeKXJIG1zWjdwr/okmstGWeL6EDQox6o0PhYRJhlylbgnHBUipfdRKceRBInugWnh 2H/SrFDFBrJSEZxWGjT8s71j/DU1kgWH28cQQyTsPCIyoxu/tCgwJVR4G1BRkyotmIAE il/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:date:subject:from:message-id:cc:to; bh=6rqOGAE68xqoiLmT+Vmmu4o2qaP4wt+T9vO1/fBuLro=; b=snJ3PjU2pR8xx/Uo/Dd9eHLj2YvitpTxlQ+Cs6JpQ83sn1H/6F7riLjOiNcOKJ0Jtt OtHlO/KAZcH+dgIAhY0ywmilcffGgRMdDPhnH5MPl3M+Uc6T4k3Vikfi3QlOfz4ZF755 ywY/kVndD0a9zvCEf/V28UQlBWeZuwFokIUX+AM/BHLFQ2s/utljmv1dUfYHOHwjRCfR /+y/jOMnLoP0ysg2+3t9nohDv9rtUNhhRfWT7jc5j7Q/uhYSqkfgI7Rymgmz+vEeLtrr lIP11pAwz/bqPV+SquwK4xgIZqiOOiqvhm6P95uoMLKGGrhPdR2W2hasreWg2sflRGFB 51Gg== 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 mb19si5867362ejb.589.2020.09.13.19.48.09; Sun, 13 Sep 2020 19:48:32 -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 S1726047AbgINCri (ORCPT + 99 others); Sun, 13 Sep 2020 22:47:38 -0400 Received: from kvm5.telegraphics.com.au ([98.124.60.144]:58220 "EHLO kvm5.telegraphics.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725986AbgINCrh (ORCPT ); Sun, 13 Sep 2020 22:47:37 -0400 Received: by kvm5.telegraphics.com.au (Postfix, from userid 502) id 35CBF2A46D; Sun, 13 Sep 2020 22:47:34 -0400 (EDT) To: "David S. Miller" Cc: "Bartlomiej Zolnierkiewicz" , "Geert Uytterhoeven" , "Joshua Thompson" , linux-m68k@lists.linux-m68k.org, linux-kernel@vger.kernel.org, linux-ide@vger.kernel.org Message-Id: <3cf40b9df80a99a3eee6d3af79437016038f0a44.1600051331.git.fthain@telegraphics.com.au> From: Finn Thain Subject: [PATCH v2] ide/macide: Convert Mac IDE driver to platform driver Date: Mon, 14 Sep 2020 12:42:11 +1000 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- This patch was tested successfully on a Powerbook 190 (MAC_IDE_BABOON) using both pata_platform and ide_platform drivers. The next step will be to try using these generic drivers with the other IDE controller variants (MAC_IDE_QUADRA or MAC_IDE_PB) so that the macide driver can be entirely replaced with libata drivers. Changed since v1: - Adopted DEFINE_RES_MEM and DEFINE_RES_IRQ macros. - Dropped IORESOURCE_IRQ_SHAREABLE flag as it is ignored by pata_platform.c and IRQF_SHARED makes no difference in this case. - Removed redundant release_mem_region() call. - Enabled CONFIG_BLK_DEV_PLATFORM in mac_defconfig. We might also enable CONFIG_PATA_PLATFORM but IMO migration to libata should be a separate patch (as this patch has some unrelated benefits). --- arch/m68k/configs/mac_defconfig | 1 + arch/m68k/mac/config.c | 41 ++++++++++++++++++++ drivers/ide/macide.c | 66 +++++++++++++++++++++------------ 3 files changed, 85 insertions(+), 23 deletions(-) diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig index 6087798662601..f770970fe4e99 100644 --- a/arch/m68k/configs/mac_defconfig +++ b/arch/m68k/configs/mac_defconfig @@ -317,6 +317,7 @@ CONFIG_DUMMY_IRQ=m CONFIG_IDE=y CONFIG_IDE_GD_ATAPI=y CONFIG_BLK_DEV_IDECD=y +CONFIG_BLK_DEV_PLATFORM=y CONFIG_BLK_DEV_MAC_IDE=y CONFIG_RAID_ATTRS=m CONFIG_SCSI=y diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c index 5c9f3a2d65388..43fc29180cb58 100644 --- a/arch/m68k/mac/config.c +++ b/arch/m68k/mac/config.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -940,6 +941,26 @@ static const struct resource mac_scsi_ccl_rsrc[] __initconst = { }, }; +static const struct resource mac_ide_quadra_rsrc[] __initconst = { + DEFINE_RES_MEM(0x50F1A000, 0x104), + DEFINE_RES_IRQ(IRQ_NUBUS_F), +}; + +static const struct resource mac_ide_pb_rsrc[] __initconst = { + DEFINE_RES_MEM(0x50F1A000, 0x104), + DEFINE_RES_IRQ(IRQ_NUBUS_C), +}; + +static const struct resource mac_pata_baboon_rsrc[] __initconst = { + DEFINE_RES_MEM(0x50F1A000, 0x38), + DEFINE_RES_MEM(0x50F1A038, 0x04), + DEFINE_RES_IRQ(IRQ_BABOON_1), +}; + +static const struct pata_platform_info mac_pata_baboon_data __initconst = { + .ioport_shift = 2, +}; + int __init mac_platform_init(void) { phys_addr_t swim_base = 0; @@ -1048,6 +1069,26 @@ int __init mac_platform_init(void) break; } + /* + * IDE device + */ + + switch (macintosh_config->ide_type) { + case MAC_IDE_QUADRA: + platform_device_register_simple("mac_ide", -1, + mac_ide_quadra_rsrc, ARRAY_SIZE(mac_ide_quadra_rsrc)); + break; + case MAC_IDE_PB: + platform_device_register_simple("mac_ide", -1, + mac_ide_pb_rsrc, ARRAY_SIZE(mac_ide_pb_rsrc)); + break; + case MAC_IDE_BABOON: + platform_device_register_resndata(NULL, "pata_platform", -1, + mac_pata_baboon_rsrc, ARRAY_SIZE(mac_pata_baboon_rsrc), + &mac_pata_baboon_data, sizeof(mac_pata_baboon_data)); + break; + } + /* * Ethernet device */ diff --git a/drivers/ide/macide.c b/drivers/ide/macide.c index 3c6bb8599303b..f2236456b3706 100644 --- 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 */ @@ -109,42 +110,61 @@ 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; - 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); - return ide_host_add(&d, hws, 1, NULL); + rc = ide_host_add(&d, hws, 1, &host); + if (rc) + return rc; + + platform_set_drvdata(pdev, host); + return 0; } -module_init(macide_init); +static int mac_ide_remove(struct platform_device *pdev) +{ + struct ide_host *host = dev_get_drvdata(&pdev->dev); + + ide_host_remove(host); + return 0; +} + +static struct platform_driver mac_ide_driver = { + .driver = { + .name = DRV_NAME, + }, + .probe = mac_ide_probe, + .remove = mac_ide_remove, +}; + +module_platform_driver(mac_ide_driver); +MODULE_ALIAS("platform:" DRV_NAME); MODULE_LICENSE("GPL"); -- 2.26.2