xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ipmi:pci: Make the PCI defines consistent with normal Linux ones

Browse Source 
Signed-off-by: Corey Minyard <cminyard@mvista.com>
This commit is contained in:
Corey Minyard
2018-02-26 12:46:26 -06:00
parent 3b6d082f0d
commit ad2575f860
1 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
drivers/char/ipmi/ipmi_si_pci.c
View File

@@ -17,16 +17,12 @@ module_param_named(trypci, si_trypci, bool, 0);
MODULE_PARM_DESC(trypci, "Setting this to zero will disable the" MODULE_PARM_DESC(trypci, "Setting this to zero will disable the"
" default scan of the interfaces identified via pci"); " default scan of the interfaces identified via pci");
#define PCI_ERMC_CLASSCODE 0x0C0700 #define PCI_CLASS_SERIAL_IPMI 0x0c07
#define PCI_ERMC_CLASSCODE_MASK 0xffffff00 #define PCI_CLASS_SERIAL_IPMI_SMIC 0x0c0700
#define PCI_ERMC_CLASSCODE_TYPE_MASK 0xff #define PCI_CLASS_SERIAL_IPMI_KCS 0x0c0701
#define PCI_ERMC_CLASSCODE_TYPE_SMIC 0x00 #define PCI_CLASS_SERIAL_IPMI_BT 0x0c0702
#define PCI_ERMC_CLASSCODE_TYPE_KCS 0x01
#define PCI_ERMC_CLASSCODE_TYPE_BT 0x02
#define PCI_HP_VENDOR_ID 0x103C #define PCI_DEVICE_ID_HP_MMC 0x121A
#define PCI_MMC_DEVICE_ID 0x121A
#define PCI_MMC_ADDR_CW 0x10
static void ipmi_pci_cleanup(struct si_sm_io *io) static void ipmi_pci_cleanup(struct si_sm_io *io)
{ {
@@ -69,28 +65,27 @@ static int ipmi_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *ent) const struct pci_device_id *ent)
{ {
int rv; int rv;
int class_type = pdev->class & PCI_ERMC_CLASSCODE_TYPE_MASK;
struct si_sm_io io; struct si_sm_io io;
memset(&io, 0, sizeof(io)); memset(&io, 0, sizeof(io));
io.addr_source = SI_PCI; io.addr_source = SI_PCI;
dev_info(&pdev->dev, "probing via PCI"); dev_info(&pdev->dev, "probing via PCI");
switch (class_type) { switch (pdev->class) {
case PCI_ERMC_CLASSCODE_TYPE_SMIC: case PCI_CLASS_SERIAL_IPMI_SMIC:
io.si_type = SI_SMIC; io.si_type = SI_SMIC;
break; break;
case PCI_ERMC_CLASSCODE_TYPE_KCS: case PCI_CLASS_SERIAL_IPMI_KCS:
io.si_type = SI_KCS; io.si_type = SI_KCS;
break; break;
case PCI_ERMC_CLASSCODE_TYPE_BT: case PCI_CLASS_SERIAL_IPMI_BT:
io.si_type = SI_BT; io.si_type = SI_BT;
break; break;
default: default:
dev_info(&pdev->dev, "Unknown IPMI type: %d\n", class_type); dev_info(&pdev->dev, "Unknown IPMI class: %x\n", pdev->class);
return -ENOMEM; return -ENOMEM;
} }
@@ -138,8 +133,10 @@ static void ipmi_pci_remove(struct pci_dev *pdev)
} }
static const struct pci_device_id ipmi_pci_devices[] = { static const struct pci_device_id ipmi_pci_devices[] = {
{ PCI_DEVICE(PCI_HP_VENDOR_ID, PCI_MMC_DEVICE_ID) }, { PCI_VDEVICE(HP, PCI_DEVICE_ID_HP_MMC) },
{ PCI_DEVICE_CLASS(PCI_ERMC_CLASSCODE, PCI_ERMC_CLASSCODE_MASK) }, { PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_IPMI_SMIC, ~0) },
{ PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_IPMI_KCS, ~0) },
{ PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_IPMI_BT, ~0) },
{ 0, } { 0, }
}; };
MODULE_DEVICE_TABLE(pci, ipmi_pci_devices); MODULE_DEVICE_TABLE(pci, ipmi_pci_devices);