Skip to contentSkip to conversation

1/4 zx1 updates

PATCH In review Alex Williamson 2 participants 2 messages Apr 3, 2003 PCI

lore
Share & tools
lore

Alex Williamson

author
#0 lore raw

PATCH 1/1 1/4 zx1 updates

Here's a series of patches that should make 2.5 more stable on
zx1 boxes. This first patch includes a forward port of the 2.4 sba_iommu, removes the fake PCI components and reorganizes some of the support routines. Patch is against 2.5.64 + 030307. Thanks,

Alex

--
Alex Williamson HP Linux & Open Source Lab

arch/ia64/hp/common/Makefile +2 -0
diff -urN linux-2.5.64/arch/ia64/hp/common/Makefile linux-work/arch/ia64/hp/common/Makefile
@@ -5,4 +5,6 @@
 # Copyright (C) Alex Williamson ([email protected])
 #
 
+# export-objs := sba_iommu.o
+
 obj-y := sba_iommu.o
arch/ia64/hp/common/sba_iommu.c +758 -520

1,815 lines not on this page · raw message

arch/ia64/hp/zx1/Makefile +0 -1
diff -urN linux-2.5.64/arch/ia64/hp/zx1/Makefile linux-work/arch/ia64/hp/zx1/Makefile
@@ -5,5 +5,4 @@
 # Copyright (C) Alex Williamson ([email protected])
 #
 
-obj-y := hpzx1_misc.o
 obj-$(CONFIG_IA64_GENERIC) += hpzx1_machvec.o
arch/ia64/hp/zx1/hpzx1_misc.c +0 -348

348 lines not on this page · raw message

arch/ia64/kernel/Makefile +2 -0
diff -urN linux-2.5.64/arch/ia64/kernel/Makefile linux-work/arch/ia64/kernel/Makefile
@@ -17,3 +17,5 @@
 obj-$(CONFIG_SMP) += smp.o smpboot.o
 obj-$(CONFIG_IA64_MCA) += mca.o mca_asm.o
 obj-$(CONFIG_IA64_BRL_EMU) += brl_emu.o
+obj-$(CONFIG_IA64_HP_ZX1) += acpi-ext.o
+obj-$(CONFIG_IA64_GENERIC) += acpi-ext.o
arch/ia64/kernel/acpi-ext.c +67 -0

67 lines not on this page · raw message

include/asm-ia64/acpi-ext.h +29 -0
diff -urN linux-2.5.64/include/asm-ia64/acpi-ext.h linux-work/include/asm-ia64/acpi-ext.h
@@ -0,0 +1,29 @@
+/*
+ * ia64/platform/hp/common/hp_acpi.h
+ *
+ * Copyright (C) 2003 Hewlett Packard
+ * Copyright (C) Alex Williamson
+ *
+ * Vendor specific extensions to ACPI.  These are used by both
+ * HP and NEC.
+ */
+
+#define HP_CCSR_LENGTH 0x21
+#define HP_CCSR_TYPE 0x2
+#define HP_CCSR_GUID EFI_GUID(0x69e9adf9, 0x924f, 0xab5f, \
+                              0xf6, 0x4a, 0x24, 0xd2, 0x01, 0x37, 0x0e, 0xad)
+
+struct acpi_hp_vendor_long {
+	u8      guid_id;
+	u8      guid[16];
+	u8      csr_base[8];
+	u8      csr_length[8];
+};
+
+acpi_status hp_acpi_csr_space(acpi_handle, u64 *base, u64 *length);
+
+extern acpi_status acpi_get_crs(acpi_handle, struct acpi_buffer *);
+extern struct acpi_resource *acpi_get_crs_next(struct acpi_buffer *, int *);
+extern union acpi_resource_data *acpi_get_crs_type(struct acpi_buffer *, int *, int);
+extern void acpi_dispose_crs(struct acpi_buffer *);
+
include/linux/pci_ids.h +2 -0
diff -urN linux-2.5.64/include/linux/pci_ids.h linux-work/include/linux/pci_ids.h
@@ -594,6 +594,8 @@
 #define PCI_DEVICE_ID_HP_DIVA_TOSCA1	0x1049
 #define PCI_DEVICE_ID_HP_DIVA_TOSCA2	0x104A
 #define PCI_DEVICE_ID_HP_DIVA_MAESTRO	0x104B
+#define PCI_DEVICE_ID_HP_REO_SBA	0x10f0
+#define PCI_DEVICE_ID_HP_REO_IOC	0x10f1
 #define PCI_DEVICE_ID_HP_VISUALIZE_FXE	0x108b
 #define PCI_DEVICE_ID_HP_DIVA_HALFDOME	0x1223
 #define PCI_DEVICE_ID_HP_DIVA_KEYSTONE	0x1226
#1 lore raw

Alex> This first patch includes a forward port of the Alex> 2.4 sba_iommu, removes the fake PCI components and reorganizes Alex> some of the support routines. Patch is against 2.5.64 + Alex> 030307.

Applied with some small changes (spell HP as "Hewlett-Packard", whitespace fixups, add #ifdef to acpi-exit.h and include of <linux/types.h>, correct filename in acpi-ext.c).

Thanks,

	--david