* [PATCH] nfit: Hide unused functions behind CONFIG_X86
@ 2019-01-08 4:58 Nathan Chancellor
[not found] ` <20190108045853.5471-1-natechancellor-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
0 siblings, 1 reply; 5+ messages in thread
From: Nathan Chancellor @ 2019-01-08 4:58 UTC (permalink / raw)
To: Dan Williams, Ross Zwisler, Vishal Verma, Dave Jiang
Cc: linux-nvdimm-hn68Rpc1hR1g9hUCZPvPmw, Rafael J. Wysocki,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
linux-acpi-u79uwXL29TY76Z2rM5mHXA, Nathan Chancellor, Len Brown
On arm64 little endian allyesconfig:
drivers/acpi/nfit/intel.c:149:12: warning: unused function 'intel_security_unlock' [-Wunused-function]
static int intel_security_unlock(struct nvdimm *nvdimm,
^
drivers/acpi/nfit/intel.c:230:12: warning: unused function 'intel_security_erase' [-Wunused-function]
static int intel_security_erase(struct nvdimm *nvdimm,
^
drivers/acpi/nfit/intel.c:279:12: warning: unused function 'intel_security_query_overwrite' [-Wunused-function]
static int intel_security_query_overwrite(struct nvdimm *nvdimm)
^
drivers/acpi/nfit/intel.c:316:12: warning: unused function 'intel_security_overwrite' [-Wunused-function]
static int intel_security_overwrite(struct nvdimm *nvdimm,
^
4 warnings generated.
These functions are only used in __intel_security_ops when CONFIG_X86 is
set so only define these functions under that same condition.
Fixes: 4c6926a23b76 ("acpi/nfit, libnvdimm: Add unlock of nvdimm support for Intel DIMMs")
Signed-off-by: Nathan Chancellor <natechancellor-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
drivers/acpi/nfit/intel.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/drivers/acpi/nfit/intel.c b/drivers/acpi/nfit/intel.c
index 850b2927b4e7..2ba0f1543940 100644
--- a/drivers/acpi/nfit/intel.c
+++ b/drivers/acpi/nfit/intel.c
@@ -144,6 +144,7 @@ static int intel_security_change_key(struct nvdimm *nvdimm,
}
}
+#ifdef CONFIG_X86
static void nvdimm_invalidate_cache(void);
static int intel_security_unlock(struct nvdimm *nvdimm,
@@ -186,6 +187,7 @@ static int intel_security_unlock(struct nvdimm *nvdimm,
return 0;
}
+#endif
static int intel_security_disable(struct nvdimm *nvdimm,
const struct nvdimm_key_data *key_data)
@@ -227,6 +229,7 @@ static int intel_security_disable(struct nvdimm *nvdimm,
return 0;
}
+#ifdef CONFIG_X86
static int intel_security_erase(struct nvdimm *nvdimm,
const struct nvdimm_key_data *key,
enum nvdimm_passphrase_type ptype)
@@ -360,16 +363,10 @@ static int intel_security_overwrite(struct nvdimm *nvdimm,
* TODO: define a cross arch wbinvd equivalent when/if
* NVDIMM_FAMILY_INTEL command support arrives on another arch.
*/
-#ifdef CONFIG_X86
static void nvdimm_invalidate_cache(void)
{
wbinvd_on_all_cpus();
}
-#else
-static void nvdimm_invalidate_cache(void)
-{
- WARN_ON_ONCE("cache invalidation required after unlock\n");
-}
#endif
static const struct nvdimm_security_ops __intel_security_ops = {
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread[parent not found: <20190108045853.5471-1-natechancellor-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>]
* Re: [PATCH] nfit: Hide unused functions behind CONFIG_X86 [not found] ` <20190108045853.5471-1-natechancellor-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> @ 2019-01-08 5:14 ` Dan Williams [not found] ` <CAPcyv4gA=qEm81k-f80oBBo9mmPcAg6szYQvtdOWFFWgd=9A4g-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> 2019-01-09 5:00 ` [PATCH v2] nfit: Mark some functions as __maybe_unused Nathan Chancellor 1 sibling, 1 reply; 5+ messages in thread From: Dan Williams @ 2019-01-08 5:14 UTC (permalink / raw) To: Nathan Chancellor Cc: kbuild test robot, linux-nvdimm, Rafael J. Wysocki, Linux Kernel Mailing List, Linux ACPI, Ross Zwisler, Len Brown On Mon, Jan 7, 2019 at 8:59 PM Nathan Chancellor <natechancellor-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote: > > On arm64 little endian allyesconfig: > > drivers/acpi/nfit/intel.c:149:12: warning: unused function 'intel_security_unlock' [-Wunused-function] > static int intel_security_unlock(struct nvdimm *nvdimm, > ^ > drivers/acpi/nfit/intel.c:230:12: warning: unused function 'intel_security_erase' [-Wunused-function] > static int intel_security_erase(struct nvdimm *nvdimm, > ^ > drivers/acpi/nfit/intel.c:279:12: warning: unused function 'intel_security_query_overwrite' [-Wunused-function] > static int intel_security_query_overwrite(struct nvdimm *nvdimm) > ^ > drivers/acpi/nfit/intel.c:316:12: warning: unused function 'intel_security_overwrite' [-Wunused-function] > static int intel_security_overwrite(struct nvdimm *nvdimm, > ^ > 4 warnings generated. > > These functions are only used in __intel_security_ops when CONFIG_X86 is > set so only define these functions under that same condition. Thanks for the report, not sure how the kbuild robot missed this. I'd prefer marking the functions __maybe_unused rather than expanding the ifdef guards. ^ permalink raw reply [flat|nested] 5+ messages in thread
[parent not found: <CAPcyv4gA=qEm81k-f80oBBo9mmPcAg6szYQvtdOWFFWgd=9A4g-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>]
* Re: [PATCH] nfit: Hide unused functions behind CONFIG_X86 [not found] ` <CAPcyv4gA=qEm81k-f80oBBo9mmPcAg6szYQvtdOWFFWgd=9A4g-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org> @ 2019-01-08 5:18 ` Nathan Chancellor 0 siblings, 0 replies; 5+ messages in thread From: Nathan Chancellor @ 2019-01-08 5:18 UTC (permalink / raw) To: Dan Williams Cc: kbuild test robot, linux-nvdimm, Rafael J. Wysocki, Linux Kernel Mailing List, Linux ACPI, Ross Zwisler, Len Brown On Mon, Jan 07, 2019 at 09:14:05PM -0800, Dan Williams wrote: > On Mon, Jan 7, 2019 at 8:59 PM Nathan Chancellor > <natechancellor-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote: > > > > On arm64 little endian allyesconfig: > > > > drivers/acpi/nfit/intel.c:149:12: warning: unused function 'intel_security_unlock' [-Wunused-function] > > static int intel_security_unlock(struct nvdimm *nvdimm, > > ^ > > drivers/acpi/nfit/intel.c:230:12: warning: unused function 'intel_security_erase' [-Wunused-function] > > static int intel_security_erase(struct nvdimm *nvdimm, > > ^ > > drivers/acpi/nfit/intel.c:279:12: warning: unused function 'intel_security_query_overwrite' [-Wunused-function] > > static int intel_security_query_overwrite(struct nvdimm *nvdimm) > > ^ > > drivers/acpi/nfit/intel.c:316:12: warning: unused function 'intel_security_overwrite' [-Wunused-function] > > static int intel_security_overwrite(struct nvdimm *nvdimm, > > ^ > > 4 warnings generated. > > > > These functions are only used in __intel_security_ops when CONFIG_X86 is > > set so only define these functions under that same condition. > > Thanks for the report, not sure how the kbuild robot missed this. I'd > prefer marking the functions __maybe_unused rather than expanding the > ifdef guards. allyesconfig defaults to big endian, which doesn't built the nfit folder (haven't looked into the dependency chain to see why). I have been working with Clang and have a local patch to avoid turning on big endian mode with it for now (avoids a few other warnings for now). I can send a v2 with that change if you would like. Thanks for the quick reply, Nathan ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH v2] nfit: Mark some functions as __maybe_unused [not found] ` <20190108045853.5471-1-natechancellor-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 2019-01-08 5:14 ` Dan Williams @ 2019-01-09 5:00 ` Nathan Chancellor [not found] ` <20190109050036.17322-1-natechancellor-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> 1 sibling, 1 reply; 5+ messages in thread From: Nathan Chancellor @ 2019-01-09 5:00 UTC (permalink / raw) To: Dan Williams, Ross Zwisler, Vishal Verma, Dave Jiang Cc: linux-nvdimm-hn68Rpc1hR1g9hUCZPvPmw, Rafael J. Wysocki, linux-kernel-u79uwXL29TY76Z2rM5mHXA, linux-acpi-u79uwXL29TY76Z2rM5mHXA, Nathan Chancellor, Len Brown On arm64 little endian allyesconfig: drivers/acpi/nfit/intel.c:149:12: warning: unused function 'intel_security_unlock' [-Wunused-function] static int intel_security_unlock(struct nvdimm *nvdimm, ^ drivers/acpi/nfit/intel.c:230:12: warning: unused function 'intel_security_erase' [-Wunused-function] static int intel_security_erase(struct nvdimm *nvdimm, ^ drivers/acpi/nfit/intel.c:279:12: warning: unused function 'intel_security_query_overwrite' [-Wunused-function] static int intel_security_query_overwrite(struct nvdimm *nvdimm) ^ drivers/acpi/nfit/intel.c:316:12: warning: unused function 'intel_security_overwrite' [-Wunused-function] static int intel_security_overwrite(struct nvdimm *nvdimm, ^ 4 warnings generated. Mark these functions as __maybe_unused because they are only used when CONFIG_X86 is set. Fixes: 4c6926a23b76 ("acpi/nfit, libnvdimm: Add unlock of nvdimm support for Intel DIMMs") Suggested-by: Dan Williams <dan.j.williams-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> Signed-off-by: Nathan Chancellor <natechancellor-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> --- v1 -> v2: * Mark the functions as __maybe_unused rather than expanding the CONFIG_X86, as requested by Dan. drivers/acpi/nfit/intel.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/acpi/nfit/intel.c b/drivers/acpi/nfit/intel.c index 850b2927b4e7..f70de71f79d6 100644 --- a/drivers/acpi/nfit/intel.c +++ b/drivers/acpi/nfit/intel.c @@ -146,7 +146,7 @@ static int intel_security_change_key(struct nvdimm *nvdimm, static void nvdimm_invalidate_cache(void); -static int intel_security_unlock(struct nvdimm *nvdimm, +static int __maybe_unused intel_security_unlock(struct nvdimm *nvdimm, const struct nvdimm_key_data *key_data) { struct nfit_mem *nfit_mem = nvdimm_provider_data(nvdimm); @@ -227,7 +227,7 @@ static int intel_security_disable(struct nvdimm *nvdimm, return 0; } -static int intel_security_erase(struct nvdimm *nvdimm, +static int __maybe_unused intel_security_erase(struct nvdimm *nvdimm, const struct nvdimm_key_data *key, enum nvdimm_passphrase_type ptype) { @@ -276,7 +276,7 @@ static int intel_security_erase(struct nvdimm *nvdimm, return 0; } -static int intel_security_query_overwrite(struct nvdimm *nvdimm) +static int __maybe_unused intel_security_query_overwrite(struct nvdimm *nvdimm) { int rc; struct nfit_mem *nfit_mem = nvdimm_provider_data(nvdimm); @@ -313,7 +313,7 @@ static int intel_security_query_overwrite(struct nvdimm *nvdimm) return 0; } -static int intel_security_overwrite(struct nvdimm *nvdimm, +static int __maybe_unused intel_security_overwrite(struct nvdimm *nvdimm, const struct nvdimm_key_data *nkey) { int rc; -- 2.20.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
[parent not found: <20190109050036.17322-1-natechancellor-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>]
* Re: [PATCH v2] nfit: Mark some functions as __maybe_unused [not found] ` <20190109050036.17322-1-natechancellor-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> @ 2019-01-09 6:22 ` Dan Williams 0 siblings, 0 replies; 5+ messages in thread From: Dan Williams @ 2019-01-09 6:22 UTC (permalink / raw) To: Nathan Chancellor Cc: linux-nvdimm, Rafael J. Wysocki, Linux Kernel Mailing List, Linux ACPI, Ross Zwisler, Len Brown On Tue, Jan 8, 2019 at 9:03 PM Nathan Chancellor <natechancellor-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote: > > On arm64 little endian allyesconfig: > > drivers/acpi/nfit/intel.c:149:12: warning: unused function 'intel_security_unlock' [-Wunused-function] > static int intel_security_unlock(struct nvdimm *nvdimm, > ^ > drivers/acpi/nfit/intel.c:230:12: warning: unused function 'intel_security_erase' [-Wunused-function] > static int intel_security_erase(struct nvdimm *nvdimm, > ^ > drivers/acpi/nfit/intel.c:279:12: warning: unused function 'intel_security_query_overwrite' [-Wunused-function] > static int intel_security_query_overwrite(struct nvdimm *nvdimm) > ^ > drivers/acpi/nfit/intel.c:316:12: warning: unused function 'intel_security_overwrite' [-Wunused-function] > static int intel_security_overwrite(struct nvdimm *nvdimm, > ^ > 4 warnings generated. > > Mark these functions as __maybe_unused because they are only used when > CONFIG_X86 is set. > > Fixes: 4c6926a23b76 ("acpi/nfit, libnvdimm: Add unlock of nvdimm support for Intel DIMMs") > Suggested-by: Dan Williams <dan.j.williams-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> > Signed-off-by: Nathan Chancellor <natechancellor-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Looks good, applied. ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-01-09 6:22 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-08 4:58 [PATCH] nfit: Hide unused functions behind CONFIG_X86 Nathan Chancellor
[not found] ` <20190108045853.5471-1-natechancellor-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2019-01-08 5:14 ` Dan Williams
[not found] ` <CAPcyv4gA=qEm81k-f80oBBo9mmPcAg6szYQvtdOWFFWgd=9A4g-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2019-01-08 5:18 ` Nathan Chancellor
2019-01-09 5:00 ` [PATCH v2] nfit: Mark some functions as __maybe_unused Nathan Chancellor
[not found] ` <20190109050036.17322-1-natechancellor-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
2019-01-09 6:22 ` Dan Williams
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).