[coreboot-gerrit] [S] Change in coreboot[master]: mb/google/brya/nivviks: Enable ISH driver and firmware name

[Meera Ravindranath (Code Review)]

Meera Ravindranath has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/68164 )

Change subject: mb/google/brya/nivviks: Enable ISH driver and firmware name
......................................................................

mb/google/brya/nivviks: Enable ISH driver and firmware name

BRANCH=none
BUG=b:234776154
TEST=build and boot Nirwen UFS, copy ISH firmware to host
file system /lib/firmware/intel/adln_ish.bin
check "dmesg |grep ish", it should show:
ish-loader: ISH firmware intel/adlnrvp_ish.bin loaded

Signed-off-by: Meera Ravindranath 
Change-Id: I89782b0b7dde1fca0130472a38628e72dfd5c26c
---
M src/drivers/intel/ish/ish.c
M src/include/device/pci_ids.h
M src/mainboard/google/brya/Kconfig
M src/mainboard/google/brya/variants/nivviks/overridetree.cb
4 files changed, 24 insertions(+), 0 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/64/68164/1

diff --git a/src/drivers/intel/ish/ish.c b/src/drivers/intel/ish/ish.c
index 78e2f6c..adc0042 100644
--- a/src/drivers/intel/ish/ish.c
+++ b/src/drivers/intel/ish/ish.c
@@ -56,6 +56,7 @@
    PCI_DID_INTEL_CML_ISHB,
    PCI_DID_INTEL_TGL_ISHB,
    PCI_DID_INTEL_TGL_H_ISHB,
+	PCI_DID_INTEL_ADL_ISHB,
    0
 };

diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h
index 434449c..e2ba3f6 100644
--- a/src/include/device/pci_ids.h
+++ b/src/include/device/pci_ids.h
@@ -2182,6 +2182,7 @@
 #define PCI_DID_INTEL_TGL_ISHB		0xa0fc
 #define PCI_DID_INTEL_TGL_H_ISHB	0x43fc
 #define PCI_DID_INTEL_MTL_ISHB		0x7e45
+#define PCI_DID_INTEL_ADL_ISHB		0x54fc

/* Intel 82371FB (PIIX) */
 #define PCI_DID_INTEL_82371FB_ISA		0x122e
diff --git a/src/mainboard/google/brya/Kconfig b/src/mainboard/google/brya/Kconfig
index 5934071..1d111d8 100644
--- a/src/mainboard/google/brya/Kconfig
+++ b/src/mainboard/google/brya/Kconfig
@@ -73,6 +73,7 @@
    select SYSTEM_TYPE_LAPTOP
    select TPM_GOOGLE_TI50
    select SOC_INTEL_COMMON_MMC_OVERRIDE
+	select DRIVERS_INTEL_ISH

config BOARD_GOOGLE_BASEBOARD_SKOLAS
    def_bool n
diff --git a/src/mainboard/google/brya/variants/nivviks/overridetree.cb b/src/mainboard/google/brya/variants/nivviks/overridetree.cb
index d93095c..ef2d2f4 100644
--- a/src/mainboard/google/brya/variants/nivviks/overridetree.cb
+++ b/src/mainboard/google/brya/variants/nivviks/overridetree.cb
@@ -519,6 +519,10 @@
    		probe STORAGE STORAGE_EMMC
    	end
    	device ref ish on
+			chip drivers/intel/ish
+				register "firmware_name" = ""adln_ish.bin""
+				device generic 0 on end
+			end
    		probe STORAGE STORAGE_UFS
    	end
    	device ref ufs on