summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDuncan Laurie <dlaurie@chromium.org>2018-01-08 17:41:58 -0800
committerDuncan Laurie <dlaurie@chromium.org>2018-01-12 16:55:33 +0000
commit93142a452e4c0cb35ea04394ded171b1cf58ff72 (patch)
tree0a9acb3dc3dc6ccce7063a6640f206d846a6a3e3
parent0814b122281d2e4f10e40c2a8d5085f810e2730e (diff)
soc/intel/common: Add Intel HDA common block driver
There is common HDA code in soc/intel/common that provides generic HDA support functions, but it does not provide a driver. This change adds a common block driver for HDA that provides a ramstage driver for SOCs that need to initialize an HDA codec. This was tested on a board with an HDA codec to ensure that it properly detected it and ran the codec init steps. Change-Id: I41b4c54d3c81e1f09810cfaf934ffacafca1cf38 Signed-off-by: Duncan Laurie <dlaurie@chromium.org> Reviewed-on: https://review.coreboot.org/23187 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
-rw-r--r--src/include/device/pci_ids.h1
-rw-r--r--src/soc/intel/common/block/hda/Kconfig4
-rw-r--r--src/soc/intel/common/block/hda/Makefile.inc1
-rw-r--r--src/soc/intel/common/block/hda/hda.c80
4 files changed, 86 insertions, 0 deletions
diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h
index a7018f7201..e84d86491b 100644
--- a/src/include/device/pci_ids.h
+++ b/src/include/device/pci_ids.h
@@ -2907,6 +2907,7 @@
#define PCI_DEVICE_ID_INTEL_GLK_AUDIO 0x3198
#define PCI_DEVICE_ID_INTEL_CNL_AUDIO 0x9dc8
#define PCI_DEVICE_ID_INTEL_SKL_AUDIO 0x9d70
+#define PCI_DEVICE_ID_INTEL_KBL_AUDIO 0x9d71
/* Intel HECI/ME device Ids */
#define PCI_DEVICE_ID_INTEL_APL_CSE0 0x5a9a
diff --git a/src/soc/intel/common/block/hda/Kconfig b/src/soc/intel/common/block/hda/Kconfig
new file mode 100644
index 0000000000..ca415bc974
--- /dev/null
+++ b/src/soc/intel/common/block/hda/Kconfig
@@ -0,0 +1,4 @@
+config SOC_INTEL_COMMON_BLOCK_HDA
+ bool
+ help
+ Intel Processor common High Definition Audio driver support
diff --git a/src/soc/intel/common/block/hda/Makefile.inc b/src/soc/intel/common/block/hda/Makefile.inc
new file mode 100644
index 0000000000..410389c423
--- /dev/null
+++ b/src/soc/intel/common/block/hda/Makefile.inc
@@ -0,0 +1 @@
+ramstage-$(CONFIG_SOC_INTEL_COMMON_BLOCK_HDA) += hda.c
diff --git a/src/soc/intel/common/block/hda/hda.c b/src/soc/intel/common/block/hda/hda.c
new file mode 100644
index 0000000000..3f87fccf7f
--- /dev/null
+++ b/src/soc/intel/common/block/hda/hda.c
@@ -0,0 +1,80 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2017 Google Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <console/console.h>
+#include <device/device.h>
+#include <device/azalia_device.h>
+#include <device/pci.h>
+#include <device/pci_ids.h>
+#include <device/pci_ops.h>
+#include <soc/intel/common/hda_verb.h>
+#include <soc/ramstage.h>
+
+static void codecs_init(uint8_t *base, u32 codec_mask)
+{
+ int i;
+
+ /* Can support up to 4 codecs */
+ for (i = 3; i >= 0; i--) {
+ if (codec_mask & (1 << i))
+ hda_codec_init(base, i,
+ cim_verb_data_size, cim_verb_data);
+ }
+
+ if (pc_beep_verbs_size)
+ hda_codec_write(base, pc_beep_verbs_size, pc_beep_verbs);
+}
+
+static void hda_init(struct device *dev)
+{
+ struct resource *res;
+ int codec_mask;
+ uint8_t *base;
+
+ res = find_resource(dev, PCI_BASE_ADDRESS_0);
+ if (!res)
+ return;
+
+ base = res2mmio(res, 0, 0);
+ if (!base)
+ return;
+
+ codec_mask = hda_codec_detect(base);
+ if (codec_mask) {
+ printk(BIOS_INFO, "HDA: codec_mask = %02x\n", codec_mask);
+ codecs_init(base, codec_mask);
+ }
+}
+
+static struct device_operations hda_ops = {
+ .read_resources = &pci_dev_read_resources,
+ .set_resources = &pci_dev_set_resources,
+ .enable_resources = &pci_dev_enable_resources,
+ .init = &hda_init,
+ .ops_pci = &pci_dev_ops_pci,
+};
+
+static const unsigned short pci_device_ids[] = {
+ PCI_DEVICE_ID_INTEL_SKL_AUDIO,
+ PCI_DEVICE_ID_INTEL_KBL_AUDIO,
+ PCI_DEVICE_ID_INTEL_CNL_AUDIO,
+ 0
+};
+
+static const struct pci_driver pch_hda __pci_driver = {
+ .ops = &hda_ops,
+ .vendor = PCI_VENDOR_ID_INTEL,
+ .devices = pci_device_ids,
+};