drm/i915/skl: Add support to load SKL CSR firmware
Subsystems (2)
PATCH 1/8 drm/i915/skl: Add support to load SKL CSR firmware
From: "A.Sunil Kamath" <[email protected]>
Display Context Save and Restore support is needed for various SKL Display C states like DC5, DC6.
This implementation is added based on first version of DMC CSR program that we received from h/w team.
Here we are using request_firmware based design. Finally this firmware should end up in linux-firmware tree.
For SKL platform its mandatory to ensure that we load this csr program before enabling DC states like DC5/DC6.
As CSR program gets reset on various conditions, we should ensure to load it during boot and in future change to be added to load this system resume sequence too.
v1: Initial relese as RFC patch
v2: Design change as per Daniel, Damien and Shobit's review comments request firmware method followed.
v3: Some optimization and functional changes. Pulled register defines into drivers/gpu/drm/i915/i915_reg.h Used kmemdup to allocate and duplicate firmware content. Ensured to free allocated buffer.
v4: Modified as per review comments from Satheesh and Daniel Removed temporary buffer.
Optimized number of writes by replacing I915_WRITE with I915_WRITE64.
v5:
Modified as per review comemnts from Damien.
- Changed name for functions and firmware.
- Introduced HAS_CSR.
- Reverted back previous change and used csr_buf with u8 size.
- Using cpu_to_be64 for endianness change.
Modified as per review comments from Imre.
- Modified registers and macro names to be a bit closer to bspec terminology and the existing register naming in the driver.
- Early return for non SKL platforms in intel_load_csr_program function.
- Added locking around CSR program load function as it may be called concurrently during system/runtime resume.
- Releasing the fw before loading the program for consistency
- Handled error path during f/w load.
v6: Modified as per review comments from Imre.
- Corrected out_freecsr sequence.
v7: Modified as per review comments from Imre.
Fail loading fw if fw->size%8!=0.
v8: Rebase to latest.
v9: Rebase on top of -nightly (Damien)
v10: Enabled support for dmc firmware ver 1.0.
According to ver 1.0 in a single binary package all the firmware's that are required for different stepping's of the product will be stored. The package contains the css header, followed by the package header and the actual dmc firmwares. Package header contains the firmware/stepping mapping table and the corresponding firmware offsets to the individual binaries, within the package. Each individual program binary contains the header and the payload sections whose size is specified in the header section. This changes are done to extract the specific firmaware from the package. (Animesh)
v11: Modified as per review comemnts from Imre.
- Added code comment from bpec for header structure elements.
- Added __packed to avoid structure padding.
- Added helper functions for stepping and substepping info.
- Added code comment for CSR_MAX_FW_SIZE.
- Disabled BXT firmware loading, will be enabled with dmc 1.0 support.
- Changed skl_stepping_info based on bspec, earlier used from config DB.
- Removed duplicate call of cpu_to_be* from intel_csr_load_program function.
- Used cpu_to_be32 instead of cpu_to_be64 as firmware binary in dword aligned.
- Added sanity check for header length.
- Added sanity check for mmio address got from firmware binary.
- kmalloc done separately for dmc header and dmc firmware. (Animesh)
v12: Modified as per review comemnts from Imre.
- Corrected the typo error in skl stepping info structure.
- Added out-of-bound access for skl_stepping_info.
- Sanity check for mmio address modified.
- Sanity check added for stepping and substeppig.
- Modified the intel_dmc_info structure, cache only the required header info. (Animesh)
v13: clarify firmware load error message.
The reason for a firmware loading failure can be obscure if the driver is built-in. Provide an explanation to the user about the likely reason for the failure and how to resolve it. (Imre)
v14: Suggested by Jani.
- fix s/I915/CONFIG_DRM_I915/ typo
- add fw_path to the firmware object instead of using a static ptr (Jani)
Issue: VIZ-2569
--- drivers/gpu/drm/i915/Makefile | 3 +- drivers/gpu/drm/i915/i915_dma.c | 12 +- drivers/gpu/drm/i915/i915_drv.c | 20 +++ drivers/gpu/drm/i915/i915_drv.h | 132 ++++++++++++++++++++ drivers/gpu/drm/i915/i915_reg.h | 18 +++ drivers/gpu/drm/i915/intel_csr.c | 262 +++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 5 + 7 files changed, 450 insertions(+), 2 deletions(-) create mode 100644 drivers/gpu/drm/i915/intel_csr.c
drivers/gpu/drm/i915/Makefile +2 -1
@@ -12,7 +12,8 @@ i915-y := i915_drv.o \ i915_suspend.o \ i915_sysfs.o \ intel_pm.o \ - intel_runtime_pm.o + intel_runtime_pm.o \ + intel_csr.o i915-$(CONFIG_COMPAT) += i915_ioc32.o i915-$(CONFIG_DEBUG_FS) += i915_debugfs.o
drivers/gpu/drm/i915/i915_dma.c +11 -1
@@ -783,6 +783,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)spin_lock_init (&dev_priv->mmio_flip_lock);mutex_init (&dev_priv->dpio_lock);mutex_init (&dev_priv->modeset_restore_lock); +mutex_init (&dev_priv->csr_lock);intel_pm_setup (dev);
@@ -828,10 +829,15 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)intel_uncore_init (dev); - ret =i915_gem_gtt_init (dev); +/* Load CSR Firmware for SKL */ + ret =intel_csr_ucode_init (dev);if (ret) goto out_regs; + ret =i915_gem_gtt_init (dev); +if (ret) + goto out_freecsr; +/* WARNING: Apparently we must kick fbdev drivers before vgacon, * otherwise the vga fbdev driver falls over. */ ret =i915_kick_out_firmware_fb (dev_priv);
@@ -1000,6 +1006,8 @@ out_mtrrfree:io_mapping_free (dev_priv->gtt.mappable); out_gtt:i915_global_gtt_cleanup (dev); +out_freecsr: +intel_csr_ucode_fini (dev); out_regs:intel_uncore_fini (dev);pci_iounmap (dev->pdev, dev_priv->regs);
@@ -1077,6 +1085,8 @@ int i915_driver_unload(struct drm_device *dev)mutex_unlock (&dev->struct_mutex);i915_gem_cleanup_stolen (dev); +intel_csr_ucode_fini (dev); +intel_teardown_gmbus (dev);intel_teardown_mchbar (dev);
drivers/gpu/drm/i915/i915_drv.c +20 -0
@@ -543,6 +543,26 @@ void intel_hpd_cancel_work(struct drm_i915_private *dev_priv)cancel_delayed_work_sync (&dev_priv->hotplug_reenable_work); } +void i915_firmware_load_error_print (const char *fw_path,int err) +{ +DRM_ERROR ("failed to load firmware %s (%d)\n" , fw_path, err); + +/* +* If the reason is not known assume -ENOENT since that's the most +* usual failure mode. +*/ +if (!err) + err = -ENOENT ; + +if (!(IS_BUILTIN (CONFIG_DRM_I915 ) && err == -ENOENT )) +return ; + +DRM_ERROR ( +"The driver is built-in, so to load the firmware you need to\n" +"include it either in the kernel (see CONFIG_EXTRA_FIRMWARE) or\n" +"in your initrd/initramfs image.\n" ); +} +static void intel_suspend_encoders (struct drm_i915_private *dev_priv) {struct drm_device *dev = dev_priv->dev;
drivers/gpu/drm/i915/i915_drv.h +132 -0
168 lines not on this page · raw message
drivers/gpu/drm/i915/i915_reg.h +18 -0
@@ -6776,6 +6776,24 @@ enum skl_disp_power_wells {#define GET_CFG_CR1_REG (id) (DPLL1_CFGCR1 + (id - SKL_DPLL1) * 8)#define GET_CFG_CR2_REG (id) (DPLL1_CFGCR2 + (id - SKL_DPLL1) * 8) +/* +* SKL CSR registers for DC5 and DC6 +*/ +#define CSR_PROGRAM_BASE 0x80000 +#define CSR_HEADER_OFFSET 128 +#define CSR_SSP_BASE_ADDR_GEN9 0x00002FC0 +#define CSR_HTP_ADDR_SKL 0x00500034 +#define CSR_SSP_BASE 0x8F074 +#define CSR_HTP_SKL 0x8F004 +#define CSR_LAST_WRITE 0x8F034 +#define CSR_LAST_WRITE_VALUE 0xc003b400 +/* MMIO address range for CSR program (0x80000 - 0x82FFF) */ +#define CSR_MAX_FW_SIZE 0x2FFF +#define CSR_DEFAULT_FW_OFFSET 0xFFFFFFFF +#define CSR_MMIO_START_RANGE 0x80000 +#define CSR_MMIO_END_RANGE 0x8FFFF +#define CSR_MAX_MMIO_COUNT 8 +/* Please see hsw_read_dcomp() and hsw_write_dcomp() before using this register, * since on HSW we can't write to it using I915_WRITE. */ #define D_COMP_HSW (MCHBAR_MIRROR_BASE_SNB + 0x5F0C)
drivers/gpu/drm/i915/intel_csr.c new file +262 -0
262 lines not on this page · raw message
drivers/gpu/drm/i915/intel_drv.h +5 -0
@@ -1059,6 +1059,11 @@ void intel_modeset_preclose(struct drm_device *dev, struct drm_file *file);unsigned long intel_plane_obj_offset (struct intel_plane *intel_plane,struct drm_i915_gem_object *obj); +/* intel_csr.c */ +int intel_csr_ucode_init (struct drm_device *dev); +void intel_csr_load_program (struct drm_device *dev); +void intel_csr_ucode_fini (struct drm_device *dev); +/* intel_dp.c */ void intel_dp_init (struct drm_device *dev,int output_reg,enum port port); bool intel_dp_init_connector(struct intel_digital_port *intel_dig_port,
Signature · 6 lines
2.0.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 1 line · Animesh Manna
+struct
intel_css_header{
Just a small question, what does CSS mean in this context? that's the first time I see it.
Signature · 5 lines
Damien _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 4 lines · Damien Lespiau
Quoted 1 line · Animesh Manna
+struct
intel_css_header{Just a small question, what does CSS mean in this context? that's the first time I see it.
Taken the name from bspec, will explore and get back to you.
Regards,
Animesh
Quoted 1 line
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 4 lines · Damien Lespiau
Quoted 1 line · Animesh Manna
+struct
intel_css_header{Just a small question, what does CSS mean in this context? that's the first time I see it.
CSS stands for "Code signing service". In case on Guc/Huc, firmware is signed and more relevant to have css_header. Though dmc firmware in not signed still taken thinking of later future and consistent with Guc/Huc.
Regards,
Animesh
_______________________________________________
Intel-gfx mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/intel-gfx