| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <Ys593spfcFtoILhS@google.com>
Date: Wed, 13 Jul 2022 09:10:06 +0100
From: Lee Jones <lee.jones@...aro.org>
To: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
Cc: linux-kernel@...r.kernel.org
Subject: Re: [PATCH v1 1/1] mfd: intel-lpss: Provide an SSP type to the SPI
driver
On Sun, 03 Jul 2022, Andy Shevchenko wrote:
> The SPI driver wants to know the exact type of the controller.
> Provide this information to it. This is a complementary part to
> the previously updated intel-lpss-acpi.c.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@...ux.intel.com>
> ---
>
> Note that this patch depends on earlier sent [1].
> [1]: https://lore.kernel.org/lkml/20220628223047.34301-1-andriy.shevchenko@linux.intel.com/
>
> drivers/mfd/intel-lpss-pci.c | 141 +++++++++++++++++++++++------------
> 1 file changed, 95 insertions(+), 46 deletions(-)
>
> diff --git a/drivers/mfd/intel-lpss-pci.c b/drivers/mfd/intel-lpss-pci.c
> index bb08b7a73fe1..dde31c50a632 100644
> --- a/drivers/mfd/intel-lpss-pci.c
> +++ b/drivers/mfd/intel-lpss-pci.c
> @@ -14,6 +14,7 @@
> #include <linux/pci.h>
> #include <linux/pm_runtime.h>
> #include <linux/property.h>
> +#include <linux/pxa2xx_ssp.h>
>
> #include "intel-lpss.h"
>
> @@ -73,8 +74,18 @@ static void intel_lpss_pci_remove(struct pci_dev *pdev)
>
> static INTEL_LPSS_PM_OPS(intel_lpss_pci_pm_ops);
>
> +static const struct property_entry spt_spi_properties[] = {
> + PROPERTY_ENTRY_U32("intel,spi-pxa2xx-type", LPSS_SPT_SSP),
> + { }
> +};
> +
> +static const struct software_node spt_spi_node = {
> + .properties = spt_spi_properties,
> +};
> +
> static const struct intel_lpss_platform_info spt_info = {
> .clk_rate = 120000000,
> + .swnode = &spt_spi_node,
> };
IMHO, this is a rubbish interface.
The amount of 10-line changes required to store a 32-bit value is
depressing. Is there not a reduced interface for storing small pieces
of data that doesn't require arrays of structs?
> static const struct property_entry spt_i2c_properties[] = {
> @@ -108,8 +119,18 @@ static const struct intel_lpss_platform_info spt_uart_info = {
> .swnode = &uart_node,
> };
>
> +static const struct property_entry bxt_spi_properties[] = {
> + PROPERTY_ENTRY_U32("intel,spi-pxa2xx-type", LPSS_BXT_SSP),
> + { }
> +};
> +
> +static const struct software_node bxt_spi_node = {
> + .properties = bxt_spi_properties,
> +};
> +
> static const struct intel_lpss_platform_info bxt_info = {
> .clk_rate = 100000000,
> + .swnode = &bxt_spi_node,
> };
>
> static const struct intel_lpss_platform_info bxt_uart_info = {
> @@ -166,6 +187,20 @@ static const struct intel_lpss_platform_info glk_i2c_info = {
> .swnode = &glk_i2c_node,
> };
>
> +static const struct property_entry cnl_spi_properties[] = {
> + PROPERTY_ENTRY_U32("intel,spi-pxa2xx-type", LPSS_CNL_SSP),
> + { }
> +};
> +
> +static const struct software_node cnl_spi_node = {
> + .properties = cnl_spi_properties,
> +};
> +
> +static const struct intel_lpss_platform_info cnl_info = {
> + .clk_rate = 120000000,
> + .swnode = &cnl_spi_node,
> +};
> +
> static const struct intel_lpss_platform_info cnl_i2c_info = {
> .clk_rate = 216000000,
> .swnode = &spt_i2c_node,
> @@ -176,12 +211,26 @@ static const struct intel_lpss_platform_info ehl_i2c_info = {
> .swnode = &bxt_i2c_node,
> };
>
> +static const struct property_entry tgl_spi_properties[] = {
> + PROPERTY_ENTRY_U32("intel,spi-pxa2xx-type", LPSS_CNL_SSP),
> + { }
> +};
> +
> +static const struct software_node tgl_spi_node = {
> + .properties = tgl_spi_properties,
> +};
> +
> +static const struct intel_lpss_platform_info tgl_info = {
> + .clk_rate = 100000000,
> + .swnode = &tgl_spi_node,
> +};
> +
> static const struct pci_device_id intel_lpss_pci_ids[] = {
> /* CML-LP */
> { PCI_VDEVICE(INTEL, 0x02a8), (kernel_ulong_t)&spt_uart_info },
> { PCI_VDEVICE(INTEL, 0x02a9), (kernel_ulong_t)&spt_uart_info },
> - { PCI_VDEVICE(INTEL, 0x02aa), (kernel_ulong_t)&spt_info },
> - { PCI_VDEVICE(INTEL, 0x02ab), (kernel_ulong_t)&spt_info },
> + { PCI_VDEVICE(INTEL, 0x02aa), (kernel_ulong_t)&cnl_info },
> + { PCI_VDEVICE(INTEL, 0x02ab), (kernel_ulong_t)&cnl_info },
> { PCI_VDEVICE(INTEL, 0x02c5), (kernel_ulong_t)&cnl_i2c_info },
> { PCI_VDEVICE(INTEL, 0x02c6), (kernel_ulong_t)&cnl_i2c_info },
> { PCI_VDEVICE(INTEL, 0x02c7), (kernel_ulong_t)&spt_uart_info },
> @@ -189,18 +238,18 @@ static const struct pci_device_id intel_lpss_pci_ids[] = {
> { PCI_VDEVICE(INTEL, 0x02e9), (kernel_ulong_t)&cnl_i2c_info },
> { PCI_VDEVICE(INTEL, 0x02ea), (kernel_ulong_t)&cnl_i2c_info },
> { PCI_VDEVICE(INTEL, 0x02eb), (kernel_ulong_t)&cnl_i2c_info },
> - { PCI_VDEVICE(INTEL, 0x02fb), (kernel_ulong_t)&spt_info },
> + { PCI_VDEVICE(INTEL, 0x02fb), (kernel_ulong_t)&cnl_info },
> /* CML-H */
> { PCI_VDEVICE(INTEL, 0x06a8), (kernel_ulong_t)&spt_uart_info },
> { PCI_VDEVICE(INTEL, 0x06a9), (kernel_ulong_t)&spt_uart_info },
> - { PCI_VDEVICE(INTEL, 0x06aa), (kernel_ulong_t)&spt_info },
> - { PCI_VDEVICE(INTEL, 0x06ab), (kernel_ulong_t)&spt_info },
> + { PCI_VDEVICE(INTEL, 0x06aa), (kernel_ulong_t)&cnl_info },
> + { PCI_VDEVICE(INTEL, 0x06ab), (kernel_ulong_t)&cnl_info },
> { PCI_VDEVICE(INTEL, 0x06c7), (kernel_ulong_t)&spt_uart_info },
> { PCI_VDEVICE(INTEL, 0x06e8), (kernel_ulong_t)&cnl_i2c_info },
> { PCI_VDEVICE(INTEL, 0x06e9), (kernel_ulong_t)&cnl_i2c_info },
> { PCI_VDEVICE(INTEL, 0x06ea), (kernel_ulong_t)&cnl_i2c_info },
> { PCI_VDEVICE(INTEL, 0x06eb), (kernel_ulong_t)&cnl_i2c_info },
> - { PCI_VDEVICE(INTEL, 0x06fb), (kernel_ulong_t)&spt_info },
> + { PCI_VDEVICE(INTEL, 0x06fb), (kernel_ulong_t)&cnl_info },
> /* BXT A-Step */
> { PCI_VDEVICE(INTEL, 0x0aac), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x0aae), (kernel_ulong_t)&bxt_i2c_info },
> @@ -255,8 +304,8 @@ static const struct pci_device_id intel_lpss_pci_ids[] = {
> /* ICL-LP */
> { PCI_VDEVICE(INTEL, 0x34a8), (kernel_ulong_t)&spt_uart_info },
> { PCI_VDEVICE(INTEL, 0x34a9), (kernel_ulong_t)&spt_uart_info },
> - { PCI_VDEVICE(INTEL, 0x34aa), (kernel_ulong_t)&spt_info },
> - { PCI_VDEVICE(INTEL, 0x34ab), (kernel_ulong_t)&spt_info },
> + { PCI_VDEVICE(INTEL, 0x34aa), (kernel_ulong_t)&cnl_info },
> + { PCI_VDEVICE(INTEL, 0x34ab), (kernel_ulong_t)&cnl_info },
> { PCI_VDEVICE(INTEL, 0x34c5), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x34c6), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x34c7), (kernel_ulong_t)&spt_uart_info },
> @@ -264,15 +313,15 @@ static const struct pci_device_id intel_lpss_pci_ids[] = {
> { PCI_VDEVICE(INTEL, 0x34e9), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x34ea), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x34eb), (kernel_ulong_t)&bxt_i2c_info },
> - { PCI_VDEVICE(INTEL, 0x34fb), (kernel_ulong_t)&spt_info },
> + { PCI_VDEVICE(INTEL, 0x34fb), (kernel_ulong_t)&cnl_info },
> /* ICL-N */
> { PCI_VDEVICE(INTEL, 0x38a8), (kernel_ulong_t)&spt_uart_info },
> /* TGL-H */
> { PCI_VDEVICE(INTEL, 0x43a7), (kernel_ulong_t)&bxt_uart_info },
> { PCI_VDEVICE(INTEL, 0x43a8), (kernel_ulong_t)&bxt_uart_info },
> { PCI_VDEVICE(INTEL, 0x43a9), (kernel_ulong_t)&bxt_uart_info },
> - { PCI_VDEVICE(INTEL, 0x43aa), (kernel_ulong_t)&bxt_info },
> - { PCI_VDEVICE(INTEL, 0x43ab), (kernel_ulong_t)&bxt_info },
> + { PCI_VDEVICE(INTEL, 0x43aa), (kernel_ulong_t)&tgl_info },
> + { PCI_VDEVICE(INTEL, 0x43ab), (kernel_ulong_t)&tgl_info },
> { PCI_VDEVICE(INTEL, 0x43ad), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x43ae), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x43d8), (kernel_ulong_t)&bxt_i2c_info },
> @@ -281,8 +330,8 @@ static const struct pci_device_id intel_lpss_pci_ids[] = {
> { PCI_VDEVICE(INTEL, 0x43e9), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x43ea), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x43eb), (kernel_ulong_t)&bxt_i2c_info },
> - { PCI_VDEVICE(INTEL, 0x43fb), (kernel_ulong_t)&bxt_info },
> - { PCI_VDEVICE(INTEL, 0x43fd), (kernel_ulong_t)&bxt_info },
> + { PCI_VDEVICE(INTEL, 0x43fb), (kernel_ulong_t)&tgl_info },
> + { PCI_VDEVICE(INTEL, 0x43fd), (kernel_ulong_t)&tgl_info },
> /* EHL */
> { PCI_VDEVICE(INTEL, 0x4b28), (kernel_ulong_t)&bxt_uart_info },
> { PCI_VDEVICE(INTEL, 0x4b29), (kernel_ulong_t)&bxt_uart_info },
> @@ -301,8 +350,8 @@ static const struct pci_device_id intel_lpss_pci_ids[] = {
> /* JSL */
> { PCI_VDEVICE(INTEL, 0x4da8), (kernel_ulong_t)&spt_uart_info },
> { PCI_VDEVICE(INTEL, 0x4da9), (kernel_ulong_t)&spt_uart_info },
> - { PCI_VDEVICE(INTEL, 0x4daa), (kernel_ulong_t)&spt_info },
> - { PCI_VDEVICE(INTEL, 0x4dab), (kernel_ulong_t)&spt_info },
> + { PCI_VDEVICE(INTEL, 0x4daa), (kernel_ulong_t)&cnl_info },
> + { PCI_VDEVICE(INTEL, 0x4dab), (kernel_ulong_t)&cnl_info },
> { PCI_VDEVICE(INTEL, 0x4dc5), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x4dc6), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x4dc7), (kernel_ulong_t)&spt_uart_info },
> @@ -310,12 +359,12 @@ static const struct pci_device_id intel_lpss_pci_ids[] = {
> { PCI_VDEVICE(INTEL, 0x4de9), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x4dea), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x4deb), (kernel_ulong_t)&bxt_i2c_info },
> - { PCI_VDEVICE(INTEL, 0x4dfb), (kernel_ulong_t)&spt_info },
> + { PCI_VDEVICE(INTEL, 0x4dfb), (kernel_ulong_t)&cnl_info },
> /* ADL-P */
> { PCI_VDEVICE(INTEL, 0x51a8), (kernel_ulong_t)&bxt_uart_info },
> { PCI_VDEVICE(INTEL, 0x51a9), (kernel_ulong_t)&bxt_uart_info },
> - { PCI_VDEVICE(INTEL, 0x51aa), (kernel_ulong_t)&bxt_info },
> - { PCI_VDEVICE(INTEL, 0x51ab), (kernel_ulong_t)&bxt_info },
> + { PCI_VDEVICE(INTEL, 0x51aa), (kernel_ulong_t)&tgl_info },
> + { PCI_VDEVICE(INTEL, 0x51ab), (kernel_ulong_t)&tgl_info },
> { PCI_VDEVICE(INTEL, 0x51c5), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x51c6), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x51c7), (kernel_ulong_t)&bxt_uart_info },
> @@ -325,12 +374,12 @@ static const struct pci_device_id intel_lpss_pci_ids[] = {
> { PCI_VDEVICE(INTEL, 0x51e9), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x51ea), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x51eb), (kernel_ulong_t)&bxt_i2c_info },
> - { PCI_VDEVICE(INTEL, 0x51fb), (kernel_ulong_t)&bxt_info },
> + { PCI_VDEVICE(INTEL, 0x51fb), (kernel_ulong_t)&tgl_info },
> /* ADL-M */
> { PCI_VDEVICE(INTEL, 0x54a8), (kernel_ulong_t)&bxt_uart_info },
> { PCI_VDEVICE(INTEL, 0x54a9), (kernel_ulong_t)&bxt_uart_info },
> - { PCI_VDEVICE(INTEL, 0x54aa), (kernel_ulong_t)&bxt_info },
> - { PCI_VDEVICE(INTEL, 0x54ab), (kernel_ulong_t)&bxt_info },
> + { PCI_VDEVICE(INTEL, 0x54aa), (kernel_ulong_t)&tgl_info },
> + { PCI_VDEVICE(INTEL, 0x54ab), (kernel_ulong_t)&tgl_info },
> { PCI_VDEVICE(INTEL, 0x54c5), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x54c6), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x54c7), (kernel_ulong_t)&bxt_uart_info },
> @@ -338,7 +387,7 @@ static const struct pci_device_id intel_lpss_pci_ids[] = {
> { PCI_VDEVICE(INTEL, 0x54e9), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x54ea), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x54eb), (kernel_ulong_t)&bxt_i2c_info },
> - { PCI_VDEVICE(INTEL, 0x54fb), (kernel_ulong_t)&bxt_info },
> + { PCI_VDEVICE(INTEL, 0x54fb), (kernel_ulong_t)&tgl_info },
> /* APL */
> { PCI_VDEVICE(INTEL, 0x5aac), (kernel_ulong_t)&apl_i2c_info },
> { PCI_VDEVICE(INTEL, 0x5aae), (kernel_ulong_t)&apl_i2c_info },
> @@ -358,39 +407,39 @@ static const struct pci_device_id intel_lpss_pci_ids[] = {
> /* RPL-S */
> { PCI_VDEVICE(INTEL, 0x7a28), (kernel_ulong_t)&bxt_uart_info },
> { PCI_VDEVICE(INTEL, 0x7a29), (kernel_ulong_t)&bxt_uart_info },
> - { PCI_VDEVICE(INTEL, 0x7a2a), (kernel_ulong_t)&bxt_info },
> - { PCI_VDEVICE(INTEL, 0x7a2b), (kernel_ulong_t)&bxt_info },
> + { PCI_VDEVICE(INTEL, 0x7a2a), (kernel_ulong_t)&tgl_info },
> + { PCI_VDEVICE(INTEL, 0x7a2b), (kernel_ulong_t)&tgl_info },
> { PCI_VDEVICE(INTEL, 0x7a4c), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x7a4d), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x7a4e), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x7a4f), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x7a5c), (kernel_ulong_t)&bxt_uart_info },
> - { PCI_VDEVICE(INTEL, 0x7a79), (kernel_ulong_t)&bxt_info },
> - { PCI_VDEVICE(INTEL, 0x7a7b), (kernel_ulong_t)&bxt_info },
> + { PCI_VDEVICE(INTEL, 0x7a79), (kernel_ulong_t)&tgl_info },
> + { PCI_VDEVICE(INTEL, 0x7a7b), (kernel_ulong_t)&tgl_info },
> { PCI_VDEVICE(INTEL, 0x7a7c), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x7a7d), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x7a7e), (kernel_ulong_t)&bxt_uart_info },
> /* ADL-S */
> { PCI_VDEVICE(INTEL, 0x7aa8), (kernel_ulong_t)&bxt_uart_info },
> { PCI_VDEVICE(INTEL, 0x7aa9), (kernel_ulong_t)&bxt_uart_info },
> - { PCI_VDEVICE(INTEL, 0x7aaa), (kernel_ulong_t)&bxt_info },
> - { PCI_VDEVICE(INTEL, 0x7aab), (kernel_ulong_t)&bxt_info },
> + { PCI_VDEVICE(INTEL, 0x7aaa), (kernel_ulong_t)&tgl_info },
> + { PCI_VDEVICE(INTEL, 0x7aab), (kernel_ulong_t)&tgl_info },
> { PCI_VDEVICE(INTEL, 0x7acc), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x7acd), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x7ace), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x7acf), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x7adc), (kernel_ulong_t)&bxt_uart_info },
> - { PCI_VDEVICE(INTEL, 0x7af9), (kernel_ulong_t)&bxt_info },
> - { PCI_VDEVICE(INTEL, 0x7afb), (kernel_ulong_t)&bxt_info },
> + { PCI_VDEVICE(INTEL, 0x7af9), (kernel_ulong_t)&tgl_info },
> + { PCI_VDEVICE(INTEL, 0x7afb), (kernel_ulong_t)&tgl_info },
> { PCI_VDEVICE(INTEL, 0x7afc), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x7afd), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x7afe), (kernel_ulong_t)&bxt_uart_info },
> /* MTL-P */
> { PCI_VDEVICE(INTEL, 0x7e25), (kernel_ulong_t)&bxt_uart_info },
> { PCI_VDEVICE(INTEL, 0x7e26), (kernel_ulong_t)&bxt_uart_info },
> - { PCI_VDEVICE(INTEL, 0x7e27), (kernel_ulong_t)&bxt_info },
> - { PCI_VDEVICE(INTEL, 0x7e30), (kernel_ulong_t)&bxt_info },
> - { PCI_VDEVICE(INTEL, 0x7e46), (kernel_ulong_t)&bxt_info },
> + { PCI_VDEVICE(INTEL, 0x7e27), (kernel_ulong_t)&tgl_info },
> + { PCI_VDEVICE(INTEL, 0x7e30), (kernel_ulong_t)&tgl_info },
> + { PCI_VDEVICE(INTEL, 0x7e46), (kernel_ulong_t)&tgl_info },
> { PCI_VDEVICE(INTEL, 0x7e50), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x7e51), (kernel_ulong_t)&bxt_i2c_info },
> { PCI_VDEVICE(INTEL, 0x7e52), (kernel_ulong_t)&bxt_uart_info },
> @@ -424,8 +473,8 @@ static const struct pci_device_id intel_lpss_pci_ids[] = {
> /* CNL-LP */
> { PCI_VDEVICE(INTEL, 0x9da8), (kernel_ulong_t)&spt_uart_info },
> { PCI_VDEVICE(INTEL, 0x9da9), (kernel_ulong_t)&spt_uart_info },
> - { PCI_VDEVICE(INTEL, 0x9daa), (kernel_ulong_t)&spt_info },
> - { PCI_VDEVICE(INTEL, 0x9dab), (kernel_ulong_t)&spt_info },
> + { PCI_VDEVICE(INTEL, 0x9daa), (kernel_ulong_t)&cnl_info },
> + { PCI_VDEVICE(INTEL, 0x9dab), (kernel_ulong_t)&cnl_info },
> { PCI_VDEVICE(INTEL, 0x9dc5), (kernel_ulong_t)&cnl_i2c_info },
> { PCI_VDEVICE(INTEL, 0x9dc6), (kernel_ulong_t)&cnl_i2c_info },
> { PCI_VDEVICE(INTEL, 0x9dc7), (kernel_ulong_t)&spt_uart_info },
> @@ -433,12 +482,12 @@ static const struct pci_device_id intel_lpss_pci_ids[] = {
> { PCI_VDEVICE(INTEL, 0x9de9), (kernel_ulong_t)&cnl_i2c_info },
> { PCI_VDEVICE(INTEL, 0x9dea), (kernel_ulong_t)&cnl_i2c_info },
> { PCI_VDEVICE(INTEL, 0x9deb), (kernel_ulong_t)&cnl_i2c_info },
> - { PCI_VDEVICE(INTEL, 0x9dfb), (kernel_ulong_t)&spt_info },
> + { PCI_VDEVICE(INTEL, 0x9dfb), (kernel_ulong_t)&cnl_info },
> /* TGL-LP */
> { PCI_VDEVICE(INTEL, 0xa0a8), (kernel_ulong_t)&bxt_uart_info },
> { PCI_VDEVICE(INTEL, 0xa0a9), (kernel_ulong_t)&bxt_uart_info },
> - { PCI_VDEVICE(INTEL, 0xa0aa), (kernel_ulong_t)&spt_info },
> - { PCI_VDEVICE(INTEL, 0xa0ab), (kernel_ulong_t)&spt_info },
> + { PCI_VDEVICE(INTEL, 0xa0aa), (kernel_ulong_t)&cnl_info },
> + { PCI_VDEVICE(INTEL, 0xa0ab), (kernel_ulong_t)&cnl_info },
> { PCI_VDEVICE(INTEL, 0xa0c5), (kernel_ulong_t)&spt_i2c_info },
> { PCI_VDEVICE(INTEL, 0xa0c6), (kernel_ulong_t)&spt_i2c_info },
> { PCI_VDEVICE(INTEL, 0xa0c7), (kernel_ulong_t)&bxt_uart_info },
> @@ -448,15 +497,15 @@ static const struct pci_device_id intel_lpss_pci_ids[] = {
> { PCI_VDEVICE(INTEL, 0xa0db), (kernel_ulong_t)&bxt_uart_info },
> { PCI_VDEVICE(INTEL, 0xa0dc), (kernel_ulong_t)&bxt_uart_info },
> { PCI_VDEVICE(INTEL, 0xa0dd), (kernel_ulong_t)&bxt_uart_info },
> - { PCI_VDEVICE(INTEL, 0xa0de), (kernel_ulong_t)&spt_info },
> - { PCI_VDEVICE(INTEL, 0xa0df), (kernel_ulong_t)&spt_info },
> + { PCI_VDEVICE(INTEL, 0xa0de), (kernel_ulong_t)&cnl_info },
> + { PCI_VDEVICE(INTEL, 0xa0df), (kernel_ulong_t)&cnl_info },
> { PCI_VDEVICE(INTEL, 0xa0e8), (kernel_ulong_t)&spt_i2c_info },
> { PCI_VDEVICE(INTEL, 0xa0e9), (kernel_ulong_t)&spt_i2c_info },
> { PCI_VDEVICE(INTEL, 0xa0ea), (kernel_ulong_t)&spt_i2c_info },
> { PCI_VDEVICE(INTEL, 0xa0eb), (kernel_ulong_t)&spt_i2c_info },
> - { PCI_VDEVICE(INTEL, 0xa0fb), (kernel_ulong_t)&spt_info },
> - { PCI_VDEVICE(INTEL, 0xa0fd), (kernel_ulong_t)&spt_info },
> - { PCI_VDEVICE(INTEL, 0xa0fe), (kernel_ulong_t)&spt_info },
> + { PCI_VDEVICE(INTEL, 0xa0fb), (kernel_ulong_t)&cnl_info },
> + { PCI_VDEVICE(INTEL, 0xa0fd), (kernel_ulong_t)&cnl_info },
> + { PCI_VDEVICE(INTEL, 0xa0fe), (kernel_ulong_t)&cnl_info },
> /* SPT-H */
> { PCI_VDEVICE(INTEL, 0xa127), (kernel_ulong_t)&spt_uart_info },
> { PCI_VDEVICE(INTEL, 0xa128), (kernel_ulong_t)&spt_uart_info },
> @@ -479,14 +528,14 @@ static const struct pci_device_id intel_lpss_pci_ids[] = {
> /* CNL-H */
> { PCI_VDEVICE(INTEL, 0xa328), (kernel_ulong_t)&spt_uart_info },
> { PCI_VDEVICE(INTEL, 0xa329), (kernel_ulong_t)&spt_uart_info },
> - { PCI_VDEVICE(INTEL, 0xa32a), (kernel_ulong_t)&spt_info },
> - { PCI_VDEVICE(INTEL, 0xa32b), (kernel_ulong_t)&spt_info },
> + { PCI_VDEVICE(INTEL, 0xa32a), (kernel_ulong_t)&cnl_info },
> + { PCI_VDEVICE(INTEL, 0xa32b), (kernel_ulong_t)&cnl_info },
> { PCI_VDEVICE(INTEL, 0xa347), (kernel_ulong_t)&spt_uart_info },
> { PCI_VDEVICE(INTEL, 0xa368), (kernel_ulong_t)&cnl_i2c_info },
> { PCI_VDEVICE(INTEL, 0xa369), (kernel_ulong_t)&cnl_i2c_info },
> { PCI_VDEVICE(INTEL, 0xa36a), (kernel_ulong_t)&cnl_i2c_info },
> { PCI_VDEVICE(INTEL, 0xa36b), (kernel_ulong_t)&cnl_i2c_info },
> - { PCI_VDEVICE(INTEL, 0xa37b), (kernel_ulong_t)&spt_info },
> + { PCI_VDEVICE(INTEL, 0xa37b), (kernel_ulong_t)&cnl_info },
> /* CML-V */
> { PCI_VDEVICE(INTEL, 0xa3a7), (kernel_ulong_t)&spt_uart_info },
> { PCI_VDEVICE(INTEL, 0xa3a8), (kernel_ulong_t)&spt_uart_info },
--
Lee Jones [李琼斯]
Principal Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
Powered by blists - more mailing lists