All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH 1/3] drm/i915: Fix GuC documentation links
@ 2019-07-24 17:34 Michal Wajdeczko
  2019-07-24 17:34 ` [PATCH 2/3] drm/i915/uc: Move uc firmware layout definitions to dedicated file Michal Wajdeczko
                   ` (5 more replies)
  0 siblings, 6 replies; 13+ messages in thread
From: Michal Wajdeczko @ 2019-07-24 17:34 UTC (permalink / raw)
  To: intel-gfx

We moved GuC related files to new location but we missed to update
.rst file with links.

References: commit 0f261b241d9c ("drm/i915/uc: move GuC and HuC files under gt/uc/")
Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
---
 Documentation/gpu/i915.rst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst
index c38ef0dda605..c2173d120492 100644
--- a/Documentation/gpu/i915.rst
+++ b/Documentation/gpu/i915.rst
@@ -433,28 +433,28 @@ GuC
 GuC-specific firmware loader
 ----------------------------
 
-.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_fw.c
+.. kernel-doc:: drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c
    :internal:
 
 GuC-based command submission
 ----------------------------
 
-.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_submission.c
+.. kernel-doc:: drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
    :doc: GuC-based command submission
 
-.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_submission.c
+.. kernel-doc:: drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
    :internal:
 
 GuC Firmware Layout
 -------------------
 
-.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_fwif.h
+.. kernel-doc:: drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h
    :doc: GuC Firmware Layout
 
 GuC Address Space
 -----------------
 
-.. kernel-doc:: drivers/gpu/drm/i915/intel_guc.c
+.. kernel-doc:: drivers/gpu/drm/i915/gt/uc/intel_guc.c
    :doc: GuC Address Space
 
 Tracing
-- 
2.19.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 2/3] drm/i915/uc: Move uc firmware layout definitions to dedicated file
  2019-07-24 17:34 [PATCH 1/3] drm/i915: Fix GuC documentation links Michal Wajdeczko
@ 2019-07-24 17:34 ` Michal Wajdeczko
  2019-07-24 17:50   ` Daniele Ceraolo Spurio
  2019-07-24 17:34 ` [PATCH 3/3] drm/i915/uc: Update drawing for firmware layout Michal Wajdeczko
                   ` (4 subsequent siblings)
  5 siblings, 1 reply; 13+ messages in thread
From: Michal Wajdeczko @ 2019-07-24 17:34 UTC (permalink / raw)
  To: intel-gfx

Generic uc firmware layout definitions are unlikely to change and
are separate to other GuC specific definitions.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
---
 Documentation/gpu/i915.rst                   |  2 +-
 drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h  | 70 -----------------
 drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c     |  1 +
 drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 81 ++++++++++++++++++++
 4 files changed, 83 insertions(+), 71 deletions(-)
 create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h

diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst
index c2173d120492..366cb7f46d17 100644
--- a/Documentation/gpu/i915.rst
+++ b/Documentation/gpu/i915.rst
@@ -448,7 +448,7 @@ GuC-based command submission
 GuC Firmware Layout
 -------------------
 
-.. kernel-doc:: drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h
+.. kernel-doc:: drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
    :doc: GuC Firmware Layout
 
 GuC Address Space
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h b/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h
index 30cca3a29323..06a9bdfb0faf 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h
@@ -121,76 +121,6 @@
 
 #define GUC_CTL_MAX_DWORDS		(SOFT_SCRATCH_COUNT - 2) /* [1..14] */
 
-/**
- * DOC: GuC Firmware Layout
- *
- * The GuC firmware layout looks like this:
- *
- *     +-------------------------------+
- *     |         uc_css_header         |
- *     |                               |
- *     | contains major/minor version  |
- *     +-------------------------------+
- *     |             uCode             |
- *     +-------------------------------+
- *     |         RSA signature         |
- *     +-------------------------------+
- *     |          modulus key          |
- *     +-------------------------------+
- *     |          exponent val         |
- *     +-------------------------------+
- *
- * The firmware may or may not have modulus key and exponent data. The header,
- * uCode and RSA signature are must-have components that will be used by driver.
- * Length of each components, which is all in dwords, can be found in header.
- * In the case that modulus and exponent are not present in fw, a.k.a truncated
- * image, the length value still appears in header.
- *
- * Driver will do some basic fw size validation based on the following rules:
- *
- * 1. Header, uCode and RSA are must-have components.
- * 2. All firmware components, if they present, are in the sequence illustrated
- *    in the layout table above.
- * 3. Length info of each component can be found in header, in dwords.
- * 4. Modulus and exponent key are not required by driver. They may not appear
- *    in fw. So driver will load a truncated firmware in this case.
- *
- * HuC firmware layout is same as GuC firmware.
- * Only HuC version information is saved in a different way.
- */
-
-struct uc_css_header {
-	u32 module_type;
-	/* header_size includes all non-uCode bits, including css_header, rsa
-	 * key, modulus key and exponent data. */
-	u32 header_size_dw;
-	u32 header_version;
-	u32 module_id;
-	u32 module_vendor;
-	u32 date;
-#define CSS_DATE_DAY			(0xFF << 0)
-#define CSS_DATE_MONTH			(0xFF << 8)
-#define CSS_DATE_YEAR			(0xFFFF << 16)
-	u32 size_dw; /* uCode plus header_size_dw */
-	u32 key_size_dw;
-	u32 modulus_size_dw;
-	u32 exponent_size_dw;
-	u32 time;
-#define CSS_TIME_HOUR			(0xFF << 0)
-#define CSS_DATE_MIN			(0xFF << 8)
-#define CSS_DATE_SEC			(0xFFFF << 16)
-	char username[8];
-	char buildnumber[12];
-	u32 sw_version;
-#define CSS_SW_VERSION_GUC_MAJOR	(0xFF << 16)
-#define CSS_SW_VERSION_GUC_MINOR	(0xFF << 8)
-#define CSS_SW_VERSION_GUC_PATCH	(0xFF << 0)
-#define CSS_SW_VERSION_HUC_MAJOR	(0xFFFF << 16)
-#define CSS_SW_VERSION_HUC_MINOR	(0xFFFF << 0)
-	u32 reserved[14];
-	u32 header_info;
-} __packed;
-
 /* Work item for submitting workloads into work queue of GuC. */
 struct guc_wq_item {
 	u32 header;
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
index 8ce7210907c0..d5cb19b4e5c1 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
@@ -27,6 +27,7 @@
 #include <drm/drm_print.h>
 
 #include "intel_uc_fw.h"
+#include "intel_uc_fw_abi.h"
 #include "i915_drv.h"
 
 /**
diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
new file mode 100644
index 000000000000..3ca535534151
--- /dev/null
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
@@ -0,0 +1,81 @@
+/* SPDX-License-Identifier: MIT */
+/*
+ * Copyright © 2019 Intel Corporation
+ */
+
+#ifndef _INTEL_UC_FW_ABI_H
+#define _INTEL_UC_FW_ABI_H
+
+#include <linux/types.h>
+
+/**
+ * DOC: GuC Firmware Layout
+ *
+ * The GuC firmware layout looks like this:
+ *
+ *     +-------------------------------+
+ *     |         uc_css_header         |
+ *     |                               |
+ *     | contains major/minor version  |
+ *     +-------------------------------+
+ *     |             uCode             |
+ *     +-------------------------------+
+ *     |         RSA signature         |
+ *     +-------------------------------+
+ *     |          modulus key          |
+ *     +-------------------------------+
+ *     |          exponent val         |
+ *     +-------------------------------+
+ *
+ * The firmware may or may not have modulus key and exponent data. The header,
+ * uCode and RSA signature are must-have components that will be used by driver.
+ * Length of each components, which is all in dwords, can be found in header.
+ * In the case that modulus and exponent are not present in fw, a.k.a truncated
+ * image, the length value still appears in header.
+ *
+ * Driver will do some basic fw size validation based on the following rules:
+ *
+ * 1. Header, uCode and RSA are must-have components.
+ * 2. All firmware components, if they present, are in the sequence illustrated
+ *    in the layout table above.
+ * 3. Length info of each component can be found in header, in dwords.
+ * 4. Modulus and exponent key are not required by driver. They may not appear
+ *    in fw. So driver will load a truncated firmware in this case.
+ *
+ * HuC firmware layout is same as GuC firmware.
+ * Only HuC version information is saved in a different way.
+ */
+
+struct uc_css_header {
+	u32 module_type;
+	/* header_size includes all non-uCode bits, including css_header, rsa
+	 * key, modulus key and exponent data. */
+	u32 header_size_dw;
+	u32 header_version;
+	u32 module_id;
+	u32 module_vendor;
+	u32 date;
+#define CSS_DATE_DAY			(0xFF << 0)
+#define CSS_DATE_MONTH			(0xFF << 8)
+#define CSS_DATE_YEAR			(0xFFFF << 16)
+	u32 size_dw; /* uCode plus header_size_dw */
+	u32 key_size_dw;
+	u32 modulus_size_dw;
+	u32 exponent_size_dw;
+	u32 time;
+#define CSS_TIME_HOUR			(0xFF << 0)
+#define CSS_DATE_MIN			(0xFF << 8)
+#define CSS_DATE_SEC			(0xFFFF << 16)
+	char username[8];
+	char buildnumber[12];
+	u32 sw_version;
+#define CSS_SW_VERSION_GUC_MAJOR	(0xFF << 16)
+#define CSS_SW_VERSION_GUC_MINOR	(0xFF << 8)
+#define CSS_SW_VERSION_GUC_PATCH	(0xFF << 0)
+#define CSS_SW_VERSION_HUC_MAJOR	(0xFFFF << 16)
+#define CSS_SW_VERSION_HUC_MINOR	(0xFFFF << 0)
+	u32 reserved[14];
+	u32 header_info;
+} __packed;
+
+#endif /* _INTEL_UC_FW_ABI_H */
-- 
2.19.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [PATCH 3/3] drm/i915/uc: Update drawing for firmware layout
  2019-07-24 17:34 [PATCH 1/3] drm/i915: Fix GuC documentation links Michal Wajdeczko
  2019-07-24 17:34 ` [PATCH 2/3] drm/i915/uc: Move uc firmware layout definitions to dedicated file Michal Wajdeczko
@ 2019-07-24 17:34 ` Michal Wajdeczko
  2019-07-24 17:44   ` Daniele Ceraolo Spurio
  2019-07-24 17:43 ` [PATCH 1/3] drm/i915: Fix GuC documentation links Daniele Ceraolo Spurio
                   ` (3 subsequent siblings)
  5 siblings, 1 reply; 13+ messages in thread
From: Michal Wajdeczko @ 2019-07-24 17:34 UTC (permalink / raw)
  To: intel-gfx

Sphinx was rendering firmware layout as html table, but since
we want to add sizes relations switch to plain text graphics.

Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
---
 drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 25 +++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
index 3ca535534151..e25271aac765 100644
--- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
+++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
@@ -11,21 +11,18 @@
 /**
  * DOC: GuC Firmware Layout
  *
- * The GuC firmware layout looks like this:
+ * The GuC firmware layout looks like this::
  *
- *     +-------------------------------+
- *     |         uc_css_header         |
- *     |                               |
- *     | contains major/minor version  |
- *     +-------------------------------+
- *     |             uCode             |
- *     +-------------------------------+
- *     |         RSA signature         |
- *     +-------------------------------+
- *     |          modulus key          |
- *     +-------------------------------+
- *     |          exponent val         |
- *     +-------------------------------+
+ *      +======================================================================+
+ *      |  Firmware blob                                                       |
+ *      +===============+===============+============+============+============+
+ *      |  CSS header   |     uCode     |    key     |  modulus   |  exponent  |
+ *      +===============+===============+============+============+============+
+ *       <-header size->                 <---header size continued ----------->
+ *       <--- size ----------------------------------------------------------->
+ *                                       <-key size->
+ *                                                    <-mod size->
+ *                                                                 <-exp size->
  *
  * The firmware may or may not have modulus key and exponent data. The header,
  * uCode and RSA signature are must-have components that will be used by driver.
-- 
2.19.2

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply related	[flat|nested] 13+ messages in thread

* Re: [PATCH 1/3] drm/i915: Fix GuC documentation links
  2019-07-24 17:34 [PATCH 1/3] drm/i915: Fix GuC documentation links Michal Wajdeczko
  2019-07-24 17:34 ` [PATCH 2/3] drm/i915/uc: Move uc firmware layout definitions to dedicated file Michal Wajdeczko
  2019-07-24 17:34 ` [PATCH 3/3] drm/i915/uc: Update drawing for firmware layout Michal Wajdeczko
@ 2019-07-24 17:43 ` Daniele Ceraolo Spurio
  2019-07-24 17:51 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/3] " Patchwork
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 13+ messages in thread
From: Daniele Ceraolo Spurio @ 2019-07-24 17:43 UTC (permalink / raw)
  To: Michal Wajdeczko, intel-gfx



On 7/24/19 10:34 AM, Michal Wajdeczko wrote:
> We moved GuC related files to new location but we missed to update
> .rst file with links.
> 
> References: commit 0f261b241d9c ("drm/i915/uc: move GuC and HuC files under gt/uc/")
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>

That's all of them (which surprised me since I expected an entry for HuC 
as well).

Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>

> ---
>   Documentation/gpu/i915.rst | 10 +++++-----
>   1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst
> index c38ef0dda605..c2173d120492 100644
> --- a/Documentation/gpu/i915.rst
> +++ b/Documentation/gpu/i915.rst
> @@ -433,28 +433,28 @@ GuC
>   GuC-specific firmware loader
>   ----------------------------
>   
> -.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_fw.c
> +.. kernel-doc:: drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c
>      :internal:
>   
>   GuC-based command submission
>   ----------------------------
>   
> -.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_submission.c
> +.. kernel-doc:: drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
>      :doc: GuC-based command submission
>   
> -.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_submission.c
> +.. kernel-doc:: drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c
>      :internal:
>   
>   GuC Firmware Layout
>   -------------------
>   
> -.. kernel-doc:: drivers/gpu/drm/i915/intel_guc_fwif.h
> +.. kernel-doc:: drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h
>      :doc: GuC Firmware Layout
>   
>   GuC Address Space
>   -----------------
>   
> -.. kernel-doc:: drivers/gpu/drm/i915/intel_guc.c
> +.. kernel-doc:: drivers/gpu/drm/i915/gt/uc/intel_guc.c
>      :doc: GuC Address Space
>   
>   Tracing
> 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 3/3] drm/i915/uc: Update drawing for firmware layout
  2019-07-24 17:34 ` [PATCH 3/3] drm/i915/uc: Update drawing for firmware layout Michal Wajdeczko
@ 2019-07-24 17:44   ` Daniele Ceraolo Spurio
  2019-07-24 20:09     ` Michal Wajdeczko
  0 siblings, 1 reply; 13+ messages in thread
From: Daniele Ceraolo Spurio @ 2019-07-24 17:44 UTC (permalink / raw)
  To: Michal Wajdeczko, intel-gfx



On 7/24/19 10:34 AM, Michal Wajdeczko wrote:
> Sphinx was rendering firmware layout as html table, but since
> we want to add sizes relations switch to plain text graphics.
> 
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
> ---
>   drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 25 +++++++++-----------
>   1 file changed, 11 insertions(+), 14 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
> index 3ca535534151..e25271aac765 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
> @@ -11,21 +11,18 @@
>   /**
>    * DOC: GuC Firmware Layout
>    *
> - * The GuC firmware layout looks like this:
> + * The GuC firmware layout looks like this::
>    *
> - *     +-------------------------------+
> - *     |         uc_css_header         |
> - *     |                               |
> - *     | contains major/minor version  |
> - *     +-------------------------------+
> - *     |             uCode             |
> - *     +-------------------------------+
> - *     |         RSA signature         |
> - *     +-------------------------------+
> - *     |          modulus key          |
> - *     +-------------------------------+
> - *     |          exponent val         |
> - *     +-------------------------------+
> + *      +======================================================================+
> + *      |  Firmware blob                                                       |
> + *      +===============+===============+============+============+============+
> + *      |  CSS header   |     uCode     |    key     |  modulus   |  exponent  |
> + *      +===============+===============+============+============+============+

What about the RSA?

Daniele

> + *       <-header size->                 <---header size continued ----------->
> + *       <--- size ----------------------------------------------------------->
> + *                                       <-key size->
> + *                                                    <-mod size->
> + *                                                                 <-exp size->
>    *
>    * The firmware may or may not have modulus key and exponent data. The header,
>    * uCode and RSA signature are must-have components that will be used by driver.
> 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 2/3] drm/i915/uc: Move uc firmware layout definitions to dedicated file
  2019-07-24 17:34 ` [PATCH 2/3] drm/i915/uc: Move uc firmware layout definitions to dedicated file Michal Wajdeczko
@ 2019-07-24 17:50   ` Daniele Ceraolo Spurio
  2019-07-24 20:01     ` Michal Wajdeczko
  0 siblings, 1 reply; 13+ messages in thread
From: Daniele Ceraolo Spurio @ 2019-07-24 17:50 UTC (permalink / raw)
  To: Michal Wajdeczko, intel-gfx



On 7/24/19 10:34 AM, Michal Wajdeczko wrote:
> Generic uc firmware layout definitions are unlikely to change and
> are separate to other GuC specific definitions.
> 
> Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>

Keeping things that apply to HuC as well in a generic file seems 
sensible to me.

> ---
>   Documentation/gpu/i915.rst                   |  2 +-
>   drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h  | 70 -----------------
>   drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c     |  1 +
>   drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 81 ++++++++++++++++++++
>   4 files changed, 83 insertions(+), 71 deletions(-)
>   create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
> 
> diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst
> index c2173d120492..366cb7f46d17 100644
> --- a/Documentation/gpu/i915.rst
> +++ b/Documentation/gpu/i915.rst
> @@ -448,7 +448,7 @@ GuC-based command submission
>   GuC Firmware Layout
>   -------------------
>   
> -.. kernel-doc:: drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h
> +.. kernel-doc:: drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>      :doc: GuC Firmware Layout

This is now generic uC firmware layout

>   
>   GuC Address Space
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h b/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h
> index 30cca3a29323..06a9bdfb0faf 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h
> @@ -121,76 +121,6 @@
>   
>   #define GUC_CTL_MAX_DWORDS		(SOFT_SCRATCH_COUNT - 2) /* [1..14] */
>   
> -/**
> - * DOC: GuC Firmware Layout
> - *
> - * The GuC firmware layout looks like this:
> - *
> - *     +-------------------------------+
> - *     |         uc_css_header         |
> - *     |                               |
> - *     | contains major/minor version  |
> - *     +-------------------------------+
> - *     |             uCode             |
> - *     +-------------------------------+
> - *     |         RSA signature         |
> - *     +-------------------------------+
> - *     |          modulus key          |
> - *     +-------------------------------+
> - *     |          exponent val         |
> - *     +-------------------------------+
> - *
> - * The firmware may or may not have modulus key and exponent data. The header,
> - * uCode and RSA signature are must-have components that will be used by driver.
> - * Length of each components, which is all in dwords, can be found in header.
> - * In the case that modulus and exponent are not present in fw, a.k.a truncated
> - * image, the length value still appears in header.
> - *
> - * Driver will do some basic fw size validation based on the following rules:
> - *
> - * 1. Header, uCode and RSA are must-have components.
> - * 2. All firmware components, if they present, are in the sequence illustrated
> - *    in the layout table above.
> - * 3. Length info of each component can be found in header, in dwords.
> - * 4. Modulus and exponent key are not required by driver. They may not appear
> - *    in fw. So driver will load a truncated firmware in this case.
> - *
> - * HuC firmware layout is same as GuC firmware.
> - * Only HuC version information is saved in a different way.
> - */
> -
> -struct uc_css_header {
> -	u32 module_type;
> -	/* header_size includes all non-uCode bits, including css_header, rsa
> -	 * key, modulus key and exponent data. */
> -	u32 header_size_dw;
> -	u32 header_version;
> -	u32 module_id;
> -	u32 module_vendor;
> -	u32 date;
> -#define CSS_DATE_DAY			(0xFF << 0)
> -#define CSS_DATE_MONTH			(0xFF << 8)
> -#define CSS_DATE_YEAR			(0xFFFF << 16)
> -	u32 size_dw; /* uCode plus header_size_dw */
> -	u32 key_size_dw;
> -	u32 modulus_size_dw;
> -	u32 exponent_size_dw;
> -	u32 time;
> -#define CSS_TIME_HOUR			(0xFF << 0)
> -#define CSS_DATE_MIN			(0xFF << 8)
> -#define CSS_DATE_SEC			(0xFFFF << 16)
> -	char username[8];
> -	char buildnumber[12];
> -	u32 sw_version;
> -#define CSS_SW_VERSION_GUC_MAJOR	(0xFF << 16)
> -#define CSS_SW_VERSION_GUC_MINOR	(0xFF << 8)
> -#define CSS_SW_VERSION_GUC_PATCH	(0xFF << 0)
> -#define CSS_SW_VERSION_HUC_MAJOR	(0xFFFF << 16)
> -#define CSS_SW_VERSION_HUC_MINOR	(0xFFFF << 0)
> -	u32 reserved[14];
> -	u32 header_info;
> -} __packed;
> -
>   /* Work item for submitting workloads into work queue of GuC. */
>   struct guc_wq_item {
>   	u32 header;
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> index 8ce7210907c0..d5cb19b4e5c1 100644
> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
> @@ -27,6 +27,7 @@
>   #include <drm/drm_print.h>
>   
>   #include "intel_uc_fw.h"
> +#include "intel_uc_fw_abi.h"
>   #include "i915_drv.h"
>   
>   /**
> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
> new file mode 100644
> index 000000000000..3ca535534151
> --- /dev/null
> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
> @@ -0,0 +1,81 @@
> +/* SPDX-License-Identifier: MIT */
> +/*
> + * Copyright © 2019 Intel Corporation
> + */
> +
> +#ifndef _INTEL_UC_FW_ABI_H
> +#define _INTEL_UC_FW_ABI_H
> +
> +#include <linux/types.h>
> +
> +/**
> + * DOC: GuC Firmware Layout
> + *
> + * The GuC firmware layout looks like this:

same here, s/GuC/uC.

> + *
> + *     +-------------------------------+
> + *     |         uc_css_header         |
> + *     |                               |
> + *     | contains major/minor version  |
> + *     +-------------------------------+
> + *     |             uCode             |
> + *     +-------------------------------+
> + *     |         RSA signature         |
> + *     +-------------------------------+
> + *     |          modulus key          |
> + *     +-------------------------------+
> + *     |          exponent val         |
> + *     +-------------------------------+
> + *
> + * The firmware may or may not have modulus key and exponent data. The header,
> + * uCode and RSA signature are must-have components that will be used by driver.
> + * Length of each components, which is all in dwords, can be found in header.
> + * In the case that modulus and exponent are not present in fw, a.k.a truncated
> + * image, the length value still appears in header.
> + *
> + * Driver will do some basic fw size validation based on the following rules:
> + *
> + * 1. Header, uCode and RSA are must-have components.
> + * 2. All firmware components, if they present, are in the sequence illustrated
> + *    in the layout table above.
> + * 3. Length info of each component can be found in header, in dwords.
> + * 4. Modulus and exponent key are not required by driver. They may not appear
> + *    in fw. So driver will load a truncated firmware in this case.
> + *
> + * HuC firmware layout is same as GuC firmware.
> + * Only HuC version information is saved in a different way.

And reword this as something like: "The only difference between GuC and 
HuC firmwares is how the version information is saved"

With that:

Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>

Daniele

> + */
> +
> +struct uc_css_header {
> +	u32 module_type;
> +	/* header_size includes all non-uCode bits, including css_header, rsa
> +	 * key, modulus key and exponent data. */
> +	u32 header_size_dw;
> +	u32 header_version;
> +	u32 module_id;
> +	u32 module_vendor;
> +	u32 date;
> +#define CSS_DATE_DAY			(0xFF << 0)
> +#define CSS_DATE_MONTH			(0xFF << 8)
> +#define CSS_DATE_YEAR			(0xFFFF << 16)
> +	u32 size_dw; /* uCode plus header_size_dw */
> +	u32 key_size_dw;
> +	u32 modulus_size_dw;
> +	u32 exponent_size_dw;
> +	u32 time;
> +#define CSS_TIME_HOUR			(0xFF << 0)
> +#define CSS_DATE_MIN			(0xFF << 8)
> +#define CSS_DATE_SEC			(0xFFFF << 16)
> +	char username[8];
> +	char buildnumber[12];
> +	u32 sw_version;
> +#define CSS_SW_VERSION_GUC_MAJOR	(0xFF << 16)
> +#define CSS_SW_VERSION_GUC_MINOR	(0xFF << 8)
> +#define CSS_SW_VERSION_GUC_PATCH	(0xFF << 0)
> +#define CSS_SW_VERSION_HUC_MAJOR	(0xFFFF << 16)
> +#define CSS_SW_VERSION_HUC_MINOR	(0xFFFF << 0)
> +	u32 reserved[14];
> +	u32 header_info;
> +} __packed;
> +
> +#endif /* _INTEL_UC_FW_ABI_H */
> 
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 13+ messages in thread

* ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/3] drm/i915: Fix GuC documentation links
  2019-07-24 17:34 [PATCH 1/3] drm/i915: Fix GuC documentation links Michal Wajdeczko
                   ` (2 preceding siblings ...)
  2019-07-24 17:43 ` [PATCH 1/3] drm/i915: Fix GuC documentation links Daniele Ceraolo Spurio
@ 2019-07-24 17:51 ` Patchwork
  2019-07-24 19:49 ` ✓ Fi.CI.BAT: success " Patchwork
  2019-07-24 21:56 ` ✓ Fi.CI.IGT: " Patchwork
  5 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2019-07-24 17:51 UTC (permalink / raw)
  To: Michal Wajdeczko; +Cc: intel-gfx

== Series Details ==

Series: series starting with [1/3] drm/i915: Fix GuC documentation links
URL   : https://patchwork.freedesktop.org/series/64190/
State : warning

== Summary ==

$ dim checkpatch origin/drm-tip
b6534971a681 drm/i915: Fix GuC documentation links
-:9: WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line)
#9: 
References: commit 0f261b241d9c ("drm/i915/uc: move GuC and HuC files under gt/uc/")

total: 0 errors, 1 warnings, 0 checks, 33 lines checked
482ab78bcf71 drm/i915/uc: Move uc firmware layout definitions to dedicated file
-:120: WARNING:FILE_PATH_CHANGES: added, moved or deleted file(s), does MAINTAINERS need updating?
#120: 
new file mode 100644

-:176: WARNING:BLOCK_COMMENT_STYLE: Block comments use a trailing */ on a separate line
#176: FILE: drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h:52:
+	 * key, modulus key and exponent data. */

total: 0 errors, 2 warnings, 0 checks, 172 lines checked
d4bd5ea797ae drm/i915/uc: Update drawing for firmware layout

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 13+ messages in thread

* ✓ Fi.CI.BAT: success for series starting with [1/3] drm/i915: Fix GuC documentation links
  2019-07-24 17:34 [PATCH 1/3] drm/i915: Fix GuC documentation links Michal Wajdeczko
                   ` (3 preceding siblings ...)
  2019-07-24 17:51 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/3] " Patchwork
@ 2019-07-24 19:49 ` Patchwork
  2019-07-24 21:56 ` ✓ Fi.CI.IGT: " Patchwork
  5 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2019-07-24 19:49 UTC (permalink / raw)
  To: Michal Wajdeczko; +Cc: intel-gfx

== Series Details ==

Series: series starting with [1/3] drm/i915: Fix GuC documentation links
URL   : https://patchwork.freedesktop.org/series/64190/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_6545 -> Patchwork_13740
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  External URL: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/

Known issues
------------

  Here are the changes found in Patchwork_13740 that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@gem_ctx_create@basic:
    - fi-icl-u3:          [PASS][1] -> [DMESG-WARN][2] ([fdo#107724])
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/fi-icl-u3/igt@gem_ctx_create@basic.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/fi-icl-u3/igt@gem_ctx_create@basic.html

  * igt@gem_exec_suspend@basic-s4-devices:
    - fi-kbl-7500u:       [PASS][3] -> [DMESG-WARN][4] ([fdo#105128] / [fdo#107139])
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/fi-kbl-7500u/igt@gem_exec_suspend@basic-s4-devices.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/fi-kbl-7500u/igt@gem_exec_suspend@basic-s4-devices.html

  * igt@i915_module_load@reload:
    - fi-blb-e6850:       [PASS][5] -> [INCOMPLETE][6] ([fdo#107718])
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/fi-blb-e6850/igt@i915_module_load@reload.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/fi-blb-e6850/igt@i915_module_load@reload.html

  * igt@prime_vgem@basic-fence-flip:
    - fi-kbl-7500u:       [PASS][7] -> [SKIP][8] ([fdo#109271]) +23 similar issues
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/fi-kbl-7500u/igt@prime_vgem@basic-fence-flip.html
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/fi-kbl-7500u/igt@prime_vgem@basic-fence-flip.html

  
#### Possible fixes ####

  * igt@gem_ctx_create@basic-files:
    - fi-icl-u2:          [INCOMPLETE][9] ([fdo#107713] / [fdo#109100]) -> [PASS][10]
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/fi-icl-u2/igt@gem_ctx_create@basic-files.html
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/fi-icl-u2/igt@gem_ctx_create@basic-files.html

  * igt@i915_selftest@live_hangcheck:
    - fi-kbl-guc:         [INCOMPLETE][11] ([fdo#108744]) -> [PASS][12]
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/fi-kbl-guc/igt@i915_selftest@live_hangcheck.html
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/fi-kbl-guc/igt@i915_selftest@live_hangcheck.html

  * igt@kms_chamelium@common-hpd-after-suspend:
    - fi-kbl-7567u:       [WARN][13] ([fdo#109380]) -> [PASS][14]
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/fi-kbl-7567u/igt@kms_chamelium@common-hpd-after-suspend.html
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/fi-kbl-7567u/igt@kms_chamelium@common-hpd-after-suspend.html

  * igt@kms_frontbuffer_tracking@basic:
    - fi-icl-u3:          [FAIL][15] ([fdo#103167]) -> [PASS][16]
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/fi-icl-u3/igt@kms_frontbuffer_tracking@basic.html
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/fi-icl-u3/igt@kms_frontbuffer_tracking@basic.html
    - {fi-icl-u4}:        [FAIL][17] ([fdo#103167]) -> [PASS][18]
   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/fi-icl-u4/igt@kms_frontbuffer_tracking@basic.html
   [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/fi-icl-u4/igt@kms_frontbuffer_tracking@basic.html

  * igt@kms_pipe_crc_basic@read-crc-pipe-c:
    - fi-kbl-7567u:       [SKIP][19] ([fdo#109271]) -> [PASS][20] +23 similar issues
   [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/fi-kbl-7567u/igt@kms_pipe_crc_basic@read-crc-pipe-c.html
   [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/fi-kbl-7567u/igt@kms_pipe_crc_basic@read-crc-pipe-c.html

  
  {name}: This element is suppressed. This means it is ignored when computing
          the status of the difference (SUCCESS, WARNING, or FAILURE).

  [fdo#102505]: https://bugs.freedesktop.org/show_bug.cgi?id=102505
  [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
  [fdo#105128]: https://bugs.freedesktop.org/show_bug.cgi?id=105128
  [fdo#107139]: https://bugs.freedesktop.org/show_bug.cgi?id=107139
  [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
  [fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
  [fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
  [fdo#108744]: https://bugs.freedesktop.org/show_bug.cgi?id=108744
  [fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
  [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
  [fdo#109380]: https://bugs.freedesktop.org/show_bug.cgi?id=109380
  [fdo#109485]: https://bugs.freedesktop.org/show_bug.cgi?id=109485
  [fdo#111045]: https://bugs.freedesktop.org/show_bug.cgi?id=111045
  [fdo#111046 ]: https://bugs.freedesktop.org/show_bug.cgi?id=111046 
  [fdo#111049]: https://bugs.freedesktop.org/show_bug.cgi?id=111049


Participating hosts (52 -> 42)
------------------------------

  Additional (1): fi-skl-gvtdvm 
  Missing    (11): fi-kbl-soraka fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-cfl-8109u fi-icl-y fi-bdw-samus fi-icl-guc fi-byt-clapper fi-skl-6600u 


Build changes
-------------

  * CI: CI-20190529 -> None
  * Linux: CI_DRM_6545 -> Patchwork_13740

  CI-20190529: 20190529
  CI_DRM_6545: a6efe73f1e086c7935d56b08342f9e1c5565fcf3 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_5109: e5fd509e16ec649436be31f38eaa5b85cb7f72f1 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_13740: d4bd5ea797ae5a564a5d3e6f0f90c08c10a5c229 @ git://anongit.freedesktop.org/gfx-ci/linux


== Linux commits ==

d4bd5ea797ae drm/i915/uc: Update drawing for firmware layout
482ab78bcf71 drm/i915/uc: Move uc firmware layout definitions to dedicated file
b6534971a681 drm/i915: Fix GuC documentation links

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 2/3] drm/i915/uc: Move uc firmware layout definitions to dedicated file
  2019-07-24 17:50   ` Daniele Ceraolo Spurio
@ 2019-07-24 20:01     ` Michal Wajdeczko
  2019-07-24 20:05       ` Daniele Ceraolo Spurio
  0 siblings, 1 reply; 13+ messages in thread
From: Michal Wajdeczko @ 2019-07-24 20:01 UTC (permalink / raw)
  To: intel-gfx, Daniele Ceraolo Spurio

On Wed, 24 Jul 2019 19:50:37 +0200, Daniele Ceraolo Spurio  
<daniele.ceraolospurio@intel.com> wrote:

>
>
> On 7/24/19 10:34 AM, Michal Wajdeczko wrote:
>> Generic uc firmware layout definitions are unlikely to change and
>> are separate to other GuC specific definitions.
>>  Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
>> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
>
> Keeping things that apply to HuC as well in a generic file seems  
> sensible to me.
>
>> ---
>>   Documentation/gpu/i915.rst                   |  2 +-
>>   drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h  | 70 -----------------
>>   drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c     |  1 +
>>   drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 81 ++++++++++++++++++++
>>   4 files changed, 83 insertions(+), 71 deletions(-)
>>   create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>>  diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst
>> index c2173d120492..366cb7f46d17 100644
>> --- a/Documentation/gpu/i915.rst
>> +++ b/Documentation/gpu/i915.rst
>> @@ -448,7 +448,7 @@ GuC-based command submission
>>   GuC Firmware Layout
>>   -------------------
>>   -.. kernel-doc:: drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h
>> +.. kernel-doc:: drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>>      :doc: GuC Firmware Layout
>
> This is now generic uC firmware layout
>
>>     GuC Address Space
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h  
>> b/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h
>> index 30cca3a29323..06a9bdfb0faf 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h
>> @@ -121,76 +121,6 @@
>>     #define GUC_CTL_MAX_DWORDS		(SOFT_SCRATCH_COUNT - 2) /* [1..14] */
>>   -/**
>> - * DOC: GuC Firmware Layout
>> - *
>> - * The GuC firmware layout looks like this:
>> - *
>> - *     +-------------------------------+
>> - *     |         uc_css_header         |
>> - *     |                               |
>> - *     | contains major/minor version  |
>> - *     +-------------------------------+
>> - *     |             uCode             |
>> - *     +-------------------------------+
>> - *     |         RSA signature         |
>> - *     +-------------------------------+
>> - *     |          modulus key          |
>> - *     +-------------------------------+
>> - *     |          exponent val         |
>> - *     +-------------------------------+
>> - *
>> - * The firmware may or may not have modulus key and exponent data. The  
>> header,
>> - * uCode and RSA signature are must-have components that will be used  
>> by driver.
>> - * Length of each components, which is all in dwords, can be found in  
>> header.
>> - * In the case that modulus and exponent are not present in fw, a.k.a  
>> truncated
>> - * image, the length value still appears in header.
>> - *
>> - * Driver will do some basic fw size validation based on the following  
>> rules:
>> - *
>> - * 1. Header, uCode and RSA are must-have components.
>> - * 2. All firmware components, if they present, are in the sequence  
>> illustrated
>> - *    in the layout table above.
>> - * 3. Length info of each component can be found in header, in dwords.
>> - * 4. Modulus and exponent key are not required by driver. They may  
>> not appear
>> - *    in fw. So driver will load a truncated firmware in this case.
>> - *
>> - * HuC firmware layout is same as GuC firmware.
>> - * Only HuC version information is saved in a different way.
>> - */
>> -
>> -struct uc_css_header {
>> -	u32 module_type;
>> -	/* header_size includes all non-uCode bits, including css_header, rsa
>> -	 * key, modulus key and exponent data. */
>> -	u32 header_size_dw;
>> -	u32 header_version;
>> -	u32 module_id;
>> -	u32 module_vendor;
>> -	u32 date;
>> -#define CSS_DATE_DAY			(0xFF << 0)
>> -#define CSS_DATE_MONTH			(0xFF << 8)
>> -#define CSS_DATE_YEAR			(0xFFFF << 16)
>> -	u32 size_dw; /* uCode plus header_size_dw */
>> -	u32 key_size_dw;
>> -	u32 modulus_size_dw;
>> -	u32 exponent_size_dw;
>> -	u32 time;
>> -#define CSS_TIME_HOUR			(0xFF << 0)
>> -#define CSS_DATE_MIN			(0xFF << 8)
>> -#define CSS_DATE_SEC			(0xFFFF << 16)
>> -	char username[8];
>> -	char buildnumber[12];
>> -	u32 sw_version;
>> -#define CSS_SW_VERSION_GUC_MAJOR	(0xFF << 16)
>> -#define CSS_SW_VERSION_GUC_MINOR	(0xFF << 8)
>> -#define CSS_SW_VERSION_GUC_PATCH	(0xFF << 0)
>> -#define CSS_SW_VERSION_HUC_MAJOR	(0xFFFF << 16)
>> -#define CSS_SW_VERSION_HUC_MINOR	(0xFFFF << 0)
>> -	u32 reserved[14];
>> -	u32 header_info;
>> -} __packed;
>> -
>>   /* Work item for submitting workloads into work queue of GuC. */
>>   struct guc_wq_item {
>>   	u32 header;
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c  
>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>> index 8ce7210907c0..d5cb19b4e5c1 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>> @@ -27,6 +27,7 @@
>>   #include <drm/drm_print.h>
>>     #include "intel_uc_fw.h"
>> +#include "intel_uc_fw_abi.h"
>>   #include "i915_drv.h"
>>     /**
>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h  
>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>> new file mode 100644
>> index 000000000000..3ca535534151
>> --- /dev/null
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>> @@ -0,0 +1,81 @@
>> +/* SPDX-License-Identifier: MIT */
>> +/*
>> + * Copyright © 2019 Intel Corporation
>> + */
>> +
>> +#ifndef _INTEL_UC_FW_ABI_H
>> +#define _INTEL_UC_FW_ABI_H
>> +
>> +#include <linux/types.h>
>> +
>> +/**
>> + * DOC: GuC Firmware Layout
>> + *
>> + * The GuC firmware layout looks like this:
>
> same here, s/GuC/uC.
>
>> + *
>> + *     +-------------------------------+
>> + *     |         uc_css_header         |
>> + *     |                               |
>> + *     | contains major/minor version  |
>> + *     +-------------------------------+
>> + *     |             uCode             |
>> + *     +-------------------------------+
>> + *     |         RSA signature         |
>> + *     +-------------------------------+
>> + *     |          modulus key          |
>> + *     +-------------------------------+
>> + *     |          exponent val         |
>> + *     +-------------------------------+
>> + *
>> + * The firmware may or may not have modulus key and exponent data. The  
>> header,
>> + * uCode and RSA signature are must-have components that will be used  
>> by driver.
>> + * Length of each components, which is all in dwords, can be found in  
>> header.
>> + * In the case that modulus and exponent are not present in fw, a.k.a  
>> truncated
>> + * image, the length value still appears in header.
>> + *
>> + * Driver will do some basic fw size validation based on the following  
>> rules:
>> + *
>> + * 1. Header, uCode and RSA are must-have components.
>> + * 2. All firmware components, if they present, are in the sequence  
>> illustrated
>> + *    in the layout table above.
>> + * 3. Length info of each component can be found in header, in dwords.
>> + * 4. Modulus and exponent key are not required by driver. They may  
>> not appear
>> + *    in fw. So driver will load a truncated firmware in this case.
>> + *
>> + * HuC firmware layout is same as GuC firmware.
>> + * Only HuC version information is saved in a different way.
>
> And reword this as something like: "The only difference between GuC and  
> HuC firmwares is how the version information is saved"
>
> With that:

As aim of this patch was just to move definition as-is from one place
to the other, can I make all above fixups in other patch ?

Note that changing "DOC" tag will require corresponding changes in .rst
and I don't want to that in here

>
> Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
>
> Daniele
>
>> + */
>> +
>> +struct uc_css_header {
>> +	u32 module_type;
>> +	/* header_size includes all non-uCode bits, including css_header, rsa
>> +	 * key, modulus key and exponent data. */
>> +	u32 header_size_dw;
>> +	u32 header_version;
>> +	u32 module_id;
>> +	u32 module_vendor;
>> +	u32 date;
>> +#define CSS_DATE_DAY			(0xFF << 0)
>> +#define CSS_DATE_MONTH			(0xFF << 8)
>> +#define CSS_DATE_YEAR			(0xFFFF << 16)
>> +	u32 size_dw; /* uCode plus header_size_dw */
>> +	u32 key_size_dw;
>> +	u32 modulus_size_dw;
>> +	u32 exponent_size_dw;
>> +	u32 time;
>> +#define CSS_TIME_HOUR			(0xFF << 0)
>> +#define CSS_DATE_MIN			(0xFF << 8)
>> +#define CSS_DATE_SEC			(0xFFFF << 16)
>> +	char username[8];
>> +	char buildnumber[12];
>> +	u32 sw_version;
>> +#define CSS_SW_VERSION_GUC_MAJOR	(0xFF << 16)
>> +#define CSS_SW_VERSION_GUC_MINOR	(0xFF << 8)
>> +#define CSS_SW_VERSION_GUC_PATCH	(0xFF << 0)
>> +#define CSS_SW_VERSION_HUC_MAJOR	(0xFFFF << 16)
>> +#define CSS_SW_VERSION_HUC_MINOR	(0xFFFF << 0)
>> +	u32 reserved[14];
>> +	u32 header_info;
>> +} __packed;
>> +
>> +#endif /* _INTEL_UC_FW_ABI_H */
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 2/3] drm/i915/uc: Move uc firmware layout definitions to dedicated file
  2019-07-24 20:01     ` Michal Wajdeczko
@ 2019-07-24 20:05       ` Daniele Ceraolo Spurio
  0 siblings, 0 replies; 13+ messages in thread
From: Daniele Ceraolo Spurio @ 2019-07-24 20:05 UTC (permalink / raw)
  To: Michal Wajdeczko, intel-gfx



On 7/24/19 1:01 PM, Michal Wajdeczko wrote:
> On Wed, 24 Jul 2019 19:50:37 +0200, Daniele Ceraolo Spurio 
> <daniele.ceraolospurio@intel.com> wrote:
> 
>>
>>
>> On 7/24/19 10:34 AM, Michal Wajdeczko wrote:
>>> Generic uc firmware layout definitions are unlikely to change and
>>> are separate to other GuC specific definitions.
>>>  Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
>>> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
>>
>> Keeping things that apply to HuC as well in a generic file seems 
>> sensible to me.
>>
>>> ---
>>>   Documentation/gpu/i915.rst                   |  2 +-
>>>   drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h  | 70 -----------------
>>>   drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c     |  1 +
>>>   drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 81 ++++++++++++++++++++
>>>   4 files changed, 83 insertions(+), 71 deletions(-)
>>>   create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>>>  diff --git a/Documentation/gpu/i915.rst b/Documentation/gpu/i915.rst
>>> index c2173d120492..366cb7f46d17 100644
>>> --- a/Documentation/gpu/i915.rst
>>> +++ b/Documentation/gpu/i915.rst
>>> @@ -448,7 +448,7 @@ GuC-based command submission
>>>   GuC Firmware Layout
>>>   -------------------
>>>   -.. kernel-doc:: drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h
>>> +.. kernel-doc:: drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>>>      :doc: GuC Firmware Layout
>>
>> This is now generic uC firmware layout
>>
>>>     GuC Address Space
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h 
>>> b/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h
>>> index 30cca3a29323..06a9bdfb0faf 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h
>>> @@ -121,76 +121,6 @@
>>>     #define GUC_CTL_MAX_DWORDS        (SOFT_SCRATCH_COUNT - 2) /* 
>>> [1..14] */
>>>   -/**
>>> - * DOC: GuC Firmware Layout
>>> - *
>>> - * The GuC firmware layout looks like this:
>>> - *
>>> - *     +-------------------------------+
>>> - *     |         uc_css_header         |
>>> - *     |                               |
>>> - *     | contains major/minor version  |
>>> - *     +-------------------------------+
>>> - *     |             uCode             |
>>> - *     +-------------------------------+
>>> - *     |         RSA signature         |
>>> - *     +-------------------------------+
>>> - *     |          modulus key          |
>>> - *     +-------------------------------+
>>> - *     |          exponent val         |
>>> - *     +-------------------------------+
>>> - *
>>> - * The firmware may or may not have modulus key and exponent data. 
>>> The header,
>>> - * uCode and RSA signature are must-have components that will be 
>>> used by driver.
>>> - * Length of each components, which is all in dwords, can be found 
>>> in header.
>>> - * In the case that modulus and exponent are not present in fw, 
>>> a.k.a truncated
>>> - * image, the length value still appears in header.
>>> - *
>>> - * Driver will do some basic fw size validation based on the 
>>> following rules:
>>> - *
>>> - * 1. Header, uCode and RSA are must-have components.
>>> - * 2. All firmware components, if they present, are in the sequence 
>>> illustrated
>>> - *    in the layout table above.
>>> - * 3. Length info of each component can be found in header, in dwords.
>>> - * 4. Modulus and exponent key are not required by driver. They may 
>>> not appear
>>> - *    in fw. So driver will load a truncated firmware in this case.
>>> - *
>>> - * HuC firmware layout is same as GuC firmware.
>>> - * Only HuC version information is saved in a different way.
>>> - */
>>> -
>>> -struct uc_css_header {
>>> -    u32 module_type;
>>> -    /* header_size includes all non-uCode bits, including 
>>> css_header, rsa
>>> -     * key, modulus key and exponent data. */
>>> -    u32 header_size_dw;
>>> -    u32 header_version;
>>> -    u32 module_id;
>>> -    u32 module_vendor;
>>> -    u32 date;
>>> -#define CSS_DATE_DAY            (0xFF << 0)
>>> -#define CSS_DATE_MONTH            (0xFF << 8)
>>> -#define CSS_DATE_YEAR            (0xFFFF << 16)
>>> -    u32 size_dw; /* uCode plus header_size_dw */
>>> -    u32 key_size_dw;
>>> -    u32 modulus_size_dw;
>>> -    u32 exponent_size_dw;
>>> -    u32 time;
>>> -#define CSS_TIME_HOUR            (0xFF << 0)
>>> -#define CSS_DATE_MIN            (0xFF << 8)
>>> -#define CSS_DATE_SEC            (0xFFFF << 16)
>>> -    char username[8];
>>> -    char buildnumber[12];
>>> -    u32 sw_version;
>>> -#define CSS_SW_VERSION_GUC_MAJOR    (0xFF << 16)
>>> -#define CSS_SW_VERSION_GUC_MINOR    (0xFF << 8)
>>> -#define CSS_SW_VERSION_GUC_PATCH    (0xFF << 0)
>>> -#define CSS_SW_VERSION_HUC_MAJOR    (0xFFFF << 16)
>>> -#define CSS_SW_VERSION_HUC_MINOR    (0xFFFF << 0)
>>> -    u32 reserved[14];
>>> -    u32 header_info;
>>> -} __packed;
>>> -
>>>   /* Work item for submitting workloads into work queue of GuC. */
>>>   struct guc_wq_item {
>>>       u32 header;
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c 
>>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>> index 8ce7210907c0..d5cb19b4e5c1 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c
>>> @@ -27,6 +27,7 @@
>>>   #include <drm/drm_print.h>
>>>     #include "intel_uc_fw.h"
>>> +#include "intel_uc_fw_abi.h"
>>>   #include "i915_drv.h"
>>>     /**
>>> diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h 
>>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>>> new file mode 100644
>>> index 000000000000..3ca535534151
>>> --- /dev/null
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>>> @@ -0,0 +1,81 @@
>>> +/* SPDX-License-Identifier: MIT */
>>> +/*
>>> + * Copyright © 2019 Intel Corporation
>>> + */
>>> +
>>> +#ifndef _INTEL_UC_FW_ABI_H
>>> +#define _INTEL_UC_FW_ABI_H
>>> +
>>> +#include <linux/types.h>
>>> +
>>> +/**
>>> + * DOC: GuC Firmware Layout
>>> + *
>>> + * The GuC firmware layout looks like this:
>>
>> same here, s/GuC/uC.
>>
>>> + *
>>> + *     +-------------------------------+
>>> + *     |         uc_css_header         |
>>> + *     |                               |
>>> + *     | contains major/minor version  |
>>> + *     +-------------------------------+
>>> + *     |             uCode             |
>>> + *     +-------------------------------+
>>> + *     |         RSA signature         |
>>> + *     +-------------------------------+
>>> + *     |          modulus key          |
>>> + *     +-------------------------------+
>>> + *     |          exponent val         |
>>> + *     +-------------------------------+
>>> + *
>>> + * The firmware may or may not have modulus key and exponent data. 
>>> The header,
>>> + * uCode and RSA signature are must-have components that will be 
>>> used by driver.
>>> + * Length of each components, which is all in dwords, can be found 
>>> in header.
>>> + * In the case that modulus and exponent are not present in fw, 
>>> a.k.a truncated
>>> + * image, the length value still appears in header.
>>> + *
>>> + * Driver will do some basic fw size validation based on the 
>>> following rules:
>>> + *
>>> + * 1. Header, uCode and RSA are must-have components.
>>> + * 2. All firmware components, if they present, are in the sequence 
>>> illustrated
>>> + *    in the layout table above.
>>> + * 3. Length info of each component can be found in header, in dwords.
>>> + * 4. Modulus and exponent key are not required by driver. They may 
>>> not appear
>>> + *    in fw. So driver will load a truncated firmware in this case.
>>> + *
>>> + * HuC firmware layout is same as GuC firmware.
>>> + * Only HuC version information is saved in a different way.
>>
>> And reword this as something like: "The only difference between GuC 
>> and HuC firmwares is how the version information is saved"
>>
>> With that:
> 
> As aim of this patch was just to move definition as-is from one place
> to the other, can I make all above fixups in other patch ?
> 
> Note that changing "DOC" tag will require corresponding changes in .rst
> and I don't want to that in here

Having the changes in a new patch in the series works for me. I'd prefer 
to have them before the move but not a blocker.

Daniele

> 
>>
>> Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
>>
>> Daniele
>>
>>> + */
>>> +
>>> +struct uc_css_header {
>>> +    u32 module_type;
>>> +    /* header_size includes all non-uCode bits, including 
>>> css_header, rsa
>>> +     * key, modulus key and exponent data. */
>>> +    u32 header_size_dw;
>>> +    u32 header_version;
>>> +    u32 module_id;
>>> +    u32 module_vendor;
>>> +    u32 date;
>>> +#define CSS_DATE_DAY            (0xFF << 0)
>>> +#define CSS_DATE_MONTH            (0xFF << 8)
>>> +#define CSS_DATE_YEAR            (0xFFFF << 16)
>>> +    u32 size_dw; /* uCode plus header_size_dw */
>>> +    u32 key_size_dw;
>>> +    u32 modulus_size_dw;
>>> +    u32 exponent_size_dw;
>>> +    u32 time;
>>> +#define CSS_TIME_HOUR            (0xFF << 0)
>>> +#define CSS_DATE_MIN            (0xFF << 8)
>>> +#define CSS_DATE_SEC            (0xFFFF << 16)
>>> +    char username[8];
>>> +    char buildnumber[12];
>>> +    u32 sw_version;
>>> +#define CSS_SW_VERSION_GUC_MAJOR    (0xFF << 16)
>>> +#define CSS_SW_VERSION_GUC_MINOR    (0xFF << 8)
>>> +#define CSS_SW_VERSION_GUC_PATCH    (0xFF << 0)
>>> +#define CSS_SW_VERSION_HUC_MAJOR    (0xFFFF << 16)
>>> +#define CSS_SW_VERSION_HUC_MINOR    (0xFFFF << 0)
>>> +    u32 reserved[14];
>>> +    u32 header_info;
>>> +} __packed;
>>> +
>>> +#endif /* _INTEL_UC_FW_ABI_H */
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 3/3] drm/i915/uc: Update drawing for firmware layout
  2019-07-24 17:44   ` Daniele Ceraolo Spurio
@ 2019-07-24 20:09     ` Michal Wajdeczko
  2019-07-24 20:11       ` Daniele Ceraolo Spurio
  0 siblings, 1 reply; 13+ messages in thread
From: Michal Wajdeczko @ 2019-07-24 20:09 UTC (permalink / raw)
  To: intel-gfx, Daniele Ceraolo Spurio

On Wed, 24 Jul 2019 19:44:46 +0200, Daniele Ceraolo Spurio  
<daniele.ceraolospurio@intel.com> wrote:

>
>
> On 7/24/19 10:34 AM, Michal Wajdeczko wrote:
>> Sphinx was rendering firmware layout as html table, but since
>> we want to add sizes relations switch to plain text graphics.
>>  Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
>> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
>> ---
>>   drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 25 +++++++++-----------
>>   1 file changed, 11 insertions(+), 14 deletions(-)
>>  diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h  
>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>> index 3ca535534151..e25271aac765 100644
>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>> @@ -11,21 +11,18 @@
>>   /**
>>    * DOC: GuC Firmware Layout
>>    *
>> - * The GuC firmware layout looks like this:
>> + * The GuC firmware layout looks like this::
>>    *
>> - *     +-------------------------------+
>> - *     |         uc_css_header         |
>> - *     |                               |
>> - *     | contains major/minor version  |
>> - *     +-------------------------------+
>> - *     |             uCode             |
>> - *     +-------------------------------+
>> - *     |         RSA signature         |
>> - *     +-------------------------------+
>> - *     |          modulus key          |
>> - *     +-------------------------------+
>> - *     |          exponent val         |
>> - *     +-------------------------------+
>> + *       
>> +======================================================================+
>> + *      |  Firmware  
>> blob                                                       |
>> + *       
>> +===============+===============+============+============+============+
>> + *      |  CSS header   |     uCode     |    key     |  modulus   |   
>> exponent  |
>> + *       
>> +===============+===============+============+============+============+
>
> What about the RSA?

key == RSA key == RSA signature

I followed notation from our header definition which uses "key_size"
but maybe it was too brave. What about "RSA key" to have a match ?

>
> Daniele
>
>> + *       <-header size->                 <---header size continued  
>> ----------->
>> + *       <--- size  
>> ----------------------------------------------------------->
>> + *                                       <-key size->
>> + *                                                    <-mod size->
>> + *                                                                  
>> <-exp size->
>>    *
>>    * The firmware may or may not have modulus key and exponent data.  
>> The header,
>>    * uCode and RSA signature are must-have components that will be used  
>> by driver.
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 13+ messages in thread

* Re: [PATCH 3/3] drm/i915/uc: Update drawing for firmware layout
  2019-07-24 20:09     ` Michal Wajdeczko
@ 2019-07-24 20:11       ` Daniele Ceraolo Spurio
  0 siblings, 0 replies; 13+ messages in thread
From: Daniele Ceraolo Spurio @ 2019-07-24 20:11 UTC (permalink / raw)
  To: Michal Wajdeczko, intel-gfx



On 7/24/19 1:09 PM, Michal Wajdeczko wrote:
> On Wed, 24 Jul 2019 19:44:46 +0200, Daniele Ceraolo Spurio 
> <daniele.ceraolospurio@intel.com> wrote:
> 
>>
>>
>> On 7/24/19 10:34 AM, Michal Wajdeczko wrote:
>>> Sphinx was rendering firmware layout as html table, but since
>>> we want to add sizes relations switch to plain text graphics.
>>>  Signed-off-by: Michal Wajdeczko <michal.wajdeczko@intel.com>
>>> Cc: Daniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
>>> ---
>>>   drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 25 +++++++++-----------
>>>   1 file changed, 11 insertions(+), 14 deletions(-)
>>>  diff --git a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h 
>>> b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>>> index 3ca535534151..e25271aac765 100644
>>> --- a/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>>> +++ b/drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h
>>> @@ -11,21 +11,18 @@
>>>   /**
>>>    * DOC: GuC Firmware Layout
>>>    *
>>> - * The GuC firmware layout looks like this:
>>> + * The GuC firmware layout looks like this::
>>>    *
>>> - *     +-------------------------------+
>>> - *     |         uc_css_header         |
>>> - *     |                               |
>>> - *     | contains major/minor version  |
>>> - *     +-------------------------------+
>>> - *     |             uCode             |
>>> - *     +-------------------------------+
>>> - *     |         RSA signature         |
>>> - *     +-------------------------------+
>>> - *     |          modulus key          |
>>> - *     +-------------------------------+
>>> - *     |          exponent val         |
>>> - *     +-------------------------------+
>>> + *      
>>> +======================================================================+
>>> + *      |  Firmware 
>>> blob                                                       |
>>> + *      
>>> +===============+===============+============+============+============+
>>> + *      |  CSS header   |     uCode     |    key     |  modulus   |  
>>> exponent  |
>>> + *      
>>> +===============+===============+============+============+============+
>>
>> What about the RSA?
> 
> key == RSA key == RSA signature
> 
> I followed notation from our header definition which uses "key_size"
> but maybe it was too brave. What about "RSA key" to have a match ?
> 

Works for me.

Daniele

>>
>> Daniele
>>
>>> + *       <-header size->                 <---header size continued 
>>> ----------->
>>> + *       <--- size 
>>> ----------------------------------------------------------->
>>> + *                                       <-key size->
>>> + *                                                    <-mod size->
>>> + *                                                                 
>>> <-exp size->
>>>    *
>>>    * The firmware may or may not have modulus key and exponent data. 
>>> The header,
>>>    * uCode and RSA signature are must-have components that will be 
>>> used by driver.
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 13+ messages in thread

* ✓ Fi.CI.IGT: success for series starting with [1/3] drm/i915: Fix GuC documentation links
  2019-07-24 17:34 [PATCH 1/3] drm/i915: Fix GuC documentation links Michal Wajdeczko
                   ` (4 preceding siblings ...)
  2019-07-24 19:49 ` ✓ Fi.CI.BAT: success " Patchwork
@ 2019-07-24 21:56 ` Patchwork
  5 siblings, 0 replies; 13+ messages in thread
From: Patchwork @ 2019-07-24 21:56 UTC (permalink / raw)
  To: Michal Wajdeczko; +Cc: intel-gfx

== Series Details ==

Series: series starting with [1/3] drm/i915: Fix GuC documentation links
URL   : https://patchwork.freedesktop.org/series/64190/
State : success

== Summary ==

CI Bug Log - changes from CI_DRM_6545_full -> Patchwork_13740_full
====================================================

Summary
-------

  **SUCCESS**

  No regressions found.

  

Known issues
------------

  Here are the changes found in Patchwork_13740_full that come from known issues:

### IGT changes ###

#### Issues hit ####

  * igt@gem_ctx_isolation@rcs0-s3:
    - shard-apl:          [PASS][1] -> [DMESG-WARN][2] ([fdo#108566]) +1 similar issue
   [1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-apl8/igt@gem_ctx_isolation@rcs0-s3.html
   [2]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/shard-apl7/igt@gem_ctx_isolation@rcs0-s3.html

  * igt@i915_pm_rc6_residency@rc6-accuracy:
    - shard-snb:          [PASS][3] -> [SKIP][4] ([fdo#109271])
   [3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-snb6/igt@i915_pm_rc6_residency@rc6-accuracy.html
   [4]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/shard-snb1/igt@i915_pm_rc6_residency@rc6-accuracy.html

  * igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic:
    - shard-hsw:          [PASS][5] -> [FAIL][6] ([fdo#105767])
   [5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-hsw7/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic.html
   [6]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/shard-hsw1/igt@kms_cursor_legacy@2x-long-cursor-vs-flip-atomic.html

  * igt@kms_flip@flip-vs-expired-vblank-interruptible:
    - shard-hsw:          [PASS][7] -> [INCOMPLETE][8] ([fdo#103540])
   [7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-hsw4/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
   [8]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/shard-hsw5/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
    - shard-skl:          [PASS][9] -> [FAIL][10] ([fdo#105363])
   [9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-skl10/igt@kms_flip@flip-vs-expired-vblank-interruptible.html
   [10]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/shard-skl3/igt@kms_flip@flip-vs-expired-vblank-interruptible.html

  * igt@kms_flip@flip-vs-suspend:
    - shard-snb:          [PASS][11] -> [INCOMPLETE][12] ([fdo#105411])
   [11]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-snb7/igt@kms_flip@flip-vs-suspend.html
   [12]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/shard-snb1/igt@kms_flip@flip-vs-suspend.html

  * igt@kms_flip_tiling@flip-changes-tiling-yf:
    - shard-iclb:         [PASS][13] -> [INCOMPLETE][14] ([fdo#107713]) +1 similar issue
   [13]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-iclb7/igt@kms_flip_tiling@flip-changes-tiling-yf.html
   [14]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/shard-iclb7/igt@kms_flip_tiling@flip-changes-tiling-yf.html

  * igt@kms_flip_tiling@flip-to-x-tiled:
    - shard-skl:          [PASS][15] -> [FAIL][16] ([fdo#108134])
   [15]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-skl10/igt@kms_flip_tiling@flip-to-x-tiled.html
   [16]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/shard-skl10/igt@kms_flip_tiling@flip-to-x-tiled.html

  * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite:
    - shard-iclb:         [PASS][17] -> [FAIL][18] ([fdo#103167]) +5 similar issues
   [17]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-iclb8/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite.html
   [18]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/shard-iclb3/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-pri-indfb-draw-pwrite.html

  * igt@kms_frontbuffer_tracking@fbcpsr-1p-rte:
    - shard-iclb:         [PASS][19] -> [FAIL][20] ([fdo#103167] / [fdo#110378])
   [19]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-rte.html
   [20]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-rte.html

  * igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-onoff:
    - shard-iclb:         [PASS][21] -> [INCOMPLETE][22] ([fdo#106978] / [fdo#107713])
   [21]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-iclb6/igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-onoff.html
   [22]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/shard-iclb7/igt@kms_frontbuffer_tracking@psr-1p-primscrn-cur-indfb-onoff.html

  * igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes:
    - shard-kbl:          [PASS][23] -> [INCOMPLETE][24] ([fdo#103665])
   [23]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-kbl3/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes.html
   [24]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/shard-kbl6/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-b-planes.html

  * igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes:
    - shard-kbl:          [PASS][25] -> [DMESG-WARN][26] ([fdo#108566]) +3 similar issues
   [25]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-kbl4/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes.html
   [26]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/shard-kbl3/igt@kms_plane@plane-panning-bottom-right-suspend-pipe-c-planes.html

  * igt@kms_plane_lowres@pipe-a-tiling-x:
    - shard-iclb:         [PASS][27] -> [FAIL][28] ([fdo#103166])
   [27]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-iclb7/igt@kms_plane_lowres@pipe-a-tiling-x.html
   [28]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/shard-iclb6/igt@kms_plane_lowres@pipe-a-tiling-x.html

  * igt@kms_psr2_su@page_flip:
    - shard-iclb:         [PASS][29] -> [SKIP][30] ([fdo#109642] / [fdo#111068])
   [29]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-iclb2/igt@kms_psr2_su@page_flip.html
   [30]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/shard-iclb7/igt@kms_psr2_su@page_flip.html

  * igt@kms_psr@psr2_dpms:
    - shard-iclb:         [PASS][31] -> [SKIP][32] ([fdo#109441])
   [31]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-iclb2/igt@kms_psr@psr2_dpms.html
   [32]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/shard-iclb4/igt@kms_psr@psr2_dpms.html

  * igt@kms_setmode@basic:
    - shard-kbl:          [PASS][33] -> [FAIL][34] ([fdo#99912])
   [33]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-kbl6/igt@kms_setmode@basic.html
   [34]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/shard-kbl4/igt@kms_setmode@basic.html

  * igt@tools_test@tools_test:
    - shard-kbl:          [PASS][35] -> [SKIP][36] ([fdo#109271]) +1 similar issue
   [35]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-kbl3/igt@tools_test@tools_test.html
   [36]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/shard-kbl6/igt@tools_test@tools_test.html

  
#### Possible fixes ####

  * igt@i915_pm_rpm@i2c:
    - shard-hsw:          [FAIL][37] ([fdo#104097]) -> [PASS][38]
   [37]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-hsw4/igt@i915_pm_rpm@i2c.html
   [38]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/shard-hsw8/igt@i915_pm_rpm@i2c.html

  * igt@i915_selftest@live_hangcheck:
    - shard-iclb:         [INCOMPLETE][39] ([fdo#107713] / [fdo#108569]) -> [PASS][40]
   [39]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-iclb6/igt@i915_selftest@live_hangcheck.html
   [40]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/shard-iclb1/igt@i915_selftest@live_hangcheck.html

  * igt@kms_flip@flip-vs-expired-vblank:
    - shard-skl:          [FAIL][41] ([fdo#105363]) -> [PASS][42]
   [41]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-skl9/igt@kms_flip@flip-vs-expired-vblank.html
   [42]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/shard-skl7/igt@kms_flip@flip-vs-expired-vblank.html

  * igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render:
    - shard-iclb:         [FAIL][43] ([fdo#103167]) -> [PASS][44] +3 similar issues
   [43]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-iclb4/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html
   [44]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/shard-iclb7/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html

  * igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min:
    - shard-skl:          [FAIL][45] ([fdo#108145]) -> [PASS][46]
   [45]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-skl8/igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min.html
   [46]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/shard-skl2/igt@kms_plane_alpha_blend@pipe-b-constant-alpha-min.html

  * igt@kms_psr@cursor_plane_onoff:
    - shard-iclb:         [INCOMPLETE][47] ([fdo#107713]) -> [PASS][48]
   [47]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-iclb1/igt@kms_psr@cursor_plane_onoff.html
   [48]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/shard-iclb6/igt@kms_psr@cursor_plane_onoff.html

  * igt@kms_psr@psr2_cursor_mmap_cpu:
    - shard-iclb:         [SKIP][49] ([fdo#109441]) -> [PASS][50] +2 similar issues
   [49]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-iclb3/igt@kms_psr@psr2_cursor_mmap_cpu.html
   [50]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/shard-iclb2/igt@kms_psr@psr2_cursor_mmap_cpu.html

  * igt@kms_vblank@pipe-b-ts-continuation-suspend:
    - shard-apl:          [DMESG-WARN][51] ([fdo#108566]) -> [PASS][52] +4 similar issues
   [51]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-apl2/igt@kms_vblank@pipe-b-ts-continuation-suspend.html
   [52]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/shard-apl2/igt@kms_vblank@pipe-b-ts-continuation-suspend.html

  
#### Warnings ####

  * igt@gem_tiled_swapping@non-threaded:
    - shard-skl:          [FAIL][53] ([fdo#108686]) -> [SKIP][54] ([fdo#109271])
   [53]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6545/shard-skl8/igt@gem_tiled_swapping@non-threaded.html
   [54]: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/shard-skl8/igt@gem_tiled_swapping@non-threaded.html

  
  [fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
  [fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
  [fdo#103540]: https://bugs.freedesktop.org/show_bug.cgi?id=103540
  [fdo#103665]: https://bugs.freedesktop.org/show_bug.cgi?id=103665
  [fdo#104097]: https://bugs.freedesktop.org/show_bug.cgi?id=104097
  [fdo#105363]: https://bugs.freedesktop.org/show_bug.cgi?id=105363
  [fdo#105411]: https://bugs.freedesktop.org/show_bug.cgi?id=105411
  [fdo#105767]: https://bugs.freedesktop.org/show_bug.cgi?id=105767
  [fdo#106978]: https://bugs.freedesktop.org/show_bug.cgi?id=106978
  [fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
  [fdo#108134]: https://bugs.freedesktop.org/show_bug.cgi?id=108134
  [fdo#108145]: https://bugs.freedesktop.org/show_bug.cgi?id=108145
  [fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
  [fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
  [fdo#108686]: https://bugs.freedesktop.org/show_bug.cgi?id=108686
  [fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
  [fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
  [fdo#109642]: https://bugs.freedesktop.org/show_bug.cgi?id=109642
  [fdo#110378]: https://bugs.freedesktop.org/show_bug.cgi?id=110378
  [fdo#111068]: https://bugs.freedesktop.org/show_bug.cgi?id=111068
  [fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912


Participating hosts (9 -> 9)
------------------------------

  No changes in participating hosts


Build changes
-------------

  * CI: CI-20190529 -> None
  * Linux: CI_DRM_6545 -> Patchwork_13740

  CI-20190529: 20190529
  CI_DRM_6545: a6efe73f1e086c7935d56b08342f9e1c5565fcf3 @ git://anongit.freedesktop.org/gfx-ci/linux
  IGT_5109: e5fd509e16ec649436be31f38eaa5b85cb7f72f1 @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
  Patchwork_13740: d4bd5ea797ae5a564a5d3e6f0f90c08c10a5c229 @ git://anongit.freedesktop.org/gfx-ci/linux
  piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit

== Logs ==

For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_13740/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2019-07-24 21:56 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-24 17:34 [PATCH 1/3] drm/i915: Fix GuC documentation links Michal Wajdeczko
2019-07-24 17:34 ` [PATCH 2/3] drm/i915/uc: Move uc firmware layout definitions to dedicated file Michal Wajdeczko
2019-07-24 17:50   ` Daniele Ceraolo Spurio
2019-07-24 20:01     ` Michal Wajdeczko
2019-07-24 20:05       ` Daniele Ceraolo Spurio
2019-07-24 17:34 ` [PATCH 3/3] drm/i915/uc: Update drawing for firmware layout Michal Wajdeczko
2019-07-24 17:44   ` Daniele Ceraolo Spurio
2019-07-24 20:09     ` Michal Wajdeczko
2019-07-24 20:11       ` Daniele Ceraolo Spurio
2019-07-24 17:43 ` [PATCH 1/3] drm/i915: Fix GuC documentation links Daniele Ceraolo Spurio
2019-07-24 17:51 ` ✗ Fi.CI.CHECKPATCH: warning for series starting with [1/3] " Patchwork
2019-07-24 19:49 ` ✓ Fi.CI.BAT: success " Patchwork
2019-07-24 21:56 ` ✓ Fi.CI.IGT: " Patchwork

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.