Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e15da401 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Tony Luck
Browse files

[IA64] Recognize HP sx2000 chipset 



No functional change, just identify the device nicely:

  -IOC: Unknown (103c:12ec) 0.1 HPA 0xf8020002000 IOVA space 1024Mb at 0x40000000
  +IOC: sx2000 0.1 HPA 0xf8020002000 IOVA space 1024Mb at 0x40000000

We used to create fake PCI devices for these chips, but we no longer do that.
So I don't think there's any reason to touch pci_ids.h now.

Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent a9f9de73

arch/ia64/hp/common/sba_iommu.c

+4 −0
Original line number Original line Diff line number Diff line
@@ -156,10 +156,13 @@ 
*/

*/

#define DELAYED_RESOURCE_CNT	64

#define DELAYED_RESOURCE_CNT	64





#define PCI_DEVICE_ID_HP_SX2000_IOC	0x12ec



#define ZX1_IOC_ID	((PCI_DEVICE_ID_HP_ZX1_IOC << 16) | PCI_VENDOR_ID_HP)

#define ZX1_IOC_ID	((PCI_DEVICE_ID_HP_ZX1_IOC << 16) | PCI_VENDOR_ID_HP)

#define ZX2_IOC_ID	((PCI_DEVICE_ID_HP_ZX2_IOC << 16) | PCI_VENDOR_ID_HP)

#define ZX2_IOC_ID	((PCI_DEVICE_ID_HP_ZX2_IOC << 16) | PCI_VENDOR_ID_HP)

#define REO_IOC_ID	((PCI_DEVICE_ID_HP_REO_IOC << 16) | PCI_VENDOR_ID_HP)

#define REO_IOC_ID	((PCI_DEVICE_ID_HP_REO_IOC << 16) | PCI_VENDOR_ID_HP)

#define SX1000_IOC_ID	((PCI_DEVICE_ID_HP_SX1000_IOC << 16) | PCI_VENDOR_ID_HP)

#define SX1000_IOC_ID	((PCI_DEVICE_ID_HP_SX1000_IOC << 16) | PCI_VENDOR_ID_HP)

#define SX2000_IOC_ID	((PCI_DEVICE_ID_HP_SX2000_IOC << 16) | PCI_VENDOR_ID_HP)





#define ZX1_IOC_OFFSET	0x1000	/* ACPI reports SBA, we want IOC */

#define ZX1_IOC_OFFSET	0x1000	/* ACPI reports SBA, we want IOC */
@@ -1726,6 +1729,7 @@ static struct ioc_iommu ioc_iommu_info[] __initdata = { 
	{ ZX1_IOC_ID, "zx1", ioc_zx1_init },

	{ ZX1_IOC_ID, "zx1", ioc_zx1_init },

	{ ZX2_IOC_ID, "zx2", NULL },

	{ ZX2_IOC_ID, "zx2", NULL },

	{ SX1000_IOC_ID, "sx1000", NULL },

	{ SX1000_IOC_ID, "sx1000", NULL },

	{ SX2000_IOC_ID, "sx2000", NULL },

};

};





static struct ioc * __init

static struct ioc * __init