On Mon, Nov 29, 2021 at 8:20 AM Lh Kuo 郭力豪 <lh.Kuo@xxxxxxxxxxx> wrote:
> Feel sorry. I haven't found any devm PM API use in the SPI driver, and I didn't realize that PM function also has devm API. So I was confused before. I will move the pm_runtime_enable() after the devm_spi_register_controller() . I have rewritten the Probe and Remove functions as shown below.
Neither you found APIs for clock and reset, Try to grep for
devm_add_action_or_reset().
So, for PM it is probably good to leave it last, but you still have the issue.
> And sp7021_spi_controller driver is modified and the code cleaned more than -50 LOCs. If the Probe and Remove functions is OK I will start next submission.
No, it's not okay.. yet, but we are closer. See my comments above and below.
> Thanks for all comments
>
> static int sp7021_spi_controller_probe(struct platform_device *pdev)
> {
> struct device *dev = &pdev->dev;
> struct sp7021_spi_ctlr *pspim;
> struct spi_controller *ctlr;
> int mode;
> int ret;
>
> dev_info(dev, "sp7021_spi_controller_probe\n");
>
> mode = SP7021_MASTER_MODE;
> pdev->id = of_alias_get_id(pdev->dev.of_node, "sp_spi");
>
> if (of_property_read_bool(pdev->dev.of_node, "spi-slave"))
> mode = SP7021_SLAVE_MODE;
>
> if (mode == SP7021_SLAVE_MODE)
> ctlr = devm_spi_alloc_slave(dev, sizeof(*pspim));
> else
> ctlr = devm_spi_alloc_master(dev, sizeof(*pspim));
> if (!ctlr)
> return -ENOMEM;
>
> ctlr->dev.of_node = pdev->dev.of_node;
device_set_node()
> ctlr->bus_num = pdev->id;
> ctlr->mode_bits = SPI_CPOL | SPI_CPHA | SPI_CS_HIGH | SPI_LSB_FIRST;
> ctlr->auto_runtime_pm = true;
> ctlr->prepare_message = sp7021_spi_controller_prepare_message;
> if (mode == SP7021_SLAVE_MODE) {
> ctlr->transfer_one = sp7021_spi_sla_transfer_one;
> ctlr->slave_abort = sp7021_spi_sla_abort;
> ctlr->flags = SPI_CONTROLLER_HALF_DUPLEX;
> } else {
> ctlr->bits_per_word_mask = SPI_BPW_MASK(8);
> ctlr->min_speed_hz = 40000;
> ctlr->max_speed_hz = 25000000;
> ctlr->use_gpio_descriptors = true;
> ctlr->flags = SPI_CONTROLLER_MUST_RX | SPI_CONTROLLER_MUST_TX;
> ctlr->transfer_one = sp7021_spi_mas_transfer_one;
> }
> platform_set_drvdata(pdev, ctlr);
> pspim = spi_controller_get_devdata(ctlr);
> pspim->ctlr = ctlr;
> pspim->dev = dev;
> spin_lock_init(&pspim->lock);
> mutex_init(&pspim->buf_lock);
> init_completion(&pspim->isr_done);
> init_completion(&pspim->sla_isr);
> pspim->mas_base = devm_platform_ioremap_resource_byname(pdev, "master");
> pspim->sla_base = devm_platform_ioremap_resource_byname(pdev, "slave");
Where are the error checks?
> pspim->mas_irq = platform_get_irq_byname(pdev, "mas_risc");
> if (pspim->mas_irq < 0)
> return pspim->mas_irq;
>
> pspim->sla_irq = platform_get_irq_byname(pdev, "slave_risc");
> if (pspim->sla_irq < 0)
> return pspim->sla_irq;
>
> ret = devm_request_irq(dev, pspim->mas_irq, sp7021_spi_mas_irq,
> IRQF_TRIGGER_RISING, pdev->name, pspim);
> if (ret)
> return ret;
>
> ret = devm_request_irq(dev, pspim->sla_irq, sp7021_spi_sla_irq,
> IRQF_TRIGGER_RISING, pdev->name, pspim);
> if (ret)
> return ret;
>
> pspim->spi_clk = devm_clk_get(dev, NULL);
> if (IS_ERR(pspim->spi_clk))
> return dev_err_probe(dev, PTR_ERR(pspim->spi_clk), "clk get fail\n");
>
> pspim->rstc = devm_reset_control_get_exclusive(dev, NULL);
> if (IS_ERR(pspim->rstc))
> return dev_err_probe(dev, PTR_ERR(pspim->rstc), "rst get fail\n");
> ret = clk_prepare_enable(pspim->spi_clk);
> if (ret)
> return dev_err_probe(dev, ret, "failed to enable clk\n");
>
> ret = reset_control_deassert(pspim->rstc);
> if (ret) {
> dev_err_probe(dev, ret, "failed to deassert reset\n");
> goto err_free_reset;
> }
These two need to be wrapped as I explained above.
> ret = devm_spi_register_controller(dev, ctlr);
> pm_runtime_enable(dev);
> if (ret) {
> dev_err(dev, "spi_register_master fail\n");
> goto err_disable_pm_runtime;
pm_runtime_disable();
return dev_err_probe();
> }
>
> return ret;
>
> err_disable_pm_runtime:
> pm_runtime_disable(dev);
> err_free_reset:
> reset_control_assert(pspim->rstc);
> clk_disable_unprepare(pspim->spi_clk);
>
> return ret;
> }
>
> static int sp7021_spi_controller_remove(struct platform_device *pdev)
> {
> struct spi_controller *ctlr = dev_get_drvdata(&pdev->dev);
> struct sp7021_spi_ctlr *pspim = spi_master_get_devdata(ctlr);
> spi_unregister_controller(ctlr);
Lukas already explained to you why this is wrong.
> pm_runtime_disable(&pdev->dev);
> pm_runtime_set_suspended(&pdev->dev);
> reset_control_assert(pspim->rstc);
> clk_disable_unprepare(pspim->spi_clk);
This has the same ordering issue as already discussed.
> return 0;
> }
--
With Best Regards,
Andy Shevchenko
