| Message ID | 14377566e449950c19367f75ec1b09724bf0889f.1660572783.git.robin.murphy@arm.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | iommu: retire bus_set_iommu() | expand |
Hi Robin,
I love your patch! Perhaps something to improve:
[auto build test WARNING on v6.0-rc1]
[also build test WARNING on linus/master next-20220815]
[cannot apply to joro-iommu/next krzk/for-next tegra/for-next rockchip/for-next sunxi/sunxi/for-next]
[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/Robin-Murphy/iommu-retire-bus_set_iommu/20220816-002348
base: 568035b01cfb107af8d2e4bd2fb9aea22cf5b868
config: x86_64-buildonly-randconfig-r003-20220815 (https://download.01.org/0day-ci/archive/20220816/202208160803.PS5lvtSV-lkp@intel.com/config)
compiler: gcc-11 (Debian 11.3.0-5) 11.3.0
reproduce (this is a W=1 build):
# https://github.com/intel-lab-lkp/linux/commit/72fa5405b9cf32a9814ca7ed6d5b877cabf83efd
git remote add linux-review https://github.com/intel-lab-lkp/linux
git fetch --no-tags linux-review Robin-Murphy/iommu-retire-bus_set_iommu/20220816-002348
git checkout 72fa5405b9cf32a9814ca7ed6d5b877cabf83efd
# save the config file
mkdir build_dir && cp config build_dir/.config
make W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash drivers/iommu/
If you fix the issue, kindly add following tag where applicable
Reported-by: kernel test robot <lkp@intel.com>
All warnings (new ones prefixed by >>):
>> drivers/iommu/ipmmu-vmsa.c:946:34: warning: 'ipmmu_of_ids' defined but not used [-Wunused-const-variable=]
946 | static const struct of_device_id ipmmu_of_ids[] = {
| ^~~~~~~~~~~~
vim +/ipmmu_of_ids +946 drivers/iommu/ipmmu-vmsa.c
7a62ced8ebd0e1 Yoshihiro Shimoda 2021-09-07 945
33f3ac9b511612 Magnus Damm 2017-10-16 @946 static const struct of_device_id ipmmu_of_ids[] = {
33f3ac9b511612 Magnus Damm 2017-10-16 947 {
33f3ac9b511612 Magnus Damm 2017-10-16 948 .compatible = "renesas,ipmmu-vmsa",
33f3ac9b511612 Magnus Damm 2017-10-16 949 .data = &ipmmu_features_default,
60fb0083c9d43b Fabrizio Castro 2018-08-23 950 }, {
60fb0083c9d43b Fabrizio Castro 2018-08-23 951 .compatible = "renesas,ipmmu-r8a774a1",
60fb0083c9d43b Fabrizio Castro 2018-08-23 952 .data = &ipmmu_features_rcar_gen3,
757f26a3a9ec2c Biju Das 2019-09-27 953 }, {
757f26a3a9ec2c Biju Das 2019-09-27 954 .compatible = "renesas,ipmmu-r8a774b1",
757f26a3a9ec2c Biju Das 2019-09-27 955 .data = &ipmmu_features_rcar_gen3,
b6d39cd82241bf Fabrizio Castro 2018-12-13 956 }, {
b6d39cd82241bf Fabrizio Castro 2018-12-13 957 .compatible = "renesas,ipmmu-r8a774c0",
b6d39cd82241bf Fabrizio Castro 2018-12-13 958 .data = &ipmmu_features_rcar_gen3,
4b2aa7a6f9b793 Marian-Cristian Rotariu 2020-07-14 959 }, {
4b2aa7a6f9b793 Marian-Cristian Rotariu 2020-07-14 960 .compatible = "renesas,ipmmu-r8a774e1",
4b2aa7a6f9b793 Marian-Cristian Rotariu 2020-07-14 961 .data = &ipmmu_features_rcar_gen3,
58b8e8bf409236 Magnus Damm 2017-10-16 962 }, {
58b8e8bf409236 Magnus Damm 2017-10-16 963 .compatible = "renesas,ipmmu-r8a7795",
0b8ac1409641e1 Magnus Damm 2018-06-14 964 .data = &ipmmu_features_rcar_gen3,
0b8ac1409641e1 Magnus Damm 2018-06-14 965 }, {
0b8ac1409641e1 Magnus Damm 2018-06-14 966 .compatible = "renesas,ipmmu-r8a7796",
0b8ac1409641e1 Magnus Damm 2018-06-14 967 .data = &ipmmu_features_rcar_gen3,
17fe1618163980 Yoshihiro Shimoda 2020-06-11 968 }, {
17fe1618163980 Yoshihiro Shimoda 2020-06-11 969 .compatible = "renesas,ipmmu-r8a77961",
17fe1618163980 Yoshihiro Shimoda 2020-06-11 970 .data = &ipmmu_features_rcar_gen3,
98dbffd39a6513 Jacopo Mondi 2018-06-14 971 }, {
98dbffd39a6513 Jacopo Mondi 2018-06-14 972 .compatible = "renesas,ipmmu-r8a77965",
98dbffd39a6513 Jacopo Mondi 2018-06-14 973 .data = &ipmmu_features_rcar_gen3,
3701c123e1c13c Simon Horman 2018-06-14 974 }, {
3701c123e1c13c Simon Horman 2018-06-14 975 .compatible = "renesas,ipmmu-r8a77970",
3701c123e1c13c Simon Horman 2018-06-14 976 .data = &ipmmu_features_rcar_gen3,
1cdeb52e5c245b Nikita Yushchenko 2021-09-23 977 }, {
1cdeb52e5c245b Nikita Yushchenko 2021-09-23 978 .compatible = "renesas,ipmmu-r8a77980",
1cdeb52e5c245b Nikita Yushchenko 2021-09-23 979 .data = &ipmmu_features_rcar_gen3,
b0c32912150565 Hai Nguyen Pham 2018-10-17 980 }, {
b0c32912150565 Hai Nguyen Pham 2018-10-17 981 .compatible = "renesas,ipmmu-r8a77990",
b0c32912150565 Hai Nguyen Pham 2018-10-17 982 .data = &ipmmu_features_rcar_gen3,
3701c123e1c13c Simon Horman 2018-06-14 983 }, {
3701c123e1c13c Simon Horman 2018-06-14 984 .compatible = "renesas,ipmmu-r8a77995",
3701c123e1c13c Simon Horman 2018-06-14 985 .data = &ipmmu_features_rcar_gen3,
7a62ced8ebd0e1 Yoshihiro Shimoda 2021-09-07 986 }, {
7a62ced8ebd0e1 Yoshihiro Shimoda 2021-09-07 987 .compatible = "renesas,ipmmu-r8a779a0",
ae684caf465b7d Yoshihiro Shimoda 2022-02-08 988 .data = &ipmmu_features_rcar_gen4,
ae684caf465b7d Yoshihiro Shimoda 2022-02-08 989 }, {
9f7d09fe23a011 Yoshihiro Shimoda 2022-06-17 990 .compatible = "renesas,rcar-gen4-ipmmu-vmsa",
ae684caf465b7d Yoshihiro Shimoda 2022-02-08 991 .data = &ipmmu_features_rcar_gen4,
33f3ac9b511612 Magnus Damm 2017-10-16 992 }, {
33f3ac9b511612 Magnus Damm 2017-10-16 993 /* Terminator */
33f3ac9b511612 Magnus Damm 2017-10-16 994 },
33f3ac9b511612 Magnus Damm 2017-10-16 995 };
33f3ac9b511612 Magnus Damm 2017-10-16 996
diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c index 1d42084d0276..3b30c0752274 100644 --- a/drivers/iommu/ipmmu-vmsa.c +++ b/drivers/iommu/ipmmu-vmsa.c @@ -1090,11 +1090,6 @@ static int ipmmu_probe(struct platform_device *pdev) ret = iommu_device_register(&mmu->iommu, &ipmmu_ops, &pdev->dev); if (ret) return ret; - -#if defined(CONFIG_IOMMU_DMA) - if (!iommu_present(&platform_bus_type)) - bus_set_iommu(&platform_bus_type, &ipmmu_ops); -#endif } /* @@ -1168,32 +1163,4 @@ static struct platform_driver ipmmu_driver = { .probe = ipmmu_probe, .remove = ipmmu_remove, }; - -static int __init ipmmu_init(void) -{ - struct device_node *np; - static bool setup_done; - int ret; - - if (setup_done) - return 0; - - np = of_find_matching_node(NULL, ipmmu_of_ids); - if (!np) - return 0; - - of_node_put(np); - - ret = platform_driver_register(&ipmmu_driver); - if (ret < 0) - return ret; - -#if defined(CONFIG_ARM) && !defined(CONFIG_IOMMU_DMA) - if (!iommu_present(&platform_bus_type)) - bus_set_iommu(&platform_bus_type, &ipmmu_ops); -#endif - - setup_done = true; - return 0; -} -subsys_initcall(ipmmu_init); +builtin_platform_driver(ipmmu_driver);
Stop calling bus_set_iommu() since it's now unnecessary. This also leaves the custom initcall effectively doing nothing but register the driver, which no longer needs to happen early either, so convert it to builtin_platform_driver(). Signed-off-by: Robin Murphy <robin.murphy@arm.com> --- v4: No change drivers/iommu/ipmmu-vmsa.c | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-)