@@ -29,6 +29,7 @@ config SPI_NXP_SPIFI
config SPI_INTEL_SPI
tristate
+ depends on PLATFORM_INTEGRITY_DATA
config SPI_INTEL_SPI_PCI
tristate "Intel PCH/PCU SPI flash PCI driver (DANGEROUS)"
@@ -10,11 +10,19 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/pci.h>
+#include <linux/platform-integrity.h>
#include "intel-spi.h"
#define BCR 0xdc
#define BCR_WPD BIT(0)
+#define BCR_BLE BIT(1)
+#define BCR_SMM_BWP BIT(5)
+
+struct cnl_spi_attr {
+ struct device_attribute dev_attr;
+ u32 mask;
+};
static const struct intel_spi_boardinfo bxt_info = {
.type = INTEL_SPI_BXT,
@@ -24,6 +32,70 @@ static const struct intel_spi_boardinfo cnl_info = {
.type = INTEL_SPI_CNL,
};
+#ifdef CONFIG_PLATFORM_INTEGRITY_DATA
+static ssize_t intel_spi_cnl_spi_attr_show(struct device *dev,
+ struct device_attribute *attr,
+ char *buf, u32 mask)
+{
+ u32 bcr;
+
+ if (dev->parent == NULL)
+ return -EIO;
+
+ if (pci_read_config_dword(container_of(dev->parent, struct pci_dev, dev),
+ BCR, &bcr) != PCIBIOS_SUCCESSFUL)
+ return -EIO;
+
+ return sprintf(buf, "%d\n", (int)!!(bcr & mask));
+}
+
+static ssize_t bioswe_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ return intel_spi_cnl_spi_attr_show(dev, attr, buf, BCR_WPD);
+}
+static DEVICE_ATTR_RO(bioswe);
+
+static ssize_t biosle_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ return intel_spi_cnl_spi_attr_show(dev, attr, buf, BCR_BLE);
+}
+static DEVICE_ATTR_RO(biosle);
+
+static ssize_t smm_bioswp_show(struct device *dev, struct device_attribute *attr,
+ char *buf)
+{
+ return intel_spi_cnl_spi_attr_show(dev, attr, buf, BCR_SMM_BWP);
+}
+static DEVICE_ATTR_RO(smm_bioswp);
+
+static struct attribute *cnl_attrs[] = {
+ &dev_attr_bioswe.attr,
+ &dev_attr_biosle.attr,
+ &dev_attr_smm_bioswp.attr,
+ NULL
+};
+ATTRIBUTE_GROUPS(cnl);
+
+static struct device *
+register_local_platform_integrity_device(struct device *parent,
+ enum intel_spi_type type)
+{
+ return create_platform_integrity_device(parent, "intel-spi",
+ cnl_groups);
+}
+
+#else
+
+static struct device *
+register_local_platform_integrity_device(struct device *parent,
+ enum intel_spi_type type)
+{
+ return NULL;
+}
+#endif /* CONFIG_PLATFORM_INTEGRITY_DATA */
+
static int intel_spi_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *id)
{
@@ -50,7 +122,8 @@ static int intel_spi_pci_probe(struct pci_dev *pdev,
}
info->writeable = !!(bcr & BCR_WPD);
- ispi = intel_spi_probe(&pdev->dev, &pdev->resource[0], info);
+ ispi = intel_spi_probe(&pdev->dev, &pdev->resource[0], info,
+ register_local_platform_integrity_device);
if (IS_ERR(ispi))
return PTR_ERR(ispi);
@@ -23,7 +23,7 @@ static int intel_spi_platform_probe(struct platform_device *pdev)
return -EINVAL;
mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- ispi = intel_spi_probe(&pdev->dev, mem, info);
+ ispi = intel_spi_probe(&pdev->dev, mem, info, NULL);
if (IS_ERR(ispi))
return PTR_ERR(ispi);
@@ -16,6 +16,7 @@
#include <linux/mtd/partitions.h>
#include <linux/mtd/spi-nor.h>
#include <linux/platform_data/intel-spi.h>
+#include <linux/platform-integrity.h>
#include "intel-spi.h"
@@ -95,6 +96,8 @@
#define BYT_SSFSTS_CTL 0x90
#define BYT_BCR 0xfc
#define BYT_BCR_WPD BIT(0)
+#define BYT_BCR_BLE BIT(1)
+#define BYT_BCR_SMM_BWP BIT(5)
#define BYT_FREG_NUM 5
#define BYT_PR_NUM 5
@@ -157,6 +160,7 @@ struct intel_spi {
bool erase_64k;
u8 atomic_preopcode;
u8 opcodes[8];
+ struct device *platform_integrity_device;
};
static bool writeable;
@@ -305,7 +309,69 @@ static int intel_spi_wait_sw_busy(struct intel_spi *ispi)
INTEL_SPI_TIMEOUT * 1000);
}
-static int intel_spi_init(struct intel_spi *ispi)
+#ifdef CONFIG_PLATFORM_INTEGRITY_DATA
+static ssize_t byt_spi_attr_show(struct device *dev,
+ struct device_attribute *attr, char *buf,
+ u32 mask)
+{
+ u32 bcr;
+ struct intel_spi *ispi;
+
+ if (dev->parent == NULL)
+ return -EIO;
+
+ ispi = dev_get_drvdata(dev->parent);
+
+ bcr = readl(ispi->base + BYT_BCR);
+ return sprintf(buf, "%d\n", (int)!!(bcr & mask));
+}
+
+static ssize_t bioswe_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ return byt_spi_attr_show(dev, attr, buf, BYT_BCR_WPD);
+}
+static DEVICE_ATTR_RO(bioswe);
+
+static ssize_t biosle_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ return byt_spi_attr_show(dev, attr, buf, BYT_BCR_BLE);
+}
+static DEVICE_ATTR_RO(biosle);
+
+static ssize_t smm_bioswp_show(struct device *dev,
+ struct device_attribute *attr, char *buf)
+{
+ return byt_spi_attr_show(dev, attr, buf, BYT_BCR_SMM_BWP);
+}
+static DEVICE_ATTR_RO(smm_bioswp);
+
+static struct attribute *byt_attrs[] = {
+ &dev_attr_bioswe.attr,
+ &dev_attr_biosle.attr,
+ &dev_attr_smm_bioswp.attr,
+ NULL
+};
+ATTRIBUTE_GROUPS(byt);
+
+static struct device *
+register_local_platform_integrity_device(struct device *parent,
+ enum intel_spi_type type)
+{
+ switch (type) {
+ case INTEL_SPI_BYT:
+ return create_platform_integrity_device(parent, "intel-spi",
+ byt_groups);
+
+ default:
+ return NULL;
+ }
+}
+#endif /* CONFIG_PLATFORM_INTEGRITY_DATA */
+
+static int intel_spi_init(struct intel_spi *ispi,
+ register_platform_integrity_t register_pi_cb)
{
u32 opmenu0, opmenu1, lvscc, uvscc, val;
int i;
@@ -422,6 +488,15 @@ static int intel_spi_init(struct intel_spi *ispi)
intel_spi_dump_regs(ispi);
+#ifdef CONFIG_PLATFORM_INTEGRITY_DATA
+ if (register_pi_cb == NULL)
+ register_pi_cb = register_local_platform_integrity_device;
+ ispi->platform_integrity_device = register_pi_cb(ispi->dev,
+ ispi->info->type);
+ if (IS_ERR(ispi->platform_integrity_device))
+ ispi->platform_integrity_device = NULL;
+#endif
+
return 0;
}
@@ -904,7 +979,8 @@ static const struct spi_nor_controller_ops intel_spi_controller_ops = {
};
struct intel_spi *intel_spi_probe(struct device *dev,
- struct resource *mem, const struct intel_spi_boardinfo *info)
+ struct resource *mem, const struct intel_spi_boardinfo *info,
+ register_platform_integrity_t register_platform_integrity_cb)
{
const struct spi_nor_hwcaps hwcaps = {
.mask = SNOR_HWCAPS_READ |
@@ -930,7 +1006,7 @@ struct intel_spi *intel_spi_probe(struct device *dev,
ispi->info = info;
ispi->writeable = info->writeable;
- ret = intel_spi_init(ispi);
+ ret = intel_spi_init(ispi, register_platform_integrity_cb);
if (ret)
return ERR_PTR(ret);
@@ -960,6 +1036,15 @@ EXPORT_SYMBOL_GPL(intel_spi_probe);
int intel_spi_remove(struct intel_spi *ispi)
{
+#ifdef CONFIG_PLATFORM_INTEGRITY_DATA
+ if (ispi->platform_integrity_device != NULL) {
+ destroy_platform_integrity_device(
+ ispi->platform_integrity_device);
+
+ ispi->platform_integrity_device = NULL;
+ }
+#endif /* CONFIG_PLATFORM_INTEGRITY_DATA */
+
return mtd_device_unregister(&ispi->nor.mtd);
}
EXPORT_SYMBOL_GPL(intel_spi_remove);
@@ -14,8 +14,13 @@
struct intel_spi;
struct resource;
-struct intel_spi *intel_spi_probe(struct device *dev,
- struct resource *mem, const struct intel_spi_boardinfo *info);
+typedef struct device *(*register_platform_integrity_t)(struct device *parent,
+ enum intel_spi_type type);
+
+struct intel_spi *intel_spi_probe(struct device *dev, struct resource *mem,
+ const struct intel_spi_boardinfo *info,
+ register_platform_integrity_t register_pi_cb);
+
int intel_spi_remove(struct intel_spi *ispi);
#endif /* INTEL_SPI_H */