On Wed, 10 Jul 2024, Kuppuswamy Sathyanarayanan wrote:
> IFS tests such as Scan at Field (SAF) or Structural Based Functional
> Test at Field (SBAF), require the user to load a test image. The image
> loading process is similar across these tests, with the only difference
> being MSR addresses used. To reuse the code between these tests, remove
> the hard coding of MSR addresses and allow the driver to pass the MSR
> addresses per IFS test (via driver device data).
>
> Add a new structure named "struct ifs_test_msrs" to specify the
> test-specific MSR addresses. Each IFS test will provide this structure,
> enabling them to reuse the common code.
>
> This is a preliminary patch in preparation for the addition of SBAF
> support.
>
> Reviewed-by: Ashok Raj <ashok.raj@xxxxxxxxx>
> Reviewed-by: Tony Luck <tony.luck@xxxxxxxxx>
> Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@xxxxxxxxxxxxxxx>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@xxxxxxxxxxxxxxx>
--
i.
> ---
> drivers/platform/x86/intel/ifs/ifs.h | 25 +++++++++++++++++++++++++
> drivers/platform/x86/intel/ifs/core.c | 9 +++++++++
> drivers/platform/x86/intel/ifs/load.c | 24 ++++++++++++++----------
> 3 files changed, 48 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/platform/x86/intel/ifs/ifs.h b/drivers/platform/x86/intel/ifs/ifs.h
> index 56b9f3e3cf76..738cbc7a5d00 100644
> --- a/drivers/platform/x86/intel/ifs/ifs.h
> +++ b/drivers/platform/x86/intel/ifs/ifs.h
> @@ -266,6 +266,22 @@ struct ifs_test_caps {
> int test_num;
> };
>
> +/**
> + * struct ifs_test_msrs - MSRs used in IFS tests
> + * @copy_hashes: Copy test hash data
> + * @copy_hashes_status: Status of copied test hash data
> + * @copy_chunks: Copy chunks of the test data
> + * @copy_chunks_status: Status of the copied test data chunks
> + * @test_ctrl: Control the test attributes
> + */
> +struct ifs_test_msrs {
> + u32 copy_hashes;
> + u32 copy_hashes_status;
> + u32 copy_chunks;
> + u32 copy_chunks_status;
> + u32 test_ctrl;
> +};
> +
> /**
> * struct ifs_data - attributes related to intel IFS driver
> * @loaded_version: stores the currently loaded ifs image version.
> @@ -299,6 +315,7 @@ struct ifs_work {
>
> struct ifs_device {
> const struct ifs_test_caps *test_caps;
> + const struct ifs_test_msrs *test_msrs;
> struct ifs_data rw_data;
> struct miscdevice misc;
> };
> @@ -319,6 +336,14 @@ static inline const struct ifs_test_caps *ifs_get_test_caps(struct device *dev)
> return d->test_caps;
> }
>
> +static inline const struct ifs_test_msrs *ifs_get_test_msrs(struct device *dev)
> +{
> + struct miscdevice *m = dev_get_drvdata(dev);
> + struct ifs_device *d = container_of(m, struct ifs_device, misc);
> +
> + return d->test_msrs;
> +}
> +
> extern bool *ifs_pkg_auth;
> int ifs_load_firmware(struct device *dev);
> int do_core_test(int cpu, struct device *dev);
> diff --git a/drivers/platform/x86/intel/ifs/core.c b/drivers/platform/x86/intel/ifs/core.c
> index 7b11198d85a1..1a7ca74abb61 100644
> --- a/drivers/platform/x86/intel/ifs/core.c
> +++ b/drivers/platform/x86/intel/ifs/core.c
> @@ -40,9 +40,18 @@ static const struct ifs_test_caps array_test = {
> .test_num = IFS_TYPE_ARRAY_BIST,
> };
>
> +static const struct ifs_test_msrs scan_msrs = {
> + .copy_hashes = MSR_COPY_SCAN_HASHES,
> + .copy_hashes_status = MSR_SCAN_HASHES_STATUS,
> + .copy_chunks = MSR_AUTHENTICATE_AND_COPY_CHUNK,
> + .copy_chunks_status = MSR_CHUNKS_AUTHENTICATION_STATUS,
> + .test_ctrl = MSR_SAF_CTRL,
> +};
> +
> static struct ifs_device ifs_devices[] = {
> [IFS_TYPE_SAF] = {
> .test_caps = &scan_test,
> + .test_msrs = &scan_msrs,
> .misc = {
> .name = "intel_ifs_0",
> .minor = MISC_DYNAMIC_MINOR,
> diff --git a/drivers/platform/x86/intel/ifs/load.c b/drivers/platform/x86/intel/ifs/load.c
> index 39f19cb51749..ad0c107f0922 100644
> --- a/drivers/platform/x86/intel/ifs/load.c
> +++ b/drivers/platform/x86/intel/ifs/load.c
> @@ -118,15 +118,17 @@ static void copy_hashes_authenticate_chunks(struct work_struct *work)
> union ifs_scan_hashes_status hashes_status;
> union ifs_chunks_auth_status chunk_status;
> struct device *dev = local_work->dev;
> + const struct ifs_test_msrs *msrs;
> int i, num_chunks, chunk_size;
> struct ifs_data *ifsd;
> u64 linear_addr, base;
> u32 err_code;
>
> ifsd = ifs_get_data(dev);
> + msrs = ifs_get_test_msrs(dev);
> /* run scan hash copy */
> - wrmsrl(MSR_COPY_SCAN_HASHES, ifs_hash_ptr);
> - rdmsrl(MSR_SCAN_HASHES_STATUS, hashes_status.data);
> + wrmsrl(msrs->copy_hashes, ifs_hash_ptr);
> + rdmsrl(msrs->copy_hashes_status, hashes_status.data);
>
> /* enumerate the scan image information */
> num_chunks = hashes_status.num_chunks;
> @@ -147,8 +149,8 @@ static void copy_hashes_authenticate_chunks(struct work_struct *work)
> linear_addr = base + i * chunk_size;
> linear_addr |= i;
>
> - wrmsrl(MSR_AUTHENTICATE_AND_COPY_CHUNK, linear_addr);
> - rdmsrl(MSR_CHUNKS_AUTHENTICATION_STATUS, chunk_status.data);
> + wrmsrl(msrs->copy_chunks, linear_addr);
> + rdmsrl(msrs->copy_chunks_status, chunk_status.data);
>
> ifsd->valid_chunks = chunk_status.valid_chunks;
> err_code = chunk_status.error_code;
> @@ -180,6 +182,7 @@ static int copy_hashes_authenticate_chunks_gen2(struct device *dev)
> union ifs_scan_hashes_status_gen2 hashes_status;
> union ifs_chunks_auth_status_gen2 chunk_status;
> u32 err_code, valid_chunks, total_chunks;
> + const struct ifs_test_msrs *msrs;
> int i, num_chunks, chunk_size;
> union meta_data *ifs_meta;
> int starting_chunk_nr;
> @@ -189,10 +192,11 @@ static int copy_hashes_authenticate_chunks_gen2(struct device *dev)
> int retry_count;
>
> ifsd = ifs_get_data(dev);
> + msrs = ifs_get_test_msrs(dev);
>
> if (need_copy_scan_hashes(ifsd)) {
> - wrmsrl(MSR_COPY_SCAN_HASHES, ifs_hash_ptr);
> - rdmsrl(MSR_SCAN_HASHES_STATUS, hashes_status.data);
> + wrmsrl(msrs->copy_hashes, ifs_hash_ptr);
> + rdmsrl(msrs->copy_hashes_status, hashes_status.data);
>
> /* enumerate the scan image information */
> chunk_size = hashes_status.chunk_size * SZ_1K;
> @@ -212,8 +216,8 @@ static int copy_hashes_authenticate_chunks_gen2(struct device *dev)
> }
>
> if (ifsd->generation >= IFS_GEN_STRIDE_AWARE) {
> - wrmsrl(MSR_SAF_CTRL, INVALIDATE_STRIDE);
> - rdmsrl(MSR_CHUNKS_AUTHENTICATION_STATUS, chunk_status.data);
> + wrmsrl(msrs->test_ctrl, INVALIDATE_STRIDE);
> + rdmsrl(msrs->copy_chunks_status, chunk_status.data);
> if (chunk_status.valid_chunks != 0) {
> dev_err(dev, "Couldn't invalidate installed stride - %d\n",
> chunk_status.valid_chunks);
> @@ -234,9 +238,9 @@ static int copy_hashes_authenticate_chunks_gen2(struct device *dev)
> chunk_table[1] = linear_addr;
> do {
> local_irq_disable();
> - wrmsrl(MSR_AUTHENTICATE_AND_COPY_CHUNK, (u64)chunk_table);
> + wrmsrl(msrs->copy_chunks, (u64)chunk_table);
> local_irq_enable();
> - rdmsrl(MSR_CHUNKS_AUTHENTICATION_STATUS, chunk_status.data);
> + rdmsrl(msrs->copy_chunks_status, chunk_status.data);
> err_code = chunk_status.error_code;
> } while (err_code == AUTH_INTERRUPTED_ERROR && --retry_count);
>
>
