drivers/spi/spi-mtk-nor.c | 118 ++++++++++++++++++++++---------------- 1 file changed, 68 insertions(+), 50 deletions(-)
From: Cloud Zhang <cloud.zhang@mediatek.com>
The clock used by different platforms is not same. So it is
necessary to modify the clock architecture to be adaptable to more
platforms.
Signed-off-by: Cloud Zhang <cloud.zhang@mediatek.com>
---
drivers/spi/spi-mtk-nor.c | 118 ++++++++++++++++++++++----------------
1 file changed, 68 insertions(+), 50 deletions(-)
diff --git a/drivers/spi/spi-mtk-nor.c b/drivers/spi/spi-mtk-nor.c
index 85ab5ce96c4d..d466a8d3f062 100644
--- a/drivers/spi/spi-mtk-nor.c
+++ b/drivers/spi/spi-mtk-nor.c
@@ -99,6 +99,8 @@
#define CLK_TO_US(sp, clkcnt) DIV_ROUND_UP(clkcnt, sp->spi_freq / 1000000)
+#define MAX_CLOCK_CNT 6
+
struct mtk_nor_caps {
u8 dma_bits;
@@ -110,16 +112,19 @@ struct mtk_nor_caps {
u8 extra_dummy_bit;
};
+struct clk_info {
+ struct clk *clki;
+ const char *name;
+};
+
struct mtk_nor {
struct spi_controller *ctlr;
struct device *dev;
void __iomem *base;
u8 *buffer;
dma_addr_t buffer_dma;
- struct clk *spi_clk;
- struct clk *ctlr_clk;
- struct clk *axi_clk;
- struct clk *axi_s_clk;
+ struct clk_info clocks[MAX_CLOCK_CNT];
+ u8 clock_cnt;
unsigned int spi_freq;
bool wbuf_en;
bool has_irq;
@@ -703,42 +708,74 @@ static int mtk_nor_transfer_one_message(struct spi_controller *host,
static void mtk_nor_disable_clk(struct mtk_nor *sp)
{
- clk_disable_unprepare(sp->spi_clk);
- clk_disable_unprepare(sp->ctlr_clk);
- clk_disable_unprepare(sp->axi_clk);
- clk_disable_unprepare(sp->axi_s_clk);
+ u8 i;
+
+ for (i = 0; i < sp->clock_cnt; i++)
+ clk_disable_unprepare(sp->clocks[i].clki);
}
static int mtk_nor_enable_clk(struct mtk_nor *sp)
{
int ret;
+ u8 i, j;
- ret = clk_prepare_enable(sp->spi_clk);
- if (ret)
- return ret;
+ for (i = 0; i < sp->clock_cnt; i++) {
+ ret = clk_prepare_enable(sp->clocks[i].clki);
+ if (ret) {
+ for (j = 0; j < i; j++)
+ clk_disable_unprepare(sp->clocks[j].clki);
- ret = clk_prepare_enable(sp->ctlr_clk);
- if (ret) {
- clk_disable_unprepare(sp->spi_clk);
- return ret;
+ return ret;
+ }
+
+ if (strcmp(sp->clocks[i].name, "spi"))
+ sp->spi_freq = clk_get_rate(sp->clocks[i].clki);
}
- ret = clk_prepare_enable(sp->axi_clk);
- if (ret) {
- clk_disable_unprepare(sp->spi_clk);
- clk_disable_unprepare(sp->ctlr_clk);
- return ret;
+ return 0;
+}
+
+static int mtk_nor_parse_clk(struct device *dev, struct mtk_nor *sp)
+{
+ struct device_node *np = dev->of_node;
+ int ret;
+ const char *name;
+ u8 cnt, i;
+
+ cnt = of_property_count_strings(np, "clock-names");
+ if (!cnt || (cnt == -EINVAL)) {
+ dev_err(dev, "Unable to find clocks\n");
+ ret = -EINVAL;
+ goto out;
+ } else if (cnt < 0) {
+ dev_err(dev, "Count clock strings failed, err %d\n", cnt);
+ ret = cnt;
+ goto out;
+ } else if (cnt > MAX_CLOCK_CNT) {
+ ret = -EINVAL;
+ goto out;
}
- ret = clk_prepare_enable(sp->axi_s_clk);
- if (ret) {
- clk_disable_unprepare(sp->spi_clk);
- clk_disable_unprepare(sp->ctlr_clk);
- clk_disable_unprepare(sp->axi_clk);
- return ret;
+ sp->clock_cnt = cnt;
+
+ for (i = 0; i < cnt; i++) {
+ ret = of_property_read_string_index(np, "clock-names", i,
+ &name);
+ if (ret) {
+ dev_err(dev, "failed to get clock string\n");
+ return ret;
+ }
+
+ sp->clocks[i].name = name;
+ sp->clocks[i].clki = devm_clk_get(dev, sp->clocks[i].name);
+ if (IS_ERR(sp->clocks[i].clki)) {
+ dev_err(dev, "get clock %s fail\n", sp->clocks[i].name);
+ return PTR_ERR(sp->clocks[i].clki);
+ }
}
- return 0;
+out:
+ return ret;
}
static void mtk_nor_init(struct mtk_nor *sp)
@@ -813,29 +850,12 @@ static int mtk_nor_probe(struct platform_device *pdev)
struct mtk_nor *sp;
struct mtk_nor_caps *caps;
void __iomem *base;
- struct clk *spi_clk, *ctlr_clk, *axi_clk, *axi_s_clk;
int ret, irq;
base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(base))
return PTR_ERR(base);
- spi_clk = devm_clk_get(&pdev->dev, "spi");
- if (IS_ERR(spi_clk))
- return PTR_ERR(spi_clk);
-
- ctlr_clk = devm_clk_get(&pdev->dev, "sf");
- if (IS_ERR(ctlr_clk))
- return PTR_ERR(ctlr_clk);
-
- axi_clk = devm_clk_get_optional(&pdev->dev, "axi");
- if (IS_ERR(axi_clk))
- return PTR_ERR(axi_clk);
-
- axi_s_clk = devm_clk_get_optional(&pdev->dev, "axi_s");
- if (IS_ERR(axi_s_clk))
- return PTR_ERR(axi_s_clk);
-
caps = (struct mtk_nor_caps *)of_device_get_match_data(&pdev->dev);
ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(caps->dma_bits));
@@ -868,10 +888,6 @@ static int mtk_nor_probe(struct platform_device *pdev)
sp->wbuf_en = false;
sp->ctlr = ctlr;
sp->dev = &pdev->dev;
- sp->spi_clk = spi_clk;
- sp->ctlr_clk = ctlr_clk;
- sp->axi_clk = axi_clk;
- sp->axi_s_clk = axi_s_clk;
sp->caps = caps;
sp->high_dma = caps->dma_bits > 32;
sp->buffer = dmam_alloc_coherent(&pdev->dev,
@@ -885,11 +901,13 @@ static int mtk_nor_probe(struct platform_device *pdev)
return -ENOMEM;
}
- ret = mtk_nor_enable_clk(sp);
+ ret = mtk_nor_parse_clk(sp->dev, sp);
if (ret < 0)
return ret;
- sp->spi_freq = clk_get_rate(sp->spi_clk);
+ ret = mtk_nor_enable_clk(sp);
+ if (ret < 0)
+ return ret;
mtk_nor_init(sp);
--
2.46.0Hi mtk22730,
kernel test robot noticed the following build warnings:
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/mtk22730/spi-spi-mtk-nor-Modify-the-clock-architecture-of-nor-controller/20241212-172704
base: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next
patch link: https://lore.kernel.org/r/20241212092206.14071-1-Cloud.Zhang%40mediatek.com
patch subject: [PATCH] [v1] spi: spi-mtk-nor: Modify the clock architecture of nor controller
config: parisc-randconfig-r073-20241223 (https://download.01.org/0day-ci/archive/20241223/202412232136.cWvRuwoD-lkp@intel.com/config)
compiler: hppa-linux-gcc (GCC) 14.2.0
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Reported-by: Dan Carpenter <dan.carpenter@linaro.org>
| Closes: https://lore.kernel.org/r/202412232136.cWvRuwoD-lkp@intel.com/
smatch warnings:
drivers/spi/spi-mtk-nor.c:746 mtk_nor_parse_clk() warn: impossible condition '(cnt == -22) => (1-255 == (-22))'
vim +746 drivers/spi/spi-mtk-nor.c
87d65a23444841 Cloud Zhang 2024-12-12 738 static int mtk_nor_parse_clk(struct device *dev, struct mtk_nor *sp)
87d65a23444841 Cloud Zhang 2024-12-12 739 {
87d65a23444841 Cloud Zhang 2024-12-12 740 struct device_node *np = dev->of_node;
87d65a23444841 Cloud Zhang 2024-12-12 741 int ret;
87d65a23444841 Cloud Zhang 2024-12-12 742 const char *name;
87d65a23444841 Cloud Zhang 2024-12-12 743 u8 cnt, i;
^^^^^^
87d65a23444841 Cloud Zhang 2024-12-12 744
87d65a23444841 Cloud Zhang 2024-12-12 745 cnt = of_property_count_strings(np, "clock-names");
87d65a23444841 Cloud Zhang 2024-12-12 @746 if (!cnt || (cnt == -EINVAL)) {
^^^^^^^^^^^^^^
cnt needs to be declared as an int.
87d65a23444841 Cloud Zhang 2024-12-12 747 dev_err(dev, "Unable to find clocks\n");
87d65a23444841 Cloud Zhang 2024-12-12 748 ret = -EINVAL;
87d65a23444841 Cloud Zhang 2024-12-12 749 goto out;
87d65a23444841 Cloud Zhang 2024-12-12 750 } else if (cnt < 0) {
^^^^^^^
It's weird that this doesn't trigger a warning.
87d65a23444841 Cloud Zhang 2024-12-12 751 dev_err(dev, "Count clock strings failed, err %d\n", cnt);
87d65a23444841 Cloud Zhang 2024-12-12 752 ret = cnt;
87d65a23444841 Cloud Zhang 2024-12-12 753 goto out;
87d65a23444841 Cloud Zhang 2024-12-12 754 } else if (cnt > MAX_CLOCK_CNT) {
87d65a23444841 Cloud Zhang 2024-12-12 755 ret = -EINVAL;
87d65a23444841 Cloud Zhang 2024-12-12 756 goto out;
87d65a23444841 Cloud Zhang 2024-12-12 757 }
87d65a23444841 Cloud Zhang 2024-12-12 758
87d65a23444841 Cloud Zhang 2024-12-12 759 sp->clock_cnt = cnt;
87d65a23444841 Cloud Zhang 2024-12-12 760
87d65a23444841 Cloud Zhang 2024-12-12 761 for (i = 0; i < cnt; i++) {
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
Hi mtk22730,
kernel test robot noticed the following build warnings:
[auto build test WARNING on broonie-spi/for-next]
[also build test WARNING on linus/master v6.13-rc3 next-20241220]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/mtk22730/spi-spi-mtk-nor-Modify-the-clock-architecture-of-nor-controller/20241212-172704
base: https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git for-next
patch link: https://lore.kernel.org/r/20241212092206.14071-1-Cloud.Zhang%40mediatek.com
patch subject: [PATCH] [v1] spi: spi-mtk-nor: Modify the clock architecture of nor controller
config: um-randconfig-002-20241220 (https://download.01.org/0day-ci/archive/20241221/202412210247.Brq06CHb-lkp@intel.com/config)
compiler: clang version 20.0.0git (https://github.com/llvm/llvm-project 9daf10ff8f29ba3a88a105aaa9d2379c21b77d35)
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20241221/202412210247.Brq06CHb-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202412210247.Brq06CHb-lkp@intel.com/
All warnings (new ones prefixed by >>):
In file included from drivers/spi/spi-mtk-nor.c:10:
In file included from include/linux/dma-mapping.h:8:
In file included from include/linux/scatterlist.h:8:
In file included from include/linux/mm.h:2223:
include/linux/vmstat.h:518:36: warning: arithmetic between different enumeration types ('enum node_stat_item' and 'enum lru_list') [-Wenum-enum-conversion]
518 | return node_stat_name(NR_LRU_BASE + lru) + 3; // skip "nr_"
| ~~~~~~~~~~~ ^ ~~~
In file included from drivers/spi/spi-mtk-nor.c:10:
In file included from include/linux/dma-mapping.h:8:
In file included from include/linux/scatterlist.h:9:
In file included from arch/um/include/asm/io.h:24:
include/asm-generic/io.h:549:31: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
549 | val = __raw_readb(PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:567:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
567 | val = __le16_to_cpu((__le16 __force)__raw_readw(PCI_IOBASE + addr));
| ~~~~~~~~~~ ^
include/uapi/linux/byteorder/little_endian.h:37:51: note: expanded from macro '__le16_to_cpu'
37 | #define __le16_to_cpu(x) ((__force __u16)(__le16)(x))
| ^
In file included from drivers/spi/spi-mtk-nor.c:10:
In file included from include/linux/dma-mapping.h:8:
In file included from include/linux/scatterlist.h:9:
In file included from arch/um/include/asm/io.h:24:
include/asm-generic/io.h:585:61: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
585 | val = __le32_to_cpu((__le32 __force)__raw_readl(PCI_IOBASE + addr));
| ~~~~~~~~~~ ^
include/uapi/linux/byteorder/little_endian.h:35:51: note: expanded from macro '__le32_to_cpu'
35 | #define __le32_to_cpu(x) ((__force __u32)(__le32)(x))
| ^
In file included from drivers/spi/spi-mtk-nor.c:10:
In file included from include/linux/dma-mapping.h:8:
In file included from include/linux/scatterlist.h:9:
In file included from arch/um/include/asm/io.h:24:
include/asm-generic/io.h:601:33: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
601 | __raw_writeb(value, PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:616:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
616 | __raw_writew((u16 __force)cpu_to_le16(value), PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:631:59: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
631 | __raw_writel((u32 __force)cpu_to_le32(value), PCI_IOBASE + addr);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:724:20: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
724 | readsb(PCI_IOBASE + addr, buffer, count);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:737:20: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
737 | readsw(PCI_IOBASE + addr, buffer, count);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:750:20: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
750 | readsl(PCI_IOBASE + addr, buffer, count);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:764:21: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
764 | writesb(PCI_IOBASE + addr, buffer, count);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:778:21: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
778 | writesw(PCI_IOBASE + addr, buffer, count);
| ~~~~~~~~~~ ^
include/asm-generic/io.h:792:21: warning: performing pointer arithmetic on a null pointer has undefined behavior [-Wnull-pointer-arithmetic]
792 | writesl(PCI_IOBASE + addr, buffer, count);
| ~~~~~~~~~~ ^
>> drivers/spi/spi-mtk-nor.c:746:19: warning: result of comparison of constant -22 with expression of type 'u8' (aka 'unsigned char') is always false [-Wtautological-constant-out-of-range-compare]
746 | if (!cnt || (cnt == -EINVAL)) {
| ~~~ ^ ~~~~~~~
14 warnings generated.
vim +746 drivers/spi/spi-mtk-nor.c
737
738 static int mtk_nor_parse_clk(struct device *dev, struct mtk_nor *sp)
739 {
740 struct device_node *np = dev->of_node;
741 int ret;
742 const char *name;
743 u8 cnt, i;
744
745 cnt = of_property_count_strings(np, "clock-names");
> 746 if (!cnt || (cnt == -EINVAL)) {
747 dev_err(dev, "Unable to find clocks\n");
748 ret = -EINVAL;
749 goto out;
750 } else if (cnt < 0) {
751 dev_err(dev, "Count clock strings failed, err %d\n", cnt);
752 ret = cnt;
753 goto out;
754 } else if (cnt > MAX_CLOCK_CNT) {
755 ret = -EINVAL;
756 goto out;
757 }
758
759 sp->clock_cnt = cnt;
760
761 for (i = 0; i < cnt; i++) {
762 ret = of_property_read_string_index(np, "clock-names", i,
763 &name);
764 if (ret) {
765 dev_err(dev, "failed to get clock string\n");
766 return ret;
767 }
768
769 sp->clocks[i].name = name;
770 sp->clocks[i].clki = devm_clk_get(dev, sp->clocks[i].name);
771 if (IS_ERR(sp->clocks[i].clki)) {
772 dev_err(dev, "get clock %s fail\n", sp->clocks[i].name);
773 return PTR_ERR(sp->clocks[i].clki);
774 }
775 }
776
777 out:
778 return ret;
779 }
780
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
© 2016 - 2025 Red Hat, Inc.