From: Jithu Joseph <jithu.joseph@intel.com>
To: hdegoede@redhat.com, markgross@kernel.org
Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de,
dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com,
gregkh@linuxfoundation.org, rostedt@goodmis.org,
jithu.joseph@intel.com, ashok.raj@intel.com, tony.luck@intel.com,
linux-kernel@vger.kernel.org,
platform-driver-x86@vger.kernel.org, patches@lists.linux.dev,
ravi.v.shankar@intel.com, thiago.macieira@intel.com,
athenas.jimenez.gonzalez@intel.com, sohil.mehta@intel.com
Subject: [PATCH v3 1/8] platform/x86/intel/ifs: Reorganize driver data
Date: Tue, 28 Feb 2023 17:59:35 -0800 [thread overview]
Message-ID: <20230301015942.462799-2-jithu.joseph@intel.com> (raw)
In-Reply-To: <20230301015942.462799-1-jithu.joseph@intel.com>
The struct holding device driver data contained both read only(ro)
and read write(rw) fields.
Separating ro fields from rw fields was recommended as
a preferable design pattern during review[1].
Group the rw fields into a separate struct whose memory is allocated
during driver_init(). Associate it to the miscdevice being registered
by keeping it in the same container struct as the miscdevice.
Also in prepration to supporting additional tests, move ifs_pkg_auth
to a global as it is only applicable for the first test type.
Link: https://lore.kernel.org/lkml/Y+9H9otxLYPqMkUh@kroah.com/ [1]
Signed-off-by: Jithu Joseph <jithu.joseph@intel.com>
Reviewed-by: Tony Luck <tony.luck@intel.com>
---
drivers/platform/x86/intel/ifs/ifs.h | 19 +++++++++-------
drivers/platform/x86/intel/ifs/core.c | 31 ++++++++++++++++++---------
drivers/platform/x86/intel/ifs/load.c | 8 +++----
3 files changed, 36 insertions(+), 22 deletions(-)
diff --git a/drivers/platform/x86/intel/ifs/ifs.h b/drivers/platform/x86/intel/ifs/ifs.h
index 046e39304fd5..e07463c794d4 100644
--- a/drivers/platform/x86/intel/ifs/ifs.h
+++ b/drivers/platform/x86/intel/ifs/ifs.h
@@ -197,22 +197,23 @@ union ifs_status {
#define IFS_SW_TIMEOUT 0xFD
#define IFS_SW_PARTIAL_COMPLETION 0xFE
+struct ifs_const_data {
+ int integrity_cap_bit;
+ int test_num;
+};
+
/**
* struct ifs_data - attributes related to intel IFS driver
- * @integrity_cap_bit: MSR_INTEGRITY_CAPS bit enumerating this test
* @loaded_version: stores the currently loaded ifs image version.
- * @pkg_auth: array of bool storing per package auth status
* @loaded: If a valid test binary has been loaded into the memory
* @loading_error: Error occurred on another CPU while loading image
* @valid_chunks: number of chunks which could be validated.
* @status: it holds simple status pass/fail/untested
* @scan_details: opaque scan status code from h/w
* @cur_batch: number indicating the currently loaded test file
- * @test_num: number indicating the test type
+ * @ro_info: ptr to struct holding fixed details
*/
struct ifs_data {
- int integrity_cap_bit;
- bool *pkg_auth;
int loaded_version;
bool loaded;
bool loading_error;
@@ -220,7 +221,7 @@ struct ifs_data {
int status;
u64 scan_details;
u32 cur_batch;
- int test_num;
+ struct ifs_const_data *ro_info;
};
struct ifs_work {
@@ -229,7 +230,8 @@ struct ifs_work {
};
struct ifs_device {
- struct ifs_data data;
+ struct ifs_const_data ro_data;
+ struct ifs_data *rw_data;
struct miscdevice misc;
};
@@ -238,9 +240,10 @@ static inline struct ifs_data *ifs_get_data(struct device *dev)
struct miscdevice *m = dev_get_drvdata(dev);
struct ifs_device *d = container_of(m, struct ifs_device, misc);
- return &d->data;
+ return d->rw_data;
}
+extern bool *ifs_pkg_auth;
int ifs_load_firmware(struct device *dev);
int do_core_test(int cpu, struct device *dev);
const struct attribute_group **ifs_get_groups(void);
diff --git a/drivers/platform/x86/intel/ifs/core.c b/drivers/platform/x86/intel/ifs/core.c
index 206a617c2e02..b518b661daf0 100644
--- a/drivers/platform/x86/intel/ifs/core.c
+++ b/drivers/platform/x86/intel/ifs/core.c
@@ -20,8 +20,10 @@ static const struct x86_cpu_id ifs_cpu_ids[] __initconst = {
};
MODULE_DEVICE_TABLE(x86cpu, ifs_cpu_ids);
+bool *ifs_pkg_auth;
+
static struct ifs_device ifs_device = {
- .data = {
+ .ro_data = {
.integrity_cap_bit = MSR_INTEGRITY_CAPS_PERIODIC_BIST_BIT,
.test_num = 0,
},
@@ -35,8 +37,8 @@ static struct ifs_device ifs_device = {
static int __init ifs_init(void)
{
const struct x86_cpu_id *m;
+ struct ifs_data *ifsd;
u64 msrval;
- int ret;
m = x86_match_cpu(ifs_cpu_ids);
if (!m)
@@ -53,26 +55,35 @@ static int __init ifs_init(void)
ifs_device.misc.groups = ifs_get_groups();
- if (!(msrval & BIT(ifs_device.data.integrity_cap_bit)))
+ if (!(msrval & BIT(ifs_device.ro_data.integrity_cap_bit)))
return -ENODEV;
- ifs_device.data.pkg_auth = kmalloc_array(topology_max_packages(), sizeof(bool), GFP_KERNEL);
- if (!ifs_device.data.pkg_auth)
+ ifs_pkg_auth = kmalloc_array(topology_max_packages(), sizeof(bool), GFP_KERNEL);
+ if (!ifs_pkg_auth)
+ return -ENOMEM;
+
+ ifsd = kzalloc(sizeof(*ifsd), GFP_KERNEL);
+ if (!ifsd)
return -ENOMEM;
- ret = misc_register(&ifs_device.misc);
- if (ret) {
- kfree(ifs_device.data.pkg_auth);
- return ret;
+ ifsd->ro_info = &ifs_device.ro_data;
+ ifs_device.rw_data = ifsd;
+
+ if (misc_register(&ifs_device.misc)) {
+ kfree(ifsd);
+ kfree(ifs_pkg_auth);
+ return -ENODEV;
}
return 0;
+
}
static void __exit ifs_exit(void)
{
misc_deregister(&ifs_device.misc);
- kfree(ifs_device.data.pkg_auth);
+ kfree(ifs_device.rw_data);
+ kfree(ifs_pkg_auth);
}
module_init(ifs_init);
diff --git a/drivers/platform/x86/intel/ifs/load.c b/drivers/platform/x86/intel/ifs/load.c
index c5c24e6fdc43..cdec3316c08d 100644
--- a/drivers/platform/x86/intel/ifs/load.c
+++ b/drivers/platform/x86/intel/ifs/load.c
@@ -192,7 +192,7 @@ static int scan_chunks_sanity_check(struct device *dev)
struct ifs_work local_work;
int curr_pkg, cpu, ret;
- memset(ifsd->pkg_auth, 0, (topology_max_packages() * sizeof(bool)));
+ memset(ifs_pkg_auth, 0, (topology_max_packages() * sizeof(bool)));
ret = validate_ifs_metadata(dev);
if (ret)
return ret;
@@ -204,7 +204,7 @@ static int scan_chunks_sanity_check(struct device *dev)
cpus_read_lock();
for_each_online_cpu(cpu) {
curr_pkg = topology_physical_package_id(cpu);
- if (ifsd->pkg_auth[curr_pkg])
+ if (ifs_pkg_auth[curr_pkg])
continue;
reinit_completion(&ifs_done);
local_work.dev = dev;
@@ -215,7 +215,7 @@ static int scan_chunks_sanity_check(struct device *dev)
ret = -EIO;
goto out;
}
- ifsd->pkg_auth[curr_pkg] = 1;
+ ifs_pkg_auth[curr_pkg] = 1;
}
ret = 0;
out:
@@ -263,7 +263,7 @@ int ifs_load_firmware(struct device *dev)
int ret = -EINVAL;
snprintf(scan_path, sizeof(scan_path), "intel/ifs_%d/%02x-%02x-%02x-%02x.scan",
- ifsd->test_num, boot_cpu_data.x86, boot_cpu_data.x86_model,
+ ifsd->ro_info->test_num, boot_cpu_data.x86, boot_cpu_data.x86_model,
boot_cpu_data.x86_stepping, ifsd->cur_batch);
ret = request_firmware_direct(&fw, scan_path, dev);
--
2.25.1
next prev parent reply other threads:[~2023-03-01 2:01 UTC|newest]
Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-31 23:42 [PATCH 0/5] Add Array BIST test support to IFS Jithu Joseph
2023-01-31 23:42 ` [PATCH 1/5] x86/include/asm/msr-index.h: Add IFS Array test bits Jithu Joseph
2023-01-31 23:42 ` [PATCH 2/5] platform/x86/intel/ifs: Introduce Array Scan test to IFS Jithu Joseph
2023-01-31 23:43 ` [PATCH 3/5] platform/x86/intel/ifs: Sysfs interface for Array BIST Jithu Joseph
2023-02-01 5:04 ` Greg KH
2023-02-01 20:55 ` Joseph, Jithu
2023-01-31 23:43 ` [PATCH 4/5] platform/x86/intel/ifs: Implement Array BIST test Jithu Joseph
2023-02-01 5:02 ` Greg KH
2023-02-01 17:22 ` Luck, Tony
2023-02-01 18:19 ` Greg KH
2023-02-01 19:22 ` Tony Luck
2023-02-01 19:35 ` Dave Hansen
2023-02-01 19:43 ` Luck, Tony
2023-02-01 19:53 ` Dave Hansen
2023-02-01 19:45 ` Dave Hansen
2023-02-01 19:56 ` Joseph, Jithu
2023-02-01 20:49 ` Dave Hansen
2023-02-01 21:34 ` Luck, Tony
2023-01-31 23:43 ` [PATCH 5/5] platform/x86/intel/ifs: Trace support for array test Jithu Joseph
2023-02-06 16:40 ` Steven Rostedt
2023-02-06 19:50 ` Joseph, Jithu
2023-02-14 23:44 ` [PATCH v2 0/7] Add Array BIST test support to IFS Jithu Joseph
2023-02-14 23:44 ` [PATCH v2 1/7] x86/include/asm/msr-index.h: Add IFS Array test bits Jithu Joseph
2023-02-14 23:44 ` [PATCH v2 2/7] platform/x86/intel/ifs: Introduce Array Scan test to IFS Jithu Joseph
2023-02-16 12:40 ` Greg KH
2023-02-16 18:46 ` Luck, Tony
2023-02-16 22:57 ` Joseph, Jithu
2023-02-17 9:25 ` Greg KH
2023-02-14 23:44 ` [PATCH v2 3/7] platform/x86/intel/ifs: Sysfs interface for Array BIST Jithu Joseph
2023-02-14 23:44 ` [PATCH v2 4/7] platform/x86/intel/ifs: Implement Array BIST test Jithu Joseph
2023-02-15 16:58 ` Dave Hansen
2023-02-15 17:11 ` Dave Hansen
2023-02-15 20:22 ` Joseph, Jithu
2023-02-15 20:26 ` Dave Hansen
2023-02-15 21:13 ` Joseph, Jithu
2023-02-15 21:18 ` Dave Hansen
2023-02-22 20:12 ` Dave Hansen
2023-02-22 22:07 ` Joseph, Jithu
2023-02-22 22:28 ` Dave Hansen
2023-02-22 22:36 ` Steven Rostedt
2023-02-22 23:32 ` Joseph, Jithu
2023-02-22 23:59 ` Dave Hansen
2023-02-15 17:44 ` Joseph, Jithu
2023-02-14 23:44 ` [PATCH v2 5/7] platform/x86/intel/ifs: Trace support for array test Jithu Joseph
2023-02-16 0:56 ` Steven Rostedt
2023-02-14 23:44 ` [PATCH v2 6/7] platform/x86/intel/ifs: Update IFS doc Jithu Joseph
2023-02-14 23:44 ` [PATCH v2 7/7] Documentation/ABI: Update IFS ABI doc Jithu Joseph
2023-03-01 1:59 ` [PATCH v3 0/8] Add Array BIST test support to IFS Jithu Joseph
2023-03-01 1:59 ` Jithu Joseph [this message]
2023-03-13 14:46 ` [PATCH v3 1/8] platform/x86/intel/ifs: Reorganize driver data Hans de Goede
2023-03-13 21:34 ` Joseph, Jithu
2023-03-16 9:43 ` Hans de Goede
2023-03-01 1:59 ` [PATCH v3 2/8] platform/x86/intel/ifs: IFS cleanup Jithu Joseph
2023-03-13 15:02 ` Hans de Goede
2023-03-01 1:59 ` [PATCH v3 3/8] x86/include/asm/msr-index.h: Add IFS Array test bits Jithu Joseph
2023-03-13 15:03 ` Hans de Goede
2023-03-01 1:59 ` [PATCH v3 4/8] platform/x86/intel/ifs: Introduce Array Scan test to IFS Jithu Joseph
2023-03-13 16:10 ` Hans de Goede
2023-03-13 16:29 ` Hans de Goede
2023-03-13 17:21 ` Luck, Tony
2023-03-15 19:29 ` Joseph, Jithu
2023-03-16 9:50 ` Hans de Goede
2023-03-16 19:44 ` Joseph, Jithu
2023-03-01 1:59 ` [PATCH v3 5/8] platform/x86/intel/ifs: Sysfs interface for Array BIST Jithu Joseph
2023-03-13 16:14 ` Hans de Goede
2023-03-01 1:59 ` [PATCH v3 6/8] platform/x86/intel/ifs: Implement Array BIST test Jithu Joseph
2023-03-13 16:24 ` Hans de Goede
2023-03-13 16:37 ` Joseph, Jithu
2023-03-16 9:59 ` Hans de Goede
2023-03-16 17:40 ` Joseph, Jithu
2023-03-16 18:11 ` Joseph, Jithu
2023-03-16 19:38 ` Hans de Goede
2023-03-01 1:59 ` [PATCH v3 7/8] platform/x86/intel/ifs: Update IFS doc Jithu Joseph
2023-03-01 1:59 ` [PATCH v3 8/8] Documentation/ABI: Update IFS ABI doc Jithu Joseph
2023-03-07 11:02 ` [PATCH v3 0/8] Add Array BIST test support to IFS Hans de Goede
2023-03-22 0:33 ` [PATCH v4 0/9] " Jithu Joseph
2023-03-22 0:33 ` [PATCH v4 1/9] platform/x86/intel/ifs: Separate ifs_pkg_auth from ifs_data Jithu Joseph
2023-03-22 0:33 ` [PATCH v4 2/9] platform/x86/intel/ifs: Reorganize driver data Jithu Joseph
2023-03-22 0:33 ` [PATCH v4 3/9] platform/x86/intel/ifs: IFS cleanup Jithu Joseph
2023-03-22 0:33 ` [PATCH v4 4/9] x86/include/asm/msr-index.h: Add IFS Array test bits Jithu Joseph
2023-03-22 0:33 ` [PATCH v4 5/9] platform/x86/intel/ifs: Introduce Array Scan test to IFS Jithu Joseph
2023-03-22 0:33 ` [PATCH v4 6/9] platform/x86/intel/ifs: Sysfs interface for Array BIST Jithu Joseph
2023-03-22 0:33 ` [PATCH v4 7/9] platform/x86/intel/ifs: Implement Array BIST test Jithu Joseph
2023-03-22 0:33 ` [PATCH v4 8/9] platform/x86/intel/ifs: Update IFS doc Jithu Joseph
2023-03-22 0:33 ` [PATCH v4 9/9] Documentation/ABI: Update IFS ABI doc Jithu Joseph
2023-03-27 13:10 ` [PATCH v4 0/9] Add Array BIST test support to IFS Hans de Goede
2023-04-07 1:49 ` Pengfei Xu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230301015942.462799-2-jithu.joseph@intel.com \
--to=jithu.joseph@intel.com \
--cc=ashok.raj@intel.com \
--cc=athenas.jimenez.gonzalez@intel.com \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=hdegoede@redhat.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=markgross@kernel.org \
--cc=mingo@redhat.com \
--cc=patches@lists.linux.dev \
--cc=platform-driver-x86@vger.kernel.org \
--cc=ravi.v.shankar@intel.com \
--cc=rostedt@goodmis.org \
--cc=sohil.mehta@intel.com \
--cc=tglx@linutronix.de \
--cc=thiago.macieira@intel.com \
--cc=tony.luck@intel.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).