[PATCH v1 3/4] scsi - convert mvme146_scsi.c to platform device

Michael Schmitz
2022-07-09T00:10:34Z

Convert the mvme147_scsi driver to a platform device driver.
This is required for conversion of the driver to the DMA API.

CC: linux-scsi@vger.kernel.org
Link: https://lore.kernel.org/r/6d1d88ee-1cf6-c735-1e6d-bafd2096e322@gmail.com
Signed-off-by: Michael Schmitz <schmitzmic@gmail.com>
---
drivers/scsi/mvme147.c | 86 ++++++++++++++++++++++++++++--------------
1 file changed, 58 insertions(+), 28 deletions(-)

diff --git a/drivers/scsi/mvme147.c b/drivers/scsi/mvme147.c
index 472fa043094f..aa6476c3e70c 100644
--- a/drivers/scsi/mvme147.c
+++ b/drivers/scsi/mvme147.c
@@ -3,6 +3,7 @@
#include <linux/mm.h>
#include <linux/blkdev.h>
#include <linux/interrupt.h>
+#include <linux/platform_device.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/module.h>
@@ -85,40 +86,50 @@ static struct scsi_host_template mvme147_host_template = {
.cmd_size = sizeof(struct scsi_pointer),
};

-static struct Scsi_Host *mvme147_shost;
-
-static int __init mvme147_init(void)
+static int __init mvme147_scsi_probe(struct platform_device *pdev)
{
+ struct resource *mres, *ires;
+ struct Scsi_Host *mvme147_inst;
wd33c93_regs regs;
struct WD33C93_hostdata *hdata;
int error = -ENOMEM;

- if (!MACH_IS_MVME147)
- return 0;
+ mres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!mres)
+ return -ENODEV;
+
+ ires = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+ if (!ires)
+ return -ENODEV;
+
+ if (!request_mem_region(mres->start, resource_size(mres), "wd33c93"))
+ return -EBUSY;

- mvme147_shost = scsi_host_alloc(&mvme147_host_template,
+ mvme147_inst = scsi_host_alloc(&mvme147_host_template,
sizeof(struct WD33C93_hostdata));
- if (!mvme147_shost)
+ if (!mvme147_inst)
goto err_out;
- mvme147_shost->base = 0xfffe4000;
- mvme147_shost->irq = MVME147_IRQ_SCSI_PORT;

- regs.SASR = (volatile unsigned char *)0xfffe4000;
- regs.SCMD = (volatile unsigned char *)0xfffe4001;

- hdata = shost_priv(mvme147_shost);
+ mvme147_inst->base = mres->start;
+ mvme147_inst->irq = ires->start;
+
+ regs.SASR = (volatile unsigned char *)mres->start;
+ regs.SCMD = (volatile unsigned char *)(mres->start)+0x1;
+
+ hdata = shost_priv(mvme147_inst);
hdata->no_sync = 0xff;
hdata->fast = 0;
hdata->dma_mode = CTRL_DMA;

- wd33c93_init(mvme147_shost, regs, dma_setup, dma_stop, WD33C93_FS_8_10);
+ wd33c93_init(mvme147_inst, regs, dma_setup, dma_stop, WD33C93_FS_8_10);

- error = request_irq(MVME147_IRQ_SCSI_PORT, mvme147_intr, 0,
- "MVME147 SCSI PORT", mvme147_shost);
+ error = request_irq(ires->start, mvme147_intr, 0,
+ "MVME147 SCSI PORT", mvme147_inst);
if (error)
goto err_unregister;
- error = request_irq(MVME147_IRQ_SCSI_DMA, mvme147_intr, 0,
- "MVME147 SCSI DMA", mvme147_shost);
+ error = request_irq(ires->start+1, mvme147_intr, 0,
+ "MVME147 SCSI DMA", mvme147_inst);
if (error)
goto err_free_irq;
#if 0 /* Disabled; causes problems booting */
@@ -133,30 +144,49 @@ static int __init mvme147_init(void)
m147_pcc->dma_cntrl = 0x00; /* ensure DMA is stopped */
m147_pcc->dma_intr = 0x89; /* Ack and enable ints */

- error = scsi_add_host(mvme147_shost, NULL);
+ error = scsi_add_host(mvme147_inst, &pdev->dev);
if (error)
goto err_free_irq;
- scsi_scan_host(mvme147_shost);
+
+ platform_set_drvdata(pdev, mvme147_inst);
+
+ scsi_scan_host(mvme147_inst);
return 0;

err_free_irq:
- free_irq(MVME147_IRQ_SCSI_PORT, mvme147_shost);
+ free_irq(ires->start, mvme147_inst);
err_unregister:
- scsi_host_put(mvme147_shost);
+ scsi_host_put(mvme147_inst);
err_out:
return error;
}

-static void __exit mvme147_exit(void)
+static int __exit mvme147_scsi_remove(struct platform_device *pdev)
{
- scsi_remove_host(mvme147_shost);
+ struct Scsi_Host *mvme147_inst = platform_get_drvdata(pdev);
+ struct resource *mres = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ struct resource *ires = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
+
+ scsi_remove_host(mvme147_inst);

/* XXX Make sure DMA is stopped! */
- free_irq(MVME147_IRQ_SCSI_PORT, mvme147_shost);
- free_irq(MVME147_IRQ_SCSI_DMA, mvme147_shost);
+ free_irq(ires->start, mvme147_inst);
+ free_irq(ires->start+1, mvme147_inst);

- scsi_host_put(mvme147_shost);
+ scsi_host_put(mvme147_inst);
+ release_mem_region(mres->start, resource_size(mres));
+ return 0;
}

-module_init(mvme147_init);
-module_exit(mvme147_exit);
+static struct platform_driver mvme147_scsi_driver = {
+ .remove = __exit_p(mvme147_scsi_remove),
+ .driver = {
+ .name = "mvme147-scsi",
+ },
+};
+
+module_platform_driver_probe(mvme147_scsi_driver, mvme147_scsi_probe);
+
+MODULE_DESCRIPTION("MVME147 built-in SCSI");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:mvme147-scsi");
--
2.17.1