Message ID | 20231010122321.823-2-aladyshev22@gmail.com |
---|---|
State | Handled Elsewhere, archived |
Headers | show |
Series | Add MCTP-over-KCS transport binding | expand |
On Tue, 10 Oct 2023 15:23:19 +0300 Konstantin Aladyshev <aladyshev22@gmail.com> wrote: > The current KCS header files can be utilized by both IPMI drivers > (drivers/char/ipmi) and MCTP driver (drivers/net/mctp). To be able to > use them in both cases move the headers to 'include/linux' folder. > > Signed-off-by: Konstantin Aladyshev <aladyshev22@gmail.com> Not particularly important but I wonder if include/linux/kcs/bmc.h include/linux/kcs/bmc_client.h include/linux/kcs/bmc_device.h might be a cleaner choice given that you are moving them. I don't care that much though so up to you :) Jonathan > --- > drivers/char/ipmi/kcs_bmc.c | 8 +++----- > drivers/char/ipmi/kcs_bmc_aspeed.c | 3 +-- > drivers/char/ipmi/kcs_bmc_cdev_ipmi.c | 2 +- > drivers/char/ipmi/kcs_bmc_npcm7xx.c | 2 +- > drivers/char/ipmi/kcs_bmc_serio.c | 2 +- > {drivers/char/ipmi => include/linux}/kcs_bmc.h | 0 > {drivers/char/ipmi => include/linux}/kcs_bmc_client.h | 3 +-- > {drivers/char/ipmi => include/linux}/kcs_bmc_device.h | 3 +-- > 8 files changed, 9 insertions(+), 14 deletions(-) > rename {drivers/char/ipmi => include/linux}/kcs_bmc.h (100%) > rename {drivers/char/ipmi => include/linux}/kcs_bmc_client.h (97%) > rename {drivers/char/ipmi => include/linux}/kcs_bmc_device.h (96%) > > diff --git a/drivers/char/ipmi/kcs_bmc.c b/drivers/char/ipmi/kcs_bmc.c > index 8b1161d5194a..d29a8505d6ed 100644 > --- a/drivers/char/ipmi/kcs_bmc.c > +++ b/drivers/char/ipmi/kcs_bmc.c > @@ -5,15 +5,13 @@ > */ > > #include <linux/device.h> > +#include <linux/kcs_bmc.h> > +#include <linux/kcs_bmc_client.h> > +#include <linux/kcs_bmc_device.h> > #include <linux/list.h> > #include <linux/module.h> > #include <linux/mutex.h> > > -#include "kcs_bmc.h" > - > -/* Implement both the device and client interfaces here */ > -#include "kcs_bmc_device.h" > -#include "kcs_bmc_client.h" > > /* Record registered devices and drivers */ > static DEFINE_MUTEX(kcs_bmc_lock); > diff --git a/drivers/char/ipmi/kcs_bmc_aspeed.c b/drivers/char/ipmi/kcs_bmc_aspeed.c > index 72640da55380..3dc0dfb448f5 100644 > --- a/drivers/char/ipmi/kcs_bmc_aspeed.c > +++ b/drivers/char/ipmi/kcs_bmc_aspeed.c > @@ -10,6 +10,7 @@ > #include <linux/interrupt.h> > #include <linux/io.h> > #include <linux/irq.h> > +#include <linux/kcs_bmc_device.h> > #include <linux/mfd/syscon.h> > #include <linux/module.h> > #include <linux/of.h> > @@ -21,8 +22,6 @@ > #include <linux/slab.h> > #include <linux/timer.h> > > -#include "kcs_bmc_device.h" > - > > #define DEVICE_NAME "ast-kcs-bmc" > > diff --git a/drivers/char/ipmi/kcs_bmc_cdev_ipmi.c b/drivers/char/ipmi/kcs_bmc_cdev_ipmi.c > index cf670e891966..bf1001130a6c 100644 > --- a/drivers/char/ipmi/kcs_bmc_cdev_ipmi.c > +++ b/drivers/char/ipmi/kcs_bmc_cdev_ipmi.c > @@ -8,6 +8,7 @@ > #include <linux/errno.h> > #include <linux/io.h> > #include <linux/ipmi_bmc.h> > +#include <linux/kcs_bmc_client.h> > #include <linux/list.h> > #include <linux/miscdevice.h> > #include <linux/module.h> > @@ -17,7 +18,6 @@ > #include <linux/sched.h> > #include <linux/slab.h> > > -#include "kcs_bmc_client.h" > > /* Different phases of the KCS BMC module. > * KCS_PHASE_IDLE: > diff --git a/drivers/char/ipmi/kcs_bmc_npcm7xx.c b/drivers/char/ipmi/kcs_bmc_npcm7xx.c > index 7961fec56476..160553248a93 100644 > --- a/drivers/char/ipmi/kcs_bmc_npcm7xx.c > +++ b/drivers/char/ipmi/kcs_bmc_npcm7xx.c > @@ -10,6 +10,7 @@ > #include <linux/errno.h> > #include <linux/interrupt.h> > #include <linux/io.h> > +#include <linux/kcs_bmc_device.h> > #include <linux/mfd/syscon.h> > #include <linux/module.h> > #include <linux/of.h> > @@ -17,7 +18,6 @@ > #include <linux/regmap.h> > #include <linux/slab.h> > > -#include "kcs_bmc_device.h" > > #define DEVICE_NAME "npcm-kcs-bmc" > #define KCS_CHANNEL_MAX 3 > diff --git a/drivers/char/ipmi/kcs_bmc_serio.c b/drivers/char/ipmi/kcs_bmc_serio.c > index 1793358be782..24df7144a189 100644 > --- a/drivers/char/ipmi/kcs_bmc_serio.c > +++ b/drivers/char/ipmi/kcs_bmc_serio.c > @@ -5,12 +5,12 @@ > #include <linux/device.h> > #include <linux/errno.h> > #include <linux/list.h> > +#include <linux/kcs_bmc_client.h> > #include <linux/module.h> > #include <linux/sched/signal.h> > #include <linux/serio.h> > #include <linux/slab.h> > > -#include "kcs_bmc_client.h" > > struct kcs_bmc_serio { > struct list_head entry; > diff --git a/drivers/char/ipmi/kcs_bmc.h b/include/linux/kcs_bmc.h > similarity index 100% > rename from drivers/char/ipmi/kcs_bmc.h > rename to include/linux/kcs_bmc.h > diff --git a/drivers/char/ipmi/kcs_bmc_client.h b/include/linux/kcs_bmc_client.h > similarity index 97% > rename from drivers/char/ipmi/kcs_bmc_client.h > rename to include/linux/kcs_bmc_client.h > index 6fdcde0a7169..f6350c9366dd 100644 > --- a/drivers/char/ipmi/kcs_bmc_client.h > +++ b/include/linux/kcs_bmc_client.h > @@ -5,8 +5,7 @@ > #define __KCS_BMC_CONSUMER_H__ > > #include <linux/irqreturn.h> > - > -#include "kcs_bmc.h" > +#include <linux/kcs_bmc.h> > > struct kcs_bmc_driver_ops { > int (*add_device)(struct kcs_bmc_device *kcs_bmc); > diff --git a/drivers/char/ipmi/kcs_bmc_device.h b/include/linux/kcs_bmc_device.h > similarity index 96% > rename from drivers/char/ipmi/kcs_bmc_device.h > rename to include/linux/kcs_bmc_device.h > index 17c572f25c54..65333b68c0af 100644 > --- a/drivers/char/ipmi/kcs_bmc_device.h > +++ b/include/linux/kcs_bmc_device.h > @@ -5,8 +5,7 @@ > #define __KCS_BMC_DEVICE_H__ > > #include <linux/irqreturn.h> > - > -#include "kcs_bmc.h" > +#include <linux/kcs_bmc.h> > > struct kcs_bmc_device_ops { > void (*irq_mask_update)(struct kcs_bmc_device *kcs_bmc, u8 mask, u8 enable);
Hi Konstantin,
kernel test robot noticed the following build errors:
[auto build test ERROR on cminyard-ipmi/for-next]
[also build test ERROR on linus/master v6.6-rc6 next-20231020]
[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/Konstantin-Aladyshev/ipmi-Move-KCS-headers-to-common-include-folder/20231010-202425
base: https://github.com/cminyard/linux-ipmi for-next
patch link: https://lore.kernel.org/r/20231010122321.823-2-aladyshev22%40gmail.com
patch subject: [PATCH v5 1/3] ipmi: Move KCS headers to common include folder
config: mips-allmodconfig (https://download.01.org/0day-ci/archive/20231022/202310220806.BmOW2atE-lkp@intel.com/config)
compiler: mips-linux-gcc (GCC) 13.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231022/202310220806.BmOW2atE-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/202310220806.BmOW2atE-lkp@intel.com/
All errors (new ones prefixed by >>):
In file included from include/linux/kcs_bmc_client.h:8,
from drivers/char/ipmi/kcs_bmc_cdev_ipmi.c:11:
>> include/linux/kcs_bmc.h:42:9: error: unknown type name 'spinlock_t'
42 | spinlock_t lock;
| ^~~~~~~~~~
vim +/spinlock_t +42 include/linux/kcs_bmc.h
faae6e391eda73 drivers/char/ipmi/kcs_bmc.h Andrew Jeffery 2021-06-08 31
d4e7ac68f771ad drivers/char/ipmi/kcs_bmc.h Andrew Jeffery 2021-06-08 32 struct kcs_bmc_device {
d4e7ac68f771ad drivers/char/ipmi/kcs_bmc.h Andrew Jeffery 2021-06-08 33 struct list_head entry;
20d60f61c58e8c drivers/char/ipmi/kcs_bmc.h Haiyue Wang 2018-02-02 34
d4e7ac68f771ad drivers/char/ipmi/kcs_bmc.h Andrew Jeffery 2021-06-08 35 struct device *dev;
20d60f61c58e8c drivers/char/ipmi/kcs_bmc.h Haiyue Wang 2018-02-02 36 u32 channel;
20d60f61c58e8c drivers/char/ipmi/kcs_bmc.h Haiyue Wang 2018-02-02 37
20d60f61c58e8c drivers/char/ipmi/kcs_bmc.h Haiyue Wang 2018-02-02 38 struct kcs_ioreg ioreg;
20d60f61c58e8c drivers/char/ipmi/kcs_bmc.h Haiyue Wang 2018-02-02 39
d4e7ac68f771ad drivers/char/ipmi/kcs_bmc.h Andrew Jeffery 2021-06-08 40 const struct kcs_bmc_device_ops *ops;
20d60f61c58e8c drivers/char/ipmi/kcs_bmc.h Haiyue Wang 2018-02-02 41
d4e7ac68f771ad drivers/char/ipmi/kcs_bmc.h Andrew Jeffery 2021-06-08 @42 spinlock_t lock;
d4e7ac68f771ad drivers/char/ipmi/kcs_bmc.h Andrew Jeffery 2021-06-08 43 struct kcs_bmc_client *client;
20d60f61c58e8c drivers/char/ipmi/kcs_bmc.h Haiyue Wang 2018-02-02 44 };
d4e7ac68f771ad drivers/char/ipmi/kcs_bmc.h Andrew Jeffery 2021-06-08 45
diff --git a/drivers/char/ipmi/kcs_bmc.c b/drivers/char/ipmi/kcs_bmc.c index 8b1161d5194a..d29a8505d6ed 100644 --- a/drivers/char/ipmi/kcs_bmc.c +++ b/drivers/char/ipmi/kcs_bmc.c @@ -5,15 +5,13 @@ */ #include <linux/device.h> +#include <linux/kcs_bmc.h> +#include <linux/kcs_bmc_client.h> +#include <linux/kcs_bmc_device.h> #include <linux/list.h> #include <linux/module.h> #include <linux/mutex.h> -#include "kcs_bmc.h" - -/* Implement both the device and client interfaces here */ -#include "kcs_bmc_device.h" -#include "kcs_bmc_client.h" /* Record registered devices and drivers */ static DEFINE_MUTEX(kcs_bmc_lock); diff --git a/drivers/char/ipmi/kcs_bmc_aspeed.c b/drivers/char/ipmi/kcs_bmc_aspeed.c index 72640da55380..3dc0dfb448f5 100644 --- a/drivers/char/ipmi/kcs_bmc_aspeed.c +++ b/drivers/char/ipmi/kcs_bmc_aspeed.c @@ -10,6 +10,7 @@ #include <linux/interrupt.h> #include <linux/io.h> #include <linux/irq.h> +#include <linux/kcs_bmc_device.h> #include <linux/mfd/syscon.h> #include <linux/module.h> #include <linux/of.h> @@ -21,8 +22,6 @@ #include <linux/slab.h> #include <linux/timer.h> -#include "kcs_bmc_device.h" - #define DEVICE_NAME "ast-kcs-bmc" diff --git a/drivers/char/ipmi/kcs_bmc_cdev_ipmi.c b/drivers/char/ipmi/kcs_bmc_cdev_ipmi.c index cf670e891966..bf1001130a6c 100644 --- a/drivers/char/ipmi/kcs_bmc_cdev_ipmi.c +++ b/drivers/char/ipmi/kcs_bmc_cdev_ipmi.c @@ -8,6 +8,7 @@ #include <linux/errno.h> #include <linux/io.h> #include <linux/ipmi_bmc.h> +#include <linux/kcs_bmc_client.h> #include <linux/list.h> #include <linux/miscdevice.h> #include <linux/module.h> @@ -17,7 +18,6 @@ #include <linux/sched.h> #include <linux/slab.h> -#include "kcs_bmc_client.h" /* Different phases of the KCS BMC module. * KCS_PHASE_IDLE: diff --git a/drivers/char/ipmi/kcs_bmc_npcm7xx.c b/drivers/char/ipmi/kcs_bmc_npcm7xx.c index 7961fec56476..160553248a93 100644 --- a/drivers/char/ipmi/kcs_bmc_npcm7xx.c +++ b/drivers/char/ipmi/kcs_bmc_npcm7xx.c @@ -10,6 +10,7 @@ #include <linux/errno.h> #include <linux/interrupt.h> #include <linux/io.h> +#include <linux/kcs_bmc_device.h> #include <linux/mfd/syscon.h> #include <linux/module.h> #include <linux/of.h> @@ -17,7 +18,6 @@ #include <linux/regmap.h> #include <linux/slab.h> -#include "kcs_bmc_device.h" #define DEVICE_NAME "npcm-kcs-bmc" #define KCS_CHANNEL_MAX 3 diff --git a/drivers/char/ipmi/kcs_bmc_serio.c b/drivers/char/ipmi/kcs_bmc_serio.c index 1793358be782..24df7144a189 100644 --- a/drivers/char/ipmi/kcs_bmc_serio.c +++ b/drivers/char/ipmi/kcs_bmc_serio.c @@ -5,12 +5,12 @@ #include <linux/device.h> #include <linux/errno.h> #include <linux/list.h> +#include <linux/kcs_bmc_client.h> #include <linux/module.h> #include <linux/sched/signal.h> #include <linux/serio.h> #include <linux/slab.h> -#include "kcs_bmc_client.h" struct kcs_bmc_serio { struct list_head entry; diff --git a/drivers/char/ipmi/kcs_bmc.h b/include/linux/kcs_bmc.h similarity index 100% rename from drivers/char/ipmi/kcs_bmc.h rename to include/linux/kcs_bmc.h diff --git a/drivers/char/ipmi/kcs_bmc_client.h b/include/linux/kcs_bmc_client.h similarity index 97% rename from drivers/char/ipmi/kcs_bmc_client.h rename to include/linux/kcs_bmc_client.h index 6fdcde0a7169..f6350c9366dd 100644 --- a/drivers/char/ipmi/kcs_bmc_client.h +++ b/include/linux/kcs_bmc_client.h @@ -5,8 +5,7 @@ #define __KCS_BMC_CONSUMER_H__ #include <linux/irqreturn.h> - -#include "kcs_bmc.h" +#include <linux/kcs_bmc.h> struct kcs_bmc_driver_ops { int (*add_device)(struct kcs_bmc_device *kcs_bmc); diff --git a/drivers/char/ipmi/kcs_bmc_device.h b/include/linux/kcs_bmc_device.h similarity index 96% rename from drivers/char/ipmi/kcs_bmc_device.h rename to include/linux/kcs_bmc_device.h index 17c572f25c54..65333b68c0af 100644 --- a/drivers/char/ipmi/kcs_bmc_device.h +++ b/include/linux/kcs_bmc_device.h @@ -5,8 +5,7 @@ #define __KCS_BMC_DEVICE_H__ #include <linux/irqreturn.h> - -#include "kcs_bmc.h" +#include <linux/kcs_bmc.h> struct kcs_bmc_device_ops { void (*irq_mask_update)(struct kcs_bmc_device *kcs_bmc, u8 mask, u8 enable);
The current KCS header files can be utilized by both IPMI drivers (drivers/char/ipmi) and MCTP driver (drivers/net/mctp). To be able to use them in both cases move the headers to 'include/linux' folder. Signed-off-by: Konstantin Aladyshev <aladyshev22@gmail.com> --- drivers/char/ipmi/kcs_bmc.c | 8 +++----- drivers/char/ipmi/kcs_bmc_aspeed.c | 3 +-- drivers/char/ipmi/kcs_bmc_cdev_ipmi.c | 2 +- drivers/char/ipmi/kcs_bmc_npcm7xx.c | 2 +- drivers/char/ipmi/kcs_bmc_serio.c | 2 +- {drivers/char/ipmi => include/linux}/kcs_bmc.h | 0 {drivers/char/ipmi => include/linux}/kcs_bmc_client.h | 3 +-- {drivers/char/ipmi => include/linux}/kcs_bmc_device.h | 3 +-- 8 files changed, 9 insertions(+), 14 deletions(-) rename {drivers/char/ipmi => include/linux}/kcs_bmc.h (100%) rename {drivers/char/ipmi => include/linux}/kcs_bmc_client.h (97%) rename {drivers/char/ipmi => include/linux}/kcs_bmc_device.h (96%)