| Message ID | 20180411125501.188477-2-tweek@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Thiebaud,
Thank you for the patch! Perhaps something to improve:
[auto build test WARNING on char-misc/char-misc-testing]
[also build test WARNING on v4.16 next-20180411]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Thiebaud-Weksteen/tpm-Move-eventlog-files-to-a-subdirectory/20180412-045224
reproduce:
# apt-get install sparse
make ARCH=x86_64 allmodconfig
make C=1 CF=-D__CHECK_ENDIAN__
sparse warnings: (new ones prefixed by >>)
>> drivers/char/tpm/eventlog/of.c:59:37: sparse: incorrect type in argument 1 (different base types) @@ expected restricted __be32 const [usertype] *p @@ got unsignrestricted __be32 const [usertype] *p @@
drivers/char/tpm/eventlog/of.c:59:37: expected restricted __be32 const [usertype] *p
drivers/char/tpm/eventlog/of.c:59:37: got unsigned int const [usertype] *[assigned] sizep
>> drivers/char/tpm/eventlog/of.c:60:37: sparse: incorrect type in argument 1 (different base types) @@ expected restricted __be64 const [usertype] *p @@ got unsigned lonrestricted __be64 const [usertype] *p @@
drivers/char/tpm/eventlog/of.c:60:37: expected restricted __be64 const [usertype] *p
drivers/char/tpm/eventlog/of.c:60:37: got unsigned long long const [usertype] *[assigned] basep
vim +59 drivers/char/tpm/eventlog/of.c
c5df39262 drivers/char/tpm/tpm_of.c Ashley Lai 2012-08-14 23
02ae13828 drivers/char/tpm/tpm_of.c Nayna Jain 2016-11-14 24 int tpm_read_log_of(struct tpm_chip *chip)
c5df39262 drivers/char/tpm/tpm_of.c Ashley Lai 2012-08-14 25 {
c5df39262 drivers/char/tpm/tpm_of.c Ashley Lai 2012-08-14 26 struct device_node *np;
c5df39262 drivers/char/tpm/tpm_of.c Ashley Lai 2012-08-14 27 const u32 *sizep;
d72c39114 drivers/char/tpm/tpm_of.c Hon Ching \(Vicky\ Lo 2015-06-17 28) const u64 *basep;
748935eeb drivers/char/tpm/tpm_of.c Nayna Jain 2016-11-14 29 struct tpm_bios_log *log;
e46e22f12 drivers/char/tpm/tpm_of.c Nayna Jain 2017-01-23 30 u32 size;
e46e22f12 drivers/char/tpm/tpm_of.c Nayna Jain 2017-01-23 31 u64 base;
c5df39262 drivers/char/tpm/tpm_of.c Ashley Lai 2012-08-14 32
748935eeb drivers/char/tpm/tpm_of.c Nayna Jain 2016-11-14 33 log = &chip->log;
0cf577a03 drivers/char/tpm/tpm_of.c Jason Gunthorpe 2016-11-19 34 if (chip->dev.parent && chip->dev.parent->of_node)
ed4fdb4f5 drivers/char/tpm/tpm_of.c Nayna Jain 2016-11-14 35 np = chip->dev.parent->of_node;
79eec5b94 drivers/char/tpm/tpm_of.c Colin Ian King 2016-11-15 36 else
c5df39262 drivers/char/tpm/tpm_of.c Ashley Lai 2012-08-14 37 return -ENODEV;
c5df39262 drivers/char/tpm/tpm_of.c Ashley Lai 2012-08-14 38
b5d0ebc99 drivers/char/tpm/tpm_of.c Enric Balletbo i Serra 2017-06-27 39 if (of_property_read_bool(np, "powered-while-suspended"))
b5d0ebc99 drivers/char/tpm/tpm_of.c Enric Balletbo i Serra 2017-06-27 40 chip->flags |= TPM_CHIP_FLAG_ALWAYS_POWERED;
b5d0ebc99 drivers/char/tpm/tpm_of.c Enric Balletbo i Serra 2017-06-27 41
c5df39262 drivers/char/tpm/tpm_of.c Ashley Lai 2012-08-14 42 sizep = of_get_property(np, "linux,sml-size", NULL);
0cf577a03 drivers/char/tpm/tpm_of.c Jason Gunthorpe 2016-11-19 43 basep = of_get_property(np, "linux,sml-base", NULL);
0cf577a03 drivers/char/tpm/tpm_of.c Jason Gunthorpe 2016-11-19 44 if (sizep == NULL && basep == NULL)
0cf577a03 drivers/char/tpm/tpm_of.c Jason Gunthorpe 2016-11-19 45 return -ENODEV;
0cf577a03 drivers/char/tpm/tpm_of.c Jason Gunthorpe 2016-11-19 46 if (sizep == NULL || basep == NULL)
5efae7d6b drivers/char/tpm/tpm_of.c Nayna Jain 2016-11-14 47 return -EIO;
5efae7d6b drivers/char/tpm/tpm_of.c Nayna Jain 2016-11-14 48
e46e22f12 drivers/char/tpm/tpm_of.c Nayna Jain 2017-01-23 49 /*
e46e22f12 drivers/char/tpm/tpm_of.c Nayna Jain 2017-01-23 50 * For both vtpm/tpm, firmware has log addr and log size in big
e46e22f12 drivers/char/tpm/tpm_of.c Nayna Jain 2017-01-23 51 * endian format. But in case of vtpm, there is a method called
e46e22f12 drivers/char/tpm/tpm_of.c Nayna Jain 2017-01-23 52 * sml-handover which is run during kernel init even before
e46e22f12 drivers/char/tpm/tpm_of.c Nayna Jain 2017-01-23 53 * device tree is setup. This sml-handover function takes care
e46e22f12 drivers/char/tpm/tpm_of.c Nayna Jain 2017-01-23 54 * of endianness and writes to sml-base and sml-size in little
e46e22f12 drivers/char/tpm/tpm_of.c Nayna Jain 2017-01-23 55 * endian format. For this reason, vtpm doesn't need conversion
e46e22f12 drivers/char/tpm/tpm_of.c Nayna Jain 2017-01-23 56 * but physical tpm needs the conversion.
e46e22f12 drivers/char/tpm/tpm_of.c Nayna Jain 2017-01-23 57 */
e46e22f12 drivers/char/tpm/tpm_of.c Nayna Jain 2017-01-23 58 if (of_property_match_string(np, "compatible", "IBM,vtpm") < 0) {
e46e22f12 drivers/char/tpm/tpm_of.c Nayna Jain 2017-01-23 @59 size = be32_to_cpup(sizep);
e46e22f12 drivers/char/tpm/tpm_of.c Nayna Jain 2017-01-23 @60 base = be64_to_cpup(basep);
:::::: The code at line 59 was first introduced by commit
:::::: e46e22f12b19f0068b02afcf6edb716b4f49934f tpm: enhance read_log_of() to support Physical TPM event log
:::::: TO: Nayna Jain <nayna@linux.vnet.ibm.com>
:::::: CC: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile index acd758381c58..5dcf5bd35a3d 100644 --- a/drivers/char/tpm/Makefile +++ b/drivers/char/tpm/Makefile @@ -4,11 +4,11 @@ # obj-$(CONFIG_TCG_TPM) += tpm.o tpm-y := tpm-interface.o tpm-dev.o tpm-sysfs.o tpm-chip.o tpm2-cmd.o \ - tpm-dev-common.o tpmrm-dev.o tpm1_eventlog.o tpm2_eventlog.o \ + tpm-dev-common.o tpmrm-dev.o eventlog/tpm1.o eventlog/tpm2.o \ tpm2-space.o -tpm-$(CONFIG_ACPI) += tpm_ppi.o tpm_eventlog_acpi.o -tpm-$(CONFIG_EFI) += tpm_eventlog_efi.o -tpm-$(CONFIG_OF) += tpm_eventlog_of.o +tpm-$(CONFIG_ACPI) += tpm_ppi.o eventlog/acpi.o +tpm-$(CONFIG_EFI) += eventlog/efi.o +tpm-$(CONFIG_OF) += eventlog/of.o obj-$(CONFIG_TCG_TIS_CORE) += tpm_tis_core.o obj-$(CONFIG_TCG_TIS) += tpm_tis.o obj-$(CONFIG_TCG_TIS_SPI) += tpm_tis_spi.o diff --git a/drivers/char/tpm/tpm_eventlog_acpi.c b/drivers/char/tpm/eventlog/acpi.c similarity index 99% rename from drivers/char/tpm/tpm_eventlog_acpi.c rename to drivers/char/tpm/eventlog/acpi.c index 66f19e93c216..8476be2e9526 100644 --- a/drivers/char/tpm/tpm_eventlog_acpi.c +++ b/drivers/char/tpm/eventlog/acpi.c @@ -27,7 +27,7 @@ #include <linux/acpi.h> #include <linux/tpm_eventlog.h> -#include "tpm.h" +#include "../tpm.h" struct acpi_tcpa { struct acpi_table_header hdr; diff --git a/drivers/char/tpm/tpm_eventlog_efi.c b/drivers/char/tpm/eventlog/efi.c similarity index 98% rename from drivers/char/tpm/tpm_eventlog_efi.c rename to drivers/char/tpm/eventlog/efi.c index e3f9ffd341d2..e1593c5271a4 100644 --- a/drivers/char/tpm/tpm_eventlog_efi.c +++ b/drivers/char/tpm/eventlog/efi.c @@ -14,7 +14,7 @@ #include <linux/efi.h> #include <linux/tpm_eventlog.h> -#include "tpm.h" +#include "../tpm.h" /* read binary bios log from EFI configuration table */ int tpm_read_log_efi(struct tpm_chip *chip) diff --git a/drivers/char/tpm/tpm_eventlog_of.c b/drivers/char/tpm/eventlog/of.c similarity index 99% rename from drivers/char/tpm/tpm_eventlog_of.c rename to drivers/char/tpm/eventlog/of.c index 96fd5646f866..c38c37e41389 100644 --- a/drivers/char/tpm/tpm_eventlog_of.c +++ b/drivers/char/tpm/eventlog/of.c @@ -19,7 +19,7 @@ #include <linux/of.h> #include <linux/tpm_eventlog.h> -#include "tpm.h" +#include "../tpm.h" int tpm_read_log_of(struct tpm_chip *chip) { diff --git a/drivers/char/tpm/tpm1_eventlog.c b/drivers/char/tpm/eventlog/tpm1.c similarity index 99% rename from drivers/char/tpm/tpm1_eventlog.c rename to drivers/char/tpm/eventlog/tpm1.c index add798bd69d0..d6aea3ca950e 100644 --- a/drivers/char/tpm/tpm1_eventlog.c +++ b/drivers/char/tpm/eventlog/tpm1.c @@ -28,7 +28,7 @@ #include <linux/slab.h> #include <linux/tpm_eventlog.h> -#include "tpm.h" +#include "../tpm.h" static const char* tcpa_event_type_strings[] = { diff --git a/drivers/char/tpm/tpm2_eventlog.c b/drivers/char/tpm/eventlog/tpm2.c similarity index 99% rename from drivers/char/tpm/tpm2_eventlog.c rename to drivers/char/tpm/eventlog/tpm2.c index 1ce4411292ba..f0723fa9ae14 100644 --- a/drivers/char/tpm/tpm2_eventlog.c +++ b/drivers/char/tpm/eventlog/tpm2.c @@ -23,7 +23,7 @@ #include <linux/slab.h> #include <linux/tpm_eventlog.h> -#include "tpm.h" +#include "../tpm.h" /* * calc_tpm2_event_size() - calculate the event size, where event
Signed-off-by: Thiebaud Weksteen <tweek@google.com> --- drivers/char/tpm/Makefile | 8 ++++---- drivers/char/tpm/{tpm_eventlog_acpi.c => eventlog/acpi.c} | 2 +- drivers/char/tpm/{tpm_eventlog_efi.c => eventlog/efi.c} | 2 +- drivers/char/tpm/{tpm_eventlog_of.c => eventlog/of.c} | 2 +- drivers/char/tpm/{tpm1_eventlog.c => eventlog/tpm1.c} | 2 +- drivers/char/tpm/{tpm2_eventlog.c => eventlog/tpm2.c} | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) rename drivers/char/tpm/{tpm_eventlog_acpi.c => eventlog/acpi.c} (99%) rename drivers/char/tpm/{tpm_eventlog_efi.c => eventlog/efi.c} (98%) rename drivers/char/tpm/{tpm_eventlog_of.c => eventlog/of.c} (99%) rename drivers/char/tpm/{tpm1_eventlog.c => eventlog/tpm1.c} (99%) rename drivers/char/tpm/{tpm2_eventlog.c => eventlog/tpm2.c} (99%)