Commit d007086b authored by Srinivas Pandruvada's avatar Srinivas Pandruvada Committed by yingbao jia
Browse files

platform/x86: ISST: Change PCI device macros 

mainline inclusion
from mainline-5.11
commit 7c88ab57
category: bugfix
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I6FY06
CVE: NA
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=7c88ab5715a265d5dde06e4e1b0dd4370d911372



Intel-SIG: commit 7c88ab57 platform/x86: ISST: Change PCI device macros.
Backport SST missed patch for 5.10.

-------------------------------------------------

Use PCI_VDEVICE and PCI_DEVICE_DATA macros. No functional changes are
expected.

Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Link: https://lore.kernel.org/r/20201204015746.1168941-3-srinivas.pandruvada@linux.intel.com


Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avataryingbao jia <yingbao.jia@intel.com>
parent 0ce2ac43

drivers/platform/x86/intel_speed_select_if/isst_if_common.h

+4 −4
Original line number Diff line number Diff line
@@ -10,11 +10,11 @@ 
#ifndef __ISST_IF_COMMON_H

#define __ISST_IF_COMMON_H



#define INTEL_RAPL_PRIO_DEVID_0	0x3451

#define INTEL_CFG_MBOX_DEVID_0	0x3459

#define PCI_DEVICE_ID_INTEL_RAPL_PRIO_DEVID_0	0x3451

#define PCI_DEVICE_ID_INTEL_CFG_MBOX_DEVID_0	0x3459



#define INTEL_RAPL_PRIO_DEVID_1 0x3251

#define INTEL_CFG_MBOX_DEVID_1  0x3259

#define PCI_DEVICE_ID_INTEL_RAPL_PRIO_DEVID_1	0x3251

#define PCI_DEVICE_ID_INTEL_CFG_MBOX_DEVID_1	0x3259



/*

 * Validate maximum commands in a single request.

drivers/platform/x86/intel_speed_select_if/isst_if_mbox_pci.c

+2 −2
Original line number Diff line number Diff line
@@ -159,8 +159,8 @@ static long isst_if_mbox_proc_cmd(u8 *cmd_ptr, int *write_only, int resume) 
}



static const struct pci_device_id isst_if_mbox_ids[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, INTEL_CFG_MBOX_DEVID_0)},

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, INTEL_CFG_MBOX_DEVID_1)},

	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CFG_MBOX_DEVID_0)},

	{ PCI_VDEVICE(INTEL, PCI_DEVICE_ID_INTEL_CFG_MBOX_DEVID_1)},

	{ 0 },

};

MODULE_DEVICE_TABLE(pci, isst_if_mbox_ids);

drivers/platform/x86/intel_speed_select_if/isst_if_mmio.c

+2 −4
Original line number Diff line number Diff line
@@ -82,10 +82,8 @@ static long isst_if_mmio_rd_wr(u8 *cmd_ptr, int *write_only, int resume) 
}



static const struct pci_device_id isst_if_ids[] = {

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, INTEL_RAPL_PRIO_DEVID_0),

		.driver_data = (kernel_ulong_t)&mmio_range_devid_0},

	{ PCI_DEVICE(PCI_VENDOR_ID_INTEL, INTEL_RAPL_PRIO_DEVID_1),

		.driver_data = (kernel_ulong_t)&mmio_range_devid_1},

	{ PCI_DEVICE_DATA(INTEL, RAPL_PRIO_DEVID_0, &mmio_range_devid_0)},

	{ PCI_DEVICE_DATA(INTEL, RAPL_PRIO_DEVID_1, &mmio_range_devid_1)},

	{ 0 },

};

MODULE_DEVICE_TABLE(pci, isst_if_ids);