spi: qspi: Add Phytium spi/qspi controller support #136

yuanxia0927 · 2024-05-14T01:09:58Z

These patches have added support for Phytium spi/qspi controllers and their related functions.

Add binding documentation for Phytium SPI controller. Signed-off-by: yuanxia <yuanxia2073@phytium.com.cn> Signed-off-by: Chen Baozi <chenbaozi@phytium.com.cn> Signed-off-by: Wang Yinfeng <wangyinfeng@phytium.com.cn>

Add support for the Phytium SPI controller driver. Signed-off-by: yuanxia <yuanxia2073@phytium.com.cn> Signed-off-by: Zhang Yiqun <zhangyiqun@phytium.com.cn> Signed-off-by: Peng Min <pengmin1540@phytium.com.cn> Signed-off-by: Chen Baozi <chenbaozi@phytium.com.cn> Signed-off-by: Wang Yinfeng <wangyinfeng@phytium.com.cn>

Add the device tree binding documentation for Phytium QuadSPI controller. Signed-off-by: yuanxia <yuanxia2073@phytium.com.cn> Signed-off-by: Chen Baozi <chenbaozi@phytium.com.cn> Signed-off-by: Wang Yinfeng <wangyinfeng@phytium.com.cn>

This patch adds a new driver for Phytium QuadSPI (QSPI) controller, which is used to access NOR Flash memory slaves. The driver implements spi-mem framework and does not support generic SPI operations. Signed-off-by: yuanxia <yuanxia2073@phytium.com.cn> Signed-off-by: Zhou Yulin <zhouyulin1283@phytium.com.cn> Signed-off-by: Chen Baozi <chenbaozi@phytium.com.cn> Signed-off-by: Wang Yinfeng <wangyinfeng@phytium.com.cn>

The driver used devm_spi_register_controller() on bind. Therefore, __device_release_driver() first invokes phytium_spi_remove_host() before unregistering the SPI controller via devres_release_all() when unbinding. Since phytium_spi_remove_host() shuts down the chip, rendering the SPI bus inaccessible even through the SPI controller is still registered. When the SPI controller is subsequently unregistered, it unbinds all its slave devices. Because their drivers cannot access the SPI bus, the slave devices may be left in an improper state. Signed-off-by: yuanxia <yuanxia2073@phytium.com.cn> Signed-off-by: Chen Baozi <chenbaozi@phytium.com.cn> Signed-off-by: Wang Yinfeng <wangyinfeng@phytium.com.cn>

Since the platform driver wraps the core phytium_spi into phytium_spi_clk struct to include a platform clock, the pointer extract from driver_data should also be 'struct phytium_spi_clk *'. Signed-off-by: yuanxia <yuanxia2073@phytium.com.cn> Reported-by: Zhou Yulin <zhouyulin1283@phytium.com.cn> Signed-off-by: Chen Baozi <chenbaozi@phytium.com.cn> Signed-off-by: Wang Yinfeng <wangyinfeng@phytium.com.cn>

The mask of sck_sel should be 0x7 instead of 0x3, otherwise the split is set differently than expected. Signed-off-by: yuanxia <yuanxia2073@phytium.com.cn> Signed-off-by: Liu Tianyu <liutianyu1250@phytium.com.cn> Signed-off-by: Li Mingzhe <limingzhe1839@phytium.com.cn> Signed-off-by: Wang Yinfeng <wangyinfeng@phytium.com.cn>

Code has been modified and added in the SPI driver section to adapt to the DDMA controller. Signed-off-by: yuanxia <yuanxia2073@phytium.com.cn> Signed-off-by: Liu Tianyu <liutianyu1250@phytium.com.cn> Signed-off-by: Wang Hanmo <wanghanmo2242@phytium.com.cn> Signed-off-by: Wang Yinfeng <wangyinfeng@phytium.com.cn>

deepin-ci-robot · 2024-05-14T01:10:18Z

Hi @yuanxia0927. Thanks for your PR.

I'm waiting for a deepin-community member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

deepin-ci-robot · 2024-05-14T01:10:29Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign tsic404 for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these files:

https:/raw.githubusercontent.com/deepin-community/template-repository/master/debian/deepin/OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

drivers/mtd/mtdcore.c

drivers/mtd/mtdpart.c

drivers/spi/Makefile

opsiff · 2024-05-14T05:59:22Z

drivers/mtd/parsers/Kconfig

+config MTD_ACPI_PARTS
+	tristate "ACPI partitioning parser"
+	default y
+	depends on ACPI


default y?
这个在非飞腾架构上有用么? 建议添加上depends on ARCH_PHYTIUM || COMPILE_TEST

好的，这个我会更改一下

opsiff · 2024-05-14T06:03:16Z

drivers/mtd/spi-nor/core.c

 	nor->spimem = spimem;
 	nor->dev = &spi->dev;
 	spi_nor_set_flash_node(nor, spi->dev.of_node);
+	adev = ACPI_COMPANION(nor->dev);


这个adev有什么用? 其后也未使用adev。

这里加入adev是为了方便后续在acpi模式进行开发，能方便使用acpi函数操作adev结构体。但是该补丁里面没使用acpi的函数

这个为了后续开发方便，还是进行保留

opsiff · 2024-05-14T06:08:36Z

drivers/mtd/mtdpart.c

+	struct device *dev = &master->dev;
+
+	if (has_acpi_companion(dev))
+		adev = ACPI_COMPANION(dev);


这个adev也没用吧?

opsiff · 2024-05-14T10:14:45Z

/ok-to-test

drivers/spi/Kconfig

Add acpi table support for qspi/spi driver, supporting parsing of ACPI tables. Signed-off-by: yuanxia <yuanxia2073@phytium.com.cn> Signed-off-by: Wang Hanmo <wanghanmo2242@phytium.com.cn> Signed-off-by: Wang Yinfeng <wangyinfeng@phytium.com.cn>

deepin-ci-robot · 2024-05-21T08:18:35Z

deepin pr auto review

Make the patch apply cleanly.

zccrs · 2024-06-04T08:36:10Z

@yuanxia0927 请问您是 Phytium 的员工吗?我看您没有在 https://github.com/deepin-community/SIG/blob/master/corporation/Phytium/metadata.yml 人员列表里，麻烦联系 chenbaozi-ft 提交一个 PR，把您加到 https://github.com/deepin-community/SIG/blob/master/corporation/Phytium/metadata.yml 中，这样您的贡献才能在 https://www.deepin.org/index/datastat/t/Phytium?id=corporate-contributor-phytium 中展示。

Add binding documentation for Phytium SPI controller. Signed-off-by: yuanxia <yuanxia2073@phytium.com.cn> Signed-off-by: Chen Baozi <chenbaozi@phytium.com.cn> Signed-off-by: Wang Yinfeng <wangyinfeng@phytium.com.cn> Link: #136 (cherry picked from commit 23b8ee8) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>

Add support for the Phytium SPI controller driver. Signed-off-by: yuanxia <yuanxia2073@phytium.com.cn> Signed-off-by: Zhang Yiqun <zhangyiqun@phytium.com.cn> Signed-off-by: Peng Min <pengmin1540@phytium.com.cn> Signed-off-by: Chen Baozi <chenbaozi@phytium.com.cn> Signed-off-by: Wang Yinfeng <wangyinfeng@phytium.com.cn> Link: #136 [ Wentao Guan: rename spi_controller_get_devdata from spi_master_get_devdata,struct spi_controller from struct spi_master ] [ Wentao Guan: XXXX ] (cherry picked from commit 27b76db) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>

Add the device tree binding documentation for Phytium QuadSPI controller. Signed-off-by: yuanxia <yuanxia2073@phytium.com.cn> Signed-off-by: Chen Baozi <chenbaozi@phytium.com.cn> Signed-off-by: Wang Yinfeng <wangyinfeng@phytium.com.cn> Link: #136 (cherry picked from commit 9d11018) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>

This patch adds a new driver for Phytium QuadSPI (QSPI) controller, which is used to access NOR Flash memory slaves. The driver implements spi-mem framework and does not support generic SPI operations. Signed-off-by: yuanxia <yuanxia2073@phytium.com.cn> Signed-off-by: Zhou Yulin <zhouyulin1283@phytium.com.cn> Signed-off-by: Chen Baozi <chenbaozi@phytium.com.cn> Signed-off-by: Wang Yinfeng <wangyinfeng@phytium.com.cn> Link: #136 [ Wentao Guan: for v6.18 ] [ Wentao Guan: XXXX ] (cherry picked from commit 68716d1) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>

The driver used devm_spi_register_controller() on bind. Therefore, __device_release_driver() first invokes phytium_spi_remove_host() before unregistering the SPI controller via devres_release_all() when unbinding. Since phytium_spi_remove_host() shuts down the chip, rendering the SPI bus inaccessible even through the SPI controller is still registered. When the SPI controller is subsequently unregistered, it unbinds all its slave devices. Because their drivers cannot access the SPI bus, the slave devices may be left in an improper state. Signed-off-by: yuanxia <yuanxia2073@phytium.com.cn> Signed-off-by: Chen Baozi <chenbaozi@phytium.com.cn> Signed-off-by: Wang Yinfeng <wangyinfeng@phytium.com.cn> (cherry picked from commit d4126ea) Link: #136 [ Wentao Guan: XXXX ] Signed-off-by: Wentao Guan <guanwentao@uniontech.com> Conflicts: drivers/spi/spi-phytium.c

Since the platform driver wraps the core phytium_spi into phytium_spi_clk struct to include a platform clock, the pointer extract from driver_data should also be 'struct phytium_spi_clk *'. Signed-off-by: yuanxia <yuanxia2073@phytium.com.cn> Reported-by: Zhou Yulin <zhouyulin1283@phytium.com.cn> Signed-off-by: Chen Baozi <chenbaozi@phytium.com.cn> Signed-off-by: Wang Yinfeng <wangyinfeng@phytium.com.cn> Link: #136 [ Wentao Guan: XXXX ] (cherry picked from commit 7587a36) Signed-off-by: Wentao Guan <guanwentao@uniontech.com> Conflicts: drivers/spi/spi-phytium-plat.c

The mask of sck_sel should be 0x7 instead of 0x3, otherwise the split is set differently than expected. Signed-off-by: yuanxia <yuanxia2073@phytium.com.cn> Signed-off-by: Liu Tianyu <liutianyu1250@phytium.com.cn> Signed-off-by: Li Mingzhe <limingzhe1839@phytium.com.cn> Signed-off-by: Wang Yinfeng <wangyinfeng@phytium.com.cn> Link: #136 (cherry picked from commit a5a55d4) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>

Code has been modified and added in the SPI driver section to adapt to the DDMA controller. Signed-off-by: yuanxia <yuanxia2073@phytium.com.cn> Signed-off-by: Liu Tianyu <liutianyu1250@phytium.com.cn> Signed-off-by: Wang Hanmo <wanghanmo2242@phytium.com.cn> Signed-off-by: Wang Yinfeng <wangyinfeng@phytium.com.cn> Link: #136 [ Wentao Guan: by e289df8 ("spi: Rework per message DMA mapped flag to be per transfer") ] (cherry picked from commit de1e289) Signed-off-by: Wentao Guan <guanwentao@uniontech.com>

Add acpi table support for qspi/spi driver, supporting parsing of ACPI tables. Signed-off-by: yuanxia <yuanxia2073@phytium.com.cn> Signed-off-by: Wang Hanmo <wanghanmo2242@phytium.com.cn> Signed-off-by: Wang Yinfeng <wangyinfeng@phytium.com.cn> Link: #136 (cherry picked from commit 8b02928) Signed-off-by: Wentao Guan <guanwentao@uniontech.com> Conflicts: drivers/mtd/spi-nor/core.c

yuanxia added 8 commits May 13, 2024 18:01

dt-bindings: spi: phyhtium: add bindings for Phytium SPI

44280fb

Add binding documentation for Phytium SPI controller. Signed-off-by: yuanxia <yuanxia2073@phytium.com.cn> Signed-off-by: Chen Baozi <chenbaozi@phytium.com.cn> Signed-off-by: Wang Yinfeng <wangyinfeng@phytium.com.cn>

deepin-ci-robot added the needs-ok-to-test label May 14, 2024

deepin-ci-robot requested review from chenchongbiao and justforlxz May 14, 2024 01:10

opsiff reviewed May 14, 2024

View reviewed changes

deepin-ci-robot added ok-to-test and removed needs-ok-to-test labels May 14, 2024

opsiff reviewed May 14, 2024

View reviewed changes

drivers/spi/Kconfig Show resolved Hide resolved

Avenger-285714 reviewed May 14, 2024

View reviewed changes

drivers/spi/Kconfig Show resolved Hide resolved

opsiff merged commit 1b5f3e9 into deepin-community:linux-6.6.y May 24, 2024

MingcongBai mentioned this pull request May 27, 2024

(kernel-rolling) spi: qspi: Add Phytium spi/qspi controller support #210

Closed

3 tasks

MingcongBai mentioned this pull request Jun 26, 2024

【跟踪】 6.9 系列合并 6.6 补丁情况一览 deepin-community/kernel-rolling#1

Closed

MingcongBai mentioned this pull request Aug 20, 2024

【跟踪】 6.10 系列合并 6.6 补丁情况一览 deepin-community/kernel-rolling#10

Closed

MingcongBai mentioned this pull request Nov 12, 2024

【跟踪】6.12 系列合并 6.6 补丁情况一览 deepin-community/kernel-rolling#11

Open

spi: qspi: Add Phytium spi/qspi controller support #136

spi: qspi: Add Phytium spi/qspi controller support #136

Uh oh!

Conversation

yuanxia0927 commented May 14, 2024

Uh oh!

deepin-ci-robot commented May 14, 2024

Uh oh!

deepin-ci-robot commented May 14, 2024

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

opsiff May 14, 2024

Choose a reason for hiding this comment

Uh oh!

eww0216 May 14, 2024

Choose a reason for hiding this comment

Uh oh!

opsiff May 14, 2024

Choose a reason for hiding this comment

Uh oh!

eww0216 May 14, 2024

Choose a reason for hiding this comment

Uh oh!

yuanxia0927 May 14, 2024

Choose a reason for hiding this comment

Uh oh!

opsiff May 14, 2024

Choose a reason for hiding this comment

Uh oh!

opsiff commented May 14, 2024

Uh oh!

Uh oh!

Uh oh!

deepin-ci-robot commented May 21, 2024

deepin pr auto review

Uh oh!

zccrs commented Jun 4, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants