* [PATCH] RESEND - SN: Add initial ACPI support
@ 2006-01-15 18:23 ` John Keller
0 siblings, 0 replies; 13+ messages in thread
From: John Keller @ 2006-01-15 18:23 UTC (permalink / raw)
To: linux-ia64-u79uwXL29TY76Z2rM5mHXA
Cc: linux-acpi-u79uwXL29TY76Z2rM5mHXA, John Keller
Please disregard the earlier (01/14) post of this patch.
I erroneously sent out an early version, which was not
fully merged with the latest ia64 git tree.
First phase in introducing ACPI support to SN.
In this phase, when running with an ACPI capable PROM,
the DSDT will define the root busses and all SN nodes
(SGIHUB, SGITIO). An acpi bus driver will be registered
for the node devices, with the acpi_pci_root_driver being
used for the root busses. Platform specific info is passed
via vendor descriptors, eliminating the corresponding SAL
calls. SN fixup code no longer needs to initiate the
pci bus scans, as the acpi_pci_root_driver takes care of that
for us now.
To maintain backward compatibility with non-ACPI capable PROMs,
none of the current 'fixup' code has been deleted.
Signed-off-by: John Keller <jpk-sJ/iWh9BUns@public.gmane.org>
Index: acpi_support/arch/ia64/kernel/Makefile
===================================================================
--- acpi_support.orig/arch/ia64/kernel/Makefile 2006-01-14 09:59:31.119444143 -0600
+++ acpi_support/arch/ia64/kernel/Makefile 2006-01-14 10:02:59.812006499 -0600
@@ -11,6 +11,7 @@ obj-y := acpi.o entry.o efi.o efi_stub.o
obj-$(CONFIG_IA64_BRL_EMU) += brl_emu.o
obj-$(CONFIG_IA64_GENERIC) += acpi-ext.o
+obj-$(CONFIG_IA64_SGI_SN2) += acpi-ext.o
obj-$(CONFIG_IA64_HP_ZX1) += acpi-ext.o
obj-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += acpi-ext.o
obj-$(CONFIG_IA64_PALINFO) += palinfo.o
Index: acpi_support/arch/ia64/sn/kernel/io_init.c
===================================================================
--- acpi_support.orig/arch/ia64/sn/kernel/io_init.c 2006-01-14 09:59:31.119444143 -0600
+++ acpi_support/arch/ia64/sn/kernel/io_init.c 2006-01-15 11:33:30.679196594 -0600
@@ -3,7 +3,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (C) 1992 - 1997, 2000-2005 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 1992 - 1997, 2000-2006 Silicon Graphics, Inc. All rights reserved.
*/
#include <linux/bootmem.h>
@@ -21,6 +21,11 @@
#include <asm/sn/tioce_provider.h>
#include "xtalk/hubdev.h"
#include "xtalk/xwidgetdev.h"
+#include <linux/acpi.h>
+
+#define SN_ACPI_BASE_SUPPORT() (acpi_gbl_DSDT->oem_revision >= 0x20101)
+
+static void sn_acpi_setup(void);
static struct list_head sn_sysdata_list;
@@ -113,6 +118,21 @@ static inline u64 sal_get_hubdev_info(u6
}
/*
+ * Perform the early IO init in PROM.
+ */
+static u64
+sal_ioif_init(void)
+{
+ struct ia64_sal_retval ret_stuff;
+ ret_stuff.status = 0;
+ ret_stuff.v0 = 0;
+
+ SAL_CALL_NOLOCK(ret_stuff,
+ (u64) SN_SAL_IOIF_INIT, 0, 0, 0, 0, 0, 0, 0);
+ return ret_stuff.v0;
+}
+
+/*
* Retrieve the pci bus information given the bus number.
*/
static inline u64 sal_get_pcibus_info(u64 segment, u64 busnum, u64 address)
@@ -157,26 +177,86 @@ sn_pcidev_info_get(struct pci_dev *dev)
struct pcidev_info *pcidev;
list_for_each_entry(pcidev,
- &(SN_PCI_CONTROLLER(dev)->pcidev_info), pdi_list) {
- if (pcidev->pdi_linux_pcidev == dev) {
+ &(SN_PLATFORM_DATA(dev)->pcidev_info), pdi_list) {
+ if (pcidev->pdi_linux_pcidev == dev)
return pcidev;
- }
}
return NULL;
}
/*
+ * sn_hubdev_init() - This routine is called to initialize the HUB data
+ * structure for each node in the system.
+ */
+static void __init
+sn_hubdev_init(struct hubdev_info *hubdev)
+{
+
+ struct sn_flush_device_kernel *sn_flush_device_kernel;
+ struct sn_flush_device_kernel *dev_entry;
+ u64 status;
+ int widget, device;
+
+ /* Attach the error interrupt handlers */
+ if (hubdev->hdi_nasid & 1) /* If TIO */
+ ice_error_init(hubdev);
+ else
+ hub_error_init(hubdev);
+
+ for (widget = 0; widget <= HUB_WIDGET_ID_MAX; widget++)
+ hubdev->hdi_xwidget_info[widget].xwi_hubinfo = hubdev;
+
+ if (!hubdev->hdi_flush_nasid_list.widget_p)
+ return;
+
+ hubdev->hdi_flush_nasid_list.widget_p =
+ kzalloc((HUB_WIDGET_ID_MAX + 1) *
+ sizeof(struct sn_flush_device_kernel *),
+ GFP_KERNEL);
+
+ for (widget = 0; widget <= HUB_WIDGET_ID_MAX; widget++) {
+ sn_flush_device_kernel = kzalloc(DEV_PER_WIDGET *
+ sizeof(struct
+ sn_flush_device_kernel),
+ GFP_KERNEL);
+ if (!sn_flush_device_kernel)
+ BUG();
+
+ dev_entry = sn_flush_device_kernel;
+ for (device = 0; device < DEV_PER_WIDGET;
+ device++,dev_entry++) {
+ dev_entry->common = kzalloc(sizeof(struct
+ sn_flush_device_common),
+ GFP_KERNEL);
+ if (!dev_entry->common)
+ BUG();
+ status = sal_get_device_dmaflush_list(hubdev->hdi_nasid,
+ widget,
+ device,
+ (u64)(dev_entry->common));
+ if (status)
+ BUG();
+
+ spin_lock_init(&dev_entry->sfdl_flush_lock);
+ }
+
+ if (sn_flush_device_kernel)
+ hubdev->hdi_flush_nasid_list.widget_p[widget] =
+ sn_flush_device_kernel;
+ }
+}
+
+/*
* sn_fixup_ionodes() - This routine initializes the HUB data strcuture for
* each node in the system.
*/
static void sn_fixup_ionodes(void)
{
- struct sn_flush_device_kernel *sn_flush_device_kernel;
- struct sn_flush_device_kernel *dev_entry;
+
struct hubdev_info *hubdev;
u64 status;
u64 nasid;
- int i, widget, device;
+ int i;
/*
* Get SGI Specific HUB chipset information.
@@ -199,64 +279,9 @@ static void sn_fixup_ionodes(void)
max_segment_number = hubdev->max_segment_number;
max_pcibus_number = hubdev->max_pcibus_number;
}
-
- /* Attach the error interrupt handlers */
- if (nasid & 1)
- ice_error_init(hubdev);
- else
- hub_error_init(hubdev);
-
- for (widget = 0; widget <= HUB_WIDGET_ID_MAX; widget++)
- hubdev->hdi_xwidget_info[widget].xwi_hubinfo = hubdev;
-
- if (!hubdev->hdi_flush_nasid_list.widget_p)
- continue;
-
- hubdev->hdi_flush_nasid_list.widget_p =
- kmalloc((HUB_WIDGET_ID_MAX + 1) *
- sizeof(struct sn_flush_device_kernel *),
- GFP_KERNEL);
- memset(hubdev->hdi_flush_nasid_list.widget_p, 0x0,
- (HUB_WIDGET_ID_MAX + 1) *
- sizeof(struct sn_flush_device_kernel *));
-
- for (widget = 0; widget <= HUB_WIDGET_ID_MAX; widget++) {
- sn_flush_device_kernel = kmalloc(DEV_PER_WIDGET *
- sizeof(struct
- sn_flush_device_kernel),
- GFP_KERNEL);
- if (!sn_flush_device_kernel)
- BUG();
- memset(sn_flush_device_kernel, 0x0,
- DEV_PER_WIDGET *
- sizeof(struct sn_flush_device_kernel));
-
- dev_entry = sn_flush_device_kernel;
- for (device = 0; device < DEV_PER_WIDGET;
- device++,dev_entry++) {
- dev_entry->common = kmalloc(sizeof(struct
- sn_flush_device_common),
- GFP_KERNEL);
- if (!dev_entry->common)
- BUG();
- memset(dev_entry->common, 0x0, sizeof(struct
- sn_flush_device_common));
-
- status = sal_get_device_dmaflush_list(nasid,
- widget,
- device,
- (u64)(dev_entry->common));
- if (status)
- BUG();
-
- spin_lock_init(&dev_entry->sfdl_flush_lock);
- }
-
- if (sn_flush_device_kernel)
- hubdev->hdi_flush_nasid_list.widget_p[widget] =
- sn_flush_device_kernel;
- }
+ sn_hubdev_init(hubdev);
}
+
}
/*
@@ -351,9 +376,9 @@ void sn_pci_fixup_slot(struct pci_dev *d
if (status)
BUG(); /* Cannot get platform pci device information */
- /* Add pcidev_info to list in sn_pci_controller struct */
+ /* Add pcidev_info to list in pci_controller.platform_data */
list_add_tail(&pcidev_info->pdi_list,
- &(SN_PCI_CONTROLLER(dev->bus)->pcidev_info));
+ &(SN_PLATFORM_DATA(dev->bus)->pcidev_info));
/* Copy over PIO Mapped Addresses */
for (idx = 0; idx <= PCI_ROM_RESOURCE; idx++) {
@@ -422,70 +447,42 @@ void sn_pci_fixup_slot(struct pci_dev *d
}
/*
- * sn_pci_controller_fixup() - This routine sets up a bus's resources
- * consistent with the Linux PCI abstraction layer.
+ * sn_common_bus_fixup()
*/
-void sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
+static int
+sn_common_bus_fixup(struct pci_bus *bus,
+ struct pcibus_bussoft *prom_bussoft_ptr)
{
- int status = 0;
- int nasid, cnode;
+ int cnode;
struct pci_controller *controller;
- struct sn_pci_controller *sn_controller;
- struct pcibus_bussoft *prom_bussoft_ptr;
struct hubdev_info *hubdev_info;
+ int nasid;
void *provider_soft = NULL;
struct sn_pcibus_provider *provider;
+ struct sn_platform_data *sn_platform_data;
- status = sal_get_pcibus_info((u64) segment, (u64) busnum,
- (u64) ia64_tpa(&prom_bussoft_ptr));
- if (status > 0)
- return; /*bus # does not exist */
- prom_bussoft_ptr = __va(prom_bussoft_ptr);
-
- /* Allocate a sn_pci_controller, which has a pci_controller struct
- * as the first member.
- */
- sn_controller = kzalloc(sizeof(struct sn_pci_controller), GFP_KERNEL);
- if (!sn_controller)
- BUG();
- INIT_LIST_HEAD(&sn_controller->pcidev_info);
- controller = &sn_controller->pci_controller;
- controller->segment = segment;
-
- if (bus == NULL) {
- bus = pci_scan_bus(busnum, &pci_root_ops, controller);
- if (bus == NULL)
- goto error_return; /* error, or bus already scanned */
- bus->sysdata = NULL;
- }
-
- if (bus->sysdata)
- goto error_return; /* sysdata already alloc'd */
-
- /*
- * Per-provider fixup. Copies the contents from prom to local
- * area and links SN_PCIBUS_BUSSOFT().
- */
+ controller = PCI_CONTROLLER(bus);
+ /*
+ * Per-provider fixup. Copies the bus soft structure from prom
+ * to local area and links SN_PCIBUS_BUSSOFT().
+ */
if (prom_bussoft_ptr->bs_asic_type >= PCIIO_ASIC_MAX_TYPES)
- goto error_return; /* unsupported asic type */
+ return -1; /* unsupported asic type */
if (prom_bussoft_ptr->bs_asic_type == PCIIO_ASIC_TYPE_PPB)
- goto error_return; /* no further fixup necessary */
+ return -1; /* no further fixup necessary */
provider = sn_pci_provider[prom_bussoft_ptr->bs_asic_type];
if (provider == NULL)
- goto error_return; /* no provider registerd for this asic */
+ return -1; /* No provider registered for this asic */
- bus->sysdata = controller;
if (provider->bus_fixup)
- provider_soft = (*provider->bus_fixup) (prom_bussoft_ptr, controller);
+ provider_soft = (*provider->bus_fixup) (prom_bussoft_ptr,
+ controller);
- if (provider_soft == NULL) {
- /* fixup failed or not applicable */
- bus->sysdata = NULL;
- goto error_return;
- }
+ if (provider_soft == NULL)
+ return -1; /* fixup failed or not applicable */
/*
* Setup pci_windows for legacy IO and MEM space.
@@ -514,8 +511,15 @@ void sn_pci_controller_fixup(int segment
* Generic bus fixup goes here. Don't reference prom_bussoft_ptr
* after this point.
*/
-
- PCI_CONTROLLER(bus)->platform_data = provider_soft;
+ controller->platform_data =
+ kzalloc(sizeof(struct sn_platform_data), GFP_KERNEL);
+ if (controller->platform_data == NULL)
+ BUG();
+ sn_platform_data =
+ (struct sn_platform_data *) controller->platform_data;
+ sn_platform_data->provider_soft = provider_soft;
+ INIT_LIST_HEAD(&((struct sn_platform_data *)
+ controller->platform_data)->pcidev_info);
nasid = NASID_GET(SN_PCIBUS_BUSSOFT(bus)->bs_base);
cnode = nasid_to_cnodeid(nasid);
hubdev_info = (struct hubdev_info *)(NODEPDA(cnode)->pdinfo);
@@ -523,8 +527,8 @@ void sn_pci_controller_fixup(int segment
&(hubdev_info->hdi_xwidget_info[SN_PCIBUS_BUSSOFT(bus)->bs_xid]);
/*
- * If the node information we obtained during the fixup phase is invalid
- * then set controller->node to -1 (undetermined)
+ * If the node information we obtained during the fixup phase is
+ * invalid then set controller->node to -1 (undetermined)
*/
if (controller->node >= num_online_nodes()) {
struct pcibus_bussoft *b = SN_PCIBUS_BUSSOFT(bus);
@@ -538,11 +542,50 @@ void sn_pci_controller_fixup(int segment
controller->node, num_online_nodes());
controller->node = -1;
}
+ return 0;
+}
+
+/*
+ * sn_pci_controller_fixup() - This routine sets up a bus's resources
+ * consistent with the Linux PCI abstraction layer.
+ */
+void sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
+{
+ int status = 0;
+ struct pci_controller *controller;
+ struct pcibus_bussoft *prom_bussoft_ptr;
+
+ status = sal_get_pcibus_info((u64) segment, (u64) busnum,
+ (u64) ia64_tpa(&prom_bussoft_ptr));
+ if (status > 0)
+ return; /*bus # does not exist */
+ prom_bussoft_ptr = __va(prom_bussoft_ptr);
+
+ controller = kzalloc(sizeof(struct pci_controller), GFP_KERNEL);
+ if (!controller)
+ BUG();
+ controller->segment = segment;
+
+ if (bus == NULL) {
+ bus = pci_scan_bus(busnum, &pci_root_ops, controller);
+ if (bus == NULL)
+ goto error_return; /* error, or bus already scanned */
+ bus->sysdata = NULL;
+ }
+
+ if (bus->sysdata)
+ goto error_return; /* sysdata already alloc'd */
+
+ bus->sysdata = controller;
+ if (sn_common_bus_fixup(bus, prom_bussoft_ptr)) {
+ bus->sysdata = NULL;
+ goto error_return;
+ }
return;
error_return:
- kfree(sn_controller);
+ kfree(controller);
return;
}
@@ -585,6 +628,7 @@ static int __init sn_pci_init(void)
{
int i = 0;
int j = 0;
+ int status = 0;
struct pci_dev *pci_dev = NULL;
extern void sn_init_cpei_timer(void);
#ifdef CONFIG_PROC_FS
@@ -610,6 +654,22 @@ static int __init sn_pci_init(void)
* This is needed to avoid bounce limit checks in the blk layer
*/
ia64_max_iommu_merge_mask = ~PAGE_MASK;
+
+ /*
+ * If we're running with an ACPI 2.0 enabled PROM,
+ * the PROM has generated a ACPI DSDT table, and the Linux
+ * ACPI code will do the PCI bus scanning. We'll still need
+ * to do some 'fixup' later on in sn_io_fixup().
+ */
+ printk("ACPI DSDT OEM Rev 0x%x\n", acpi_gbl_DSDT->oem_revision);
+ if (SN_ACPI_BASE_SUPPORT()) {
+ sn_acpi_setup();
+ status = sal_ioif_init();
+ if (status)
+ BUG();
+ return 0;
+ }
+
sn_fixup_ionodes();
sn_irq_lh_init();
INIT_LIST_HEAD(&sn_sysdata_list);
@@ -679,3 +739,174 @@ EXPORT_SYMBOL(sn_pci_unfixup_slot);
EXPORT_SYMBOL(sn_pci_controller_fixup);
EXPORT_SYMBOL(sn_bus_store_sysdata);
EXPORT_SYMBOL(sn_bus_free_sysdata);
+
+
+
+/* IO ACPI Support */
+
+/* Copy from arch/ia64/kernel/acpi-ext.c */
+struct acpi_vendor_descriptor {
+ u8 guid_id;
+ efi_guid_t guid;
+};
+
+/*
+ * Arbitrary GUID taken from internal SGI machine.
+ * This value must match the UUID the PROM uses
+ * (io/acpi/defblk.c) when building a vendor descriptor.
+ */
+struct acpi_vendor_descriptor sn_descriptor = {
+ .guid_id = 0,
+ .guid = EFI_GUID(0xfea6c62c, 0x449c, 0x11da,
+ 0xa2, 0x7c, 0x08, 0x00, 0x69, 0x13, 0xea, 0x51)
+};
+
+extern acpi_status acpi_find_vendor_resource(acpi_handle,
+ struct acpi_vendor_descriptor *, u8 **, u32 *);
+
+
+/*
+ * sn_hubdev_add() - The 'add' function of the acpi_sn_hubdev_driver.
+ * Called for every "SGIHUB" or "SGITIO" device defined
+ * in the ACPI namespace.
+ */
+static int __init
+sn_hubdev_add(struct acpi_device *device)
+{
+ u8 *data;
+ struct hubdev_info *hubdev;
+ struct hubdev_info *hubdev_ptr;
+ int i;
+ u32 length;
+ u64 nasid;
+ acpi_status status;
+
+ status = acpi_find_vendor_resource(device->handle, &sn_descriptor,
+ &data, &length);
+ if (ACPI_FAILURE(status) || (length != 8)) {
+ printk("sn_hubdev_add: Failure %d - Data length=%d\n",
+ status, length);
+ return 1;
+ }
+
+ hubdev_ptr = __va(*(struct hubdev_info **) data);
+
+ nasid = hubdev_ptr->hdi_nasid;
+ i = nasid_to_cnodeid(nasid);
+ hubdev = (struct hubdev_info *)(NODEPDA(i)->pdinfo);
+ *hubdev = *hubdev_ptr;
+ sn_hubdev_init(hubdev);
+
+ acpi_os_free(data);
+ return 0;
+}
+
+
+/*
+ * sn_pci_bus_fixup() - This routine sets up a bus' resources
+ * consistent with the Linux PCI abstraction layer.
+ */
+static int __init
+sn_pci_bus_fixup(struct pci_bus *bus)
+{
+
+ struct pci_controller *controller;
+ u8 *data;
+ acpi_handle handle;
+ u32 length;
+ struct pcibus_bussoft *prom_bussoft_ptr;
+ int ret = 0;
+ acpi_status status;
+
+ handle = PCI_CONTROLLER(bus)->acpi_handle;
+ controller = PCI_CONTROLLER(bus);
+
+ status = acpi_find_vendor_resource(handle, &sn_descriptor, &data,
+ &length);
+ if (ACPI_FAILURE(status) || (length != 8)) {
+ printk("sn_pci_bus_fixup: Failure %d - length=%d\n",
+ status, length);
+ return -1;
+ }
+ prom_bussoft_ptr = __va(*(struct pcibus_bussoft **) data);
+
+ if (sn_common_bus_fixup(bus, prom_bussoft_ptr)) {
+ ret = -1;
+ }
+ acpi_os_free(data);
+ return ret;
+}
+
+/*
+ * sn_io_fixup() - Perform platform specific bus and device fixup,
+ * if running with an ACPI capable PROM.
+ */
+
+static int __init
+sn_io_fixup(void)
+{
+ struct pci_bus *bus;
+ struct pci_dev *pci_dev = NULL;
+ extern void sn_init_cpei_timer(void);
+#ifdef CONFIG_PROC_FS
+ extern void register_sn_procfs(void);
+#endif
+
+ if (!ia64_platform_is("sn2") || IS_RUNNING_ON_FAKE_PROM())
+ return 0;
+
+ /* Exit if running with old PROM without ACPI support */
+ if (!SN_ACPI_BASE_SUPPORT())
+ return 0;
+
+ sn_irq_lh_init();
+ INIT_LIST_HEAD(&sn_sysdata_list);
+ sn_init_cpei_timer();
+
+#ifdef CONFIG_PROC_FS
+ register_sn_procfs();
+#endif
+
+ /*
+ * Generic Linux PCI Layer has created the pci_bus and pci_dev
+ * structures - time for us to add our SN Platform specific
+ * information.
+ */
+
+ bus = NULL;
+ while ((bus = pci_find_next_bus(bus)) != NULL)
+ sn_pci_bus_fixup(bus);
+
+ while ((pci_dev =
+ pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pci_dev)) != NULL) {
+ sn_pci_fixup_slot(pci_dev);
+ }
+
+ sn_ioif_inited = 1; /* SN I/O infrastructure now initialized */
+
+ return 0;
+}
+
+static struct acpi_driver acpi_sn_hubdev_driver = {
+ .name = "SGI HUBDEV Driver",
+ .ids = "SGIHUB,SGITIO",
+ .ops = {
+ .add = sn_hubdev_add,
+ },
+};
+
+
+/*
+ * sn_acpi_setup() - Register the ACPI driver for the SGIHUB device.
+ * This function is expected to be called prior to
+ * ACPI initialization (acpi_init()).
+ */
+static void __init
+sn_acpi_setup(void)
+{
+ acpi_bus_register_driver(&acpi_sn_hubdev_driver);
+}
+
+fs_initcall(sn_io_fixup);
+
+
Index: acpi_support/include/asm-ia64/sn/sn_sal.h
===================================================================
--- acpi_support.orig/include/asm-ia64/sn/sn_sal.h 2006-01-14 09:59:31.121397078 -0600
+++ acpi_support/include/asm-ia64/sn/sn_sal.h 2006-01-14 10:02:59.821771173 -0600
@@ -8,7 +8,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (c) 2000-2005 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Silicon Graphics, Inc. All rights reserved.
*/
@@ -78,6 +78,7 @@
#define SN_SAL_IOIF_GET_WIDGET_DMAFLUSH_LIST 0x02000058 // deprecated
#define SN_SAL_IOIF_GET_DEVICE_DMAFLUSH_LIST 0x0200005a
+#define SN_SAL_IOIF_INIT 0x0200005f
#define SN_SAL_HUB_ERROR_INTERRUPT 0x02000060
#define SN_SAL_BTE_RECOVER 0x02000061
#define SN_SAL_RESERVED_DO_NOT_USE 0x02000062
Index: acpi_support/arch/ia64/sn/kernel/setup.c
===================================================================
--- acpi_support.orig/arch/ia64/sn/kernel/setup.c 2006-01-14 09:59:31.120420611 -0600
+++ acpi_support/arch/ia64/sn/kernel/setup.c 2006-01-14 10:02:59.822747640 -0600
@@ -3,7 +3,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (C) 1999,2001-2005 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 1999,2001-2006 Silicon Graphics, Inc. All rights reserved.
*/
#include <linux/config.h>
@@ -389,6 +389,14 @@ void __init sn_setup(char **cmdline_p)
ia64_sn_plat_set_error_handling_features(); // obsolete
ia64_sn_set_os_feature(OSF_MCA_SLV_TO_OS_INIT_SLV);
ia64_sn_set_os_feature(OSF_FEAT_LOG_SBES);
+ /*
+ * Note: The calls to notify the PROM of ACPI and PCI Segment
+ * support must be done prior to acpi_load_tables(), as
+ * an ACPI capable PROM will rebuild the DSDT as result
+ * of the call.
+ */
+ ia64_sn_set_os_feature(OSF_PCISEGMENT_ENABLE);
+ ia64_sn_set_os_feature(OSF_ACPI_ENABLE);
#if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE)
Index: acpi_support/include/asm-ia64/sn/sn_feature_sets.h
===================================================================
--- acpi_support.orig/include/asm-ia64/sn/sn_feature_sets.h 2006-01-14 09:59:31.121397078 -0600
+++ acpi_support/include/asm-ia64/sn/sn_feature_sets.h 2006-01-14 10:02:59.823724108 -0600
@@ -8,7 +8,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (c) 2005 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (c) 2005-2006 Silicon Graphics, Inc. All rights reserved.
*/
@@ -50,8 +50,13 @@ extern int sn_prom_feature_available(int
* Once enabled, a feature cannot be disabled.
*
* By default, features are disabled unless explicitly enabled.
+ *
+ * These defines must be kept in sync with the corresponding
+ * PROM definitions in feature_sets.h.
*/
#define OSF_MCA_SLV_TO_OS_INIT_SLV 0
#define OSF_FEAT_LOG_SBES 1
+#define OSF_ACPI_ENABLE 2
+#define OSF_PCISEGMENT_ENABLE 3
#endif /* _ASM_IA64_SN_FEATURE_SETS_H */
Index: acpi_support/include/asm-ia64/sn/pcidev.h
===================================================================
--- acpi_support.orig/include/asm-ia64/sn/pcidev.h 2006-01-14 09:59:31.121397078 -0600
+++ acpi_support/include/asm-ia64/sn/pcidev.h 2006-01-14 10:02:59.824700575 -0600
@@ -3,7 +3,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (C) 1992 - 1997, 2000-2005 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 1992 - 1997, 2000-2006 Silicon Graphics, Inc. All rights reserved.
*/
#ifndef _ASM_IA64_SN_PCI_PCIDEV_H
#define _ASM_IA64_SN_PCI_PCIDEV_H
@@ -12,31 +12,29 @@
/*
* In ia64, pci_dev->sysdata must be a *pci_controller. To provide access to
- * the pcidev_info structs for all devices under a controller, we extend the
- * definition of pci_controller, via sn_pci_controller, to include a list
- * of pcidev_info.
+ * the pcidev_info structs for all devices under a controller, we keep a
+ * list of pcidev_info under pci_controller->platform_data.
*/
-struct sn_pci_controller {
- struct pci_controller pci_controller;
+struct sn_platform_data {
+ void *provider_soft;
struct list_head pcidev_info;
};
-#define SN_PCI_CONTROLLER(dev) ((struct sn_pci_controller *) dev->sysdata)
+#define SN_PLATFORM_DATA(busdev) \
+ ((struct sn_platform_data *)(PCI_CONTROLLER(busdev)->platform_data))
#define SN_PCIDEV_INFO(dev) sn_pcidev_info_get(dev)
-#define SN_PCIBUS_BUSSOFT_INFO(pci_bus) \
- (struct pcibus_info *)((struct pcibus_bussoft *)(PCI_CONTROLLER((pci_bus))->platform_data))
/*
* Given a pci_bus, return the sn pcibus_bussoft struct. Note that
* this only works for root busses, not for busses represented by PPB's.
*/
#define SN_PCIBUS_BUSSOFT(pci_bus) \
- ((struct pcibus_bussoft *)(PCI_CONTROLLER((pci_bus))->platform_data))
+ ((struct pcibus_bussoft *)(SN_PLATFORM_DATA(pci_bus)->provider_soft))
#define SN_PCIBUS_BUSSOFT_INFO(pci_bus) \
- (struct pcibus_info *)((struct pcibus_bussoft *)(PCI_CONTROLLER((pci_bus))->platform_data))
+ ((struct pcibus_info *)(SN_PLATFORM_DATA(pci_bus)->provider_soft))
/*
* Given a struct pci_dev, return the sn pcibus_bussoft struct. Note
* that this is not equivalent to SN_PCIBUS_BUSSOFT(pci_dev->bus) due
Index: acpi_support/arch/ia64/sn/kernel/tiocx.c
===================================================================
--- acpi_support.orig/arch/ia64/sn/kernel/tiocx.c 2006-01-14 09:59:31.120420611 -0600
+++ acpi_support/arch/ia64/sn/kernel/tiocx.c 2006-01-14 10:02:59.824700575 -0600
@@ -3,7 +3,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (c) 2005 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (c) 2005-2006 Silicon Graphics, Inc. All rights reserved.
*/
#include <linux/module.h>
@@ -548,7 +548,7 @@ static void __exit tiocx_exit(void)
bus_unregister(&tiocx_bus_type);
}
-subsys_initcall(tiocx_init);
+fs_initcall(tiocx_init);
module_exit(tiocx_exit);
/************************************************************************
-
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH] RESEND - SN: Add initial ACPI support
@ 2006-01-15 18:23 ` John Keller
0 siblings, 0 replies; 13+ messages in thread
From: John Keller @ 2006-01-15 18:23 UTC (permalink / raw)
To: linux-ia64-u79uwXL29TY76Z2rM5mHXA
Cc: linux-acpi-u79uwXL29TY76Z2rM5mHXA, John Keller
Please disregard the earlier (01/14) post of this patch.
I erroneously sent out an early version, which was not
fully merged with the latest ia64 git tree.
First phase in introducing ACPI support to SN.
In this phase, when running with an ACPI capable PROM,
the DSDT will define the root busses and all SN nodes
(SGIHUB, SGITIO). An acpi bus driver will be registered
for the node devices, with the acpi_pci_root_driver being
used for the root busses. Platform specific info is passed
via vendor descriptors, eliminating the corresponding SAL
calls. SN fixup code no longer needs to initiate the
pci bus scans, as the acpi_pci_root_driver takes care of that
for us now.
To maintain backward compatibility with non-ACPI capable PROMs,
none of the current 'fixup' code has been deleted.
Signed-off-by: John Keller <jpk@sgi.com>
Index: acpi_support/arch/ia64/kernel/Makefile
=================================--- acpi_support.orig/arch/ia64/kernel/Makefile 2006-01-14 09:59:31.119444143 -0600
+++ acpi_support/arch/ia64/kernel/Makefile 2006-01-14 10:02:59.812006499 -0600
@@ -11,6 +11,7 @@ obj-y := acpi.o entry.o efi.o efi_stub.o
obj-$(CONFIG_IA64_BRL_EMU) += brl_emu.o
obj-$(CONFIG_IA64_GENERIC) += acpi-ext.o
+obj-$(CONFIG_IA64_SGI_SN2) += acpi-ext.o
obj-$(CONFIG_IA64_HP_ZX1) += acpi-ext.o
obj-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += acpi-ext.o
obj-$(CONFIG_IA64_PALINFO) += palinfo.o
Index: acpi_support/arch/ia64/sn/kernel/io_init.c
=================================--- acpi_support.orig/arch/ia64/sn/kernel/io_init.c 2006-01-14 09:59:31.119444143 -0600
+++ acpi_support/arch/ia64/sn/kernel/io_init.c 2006-01-15 11:33:30.679196594 -0600
@@ -3,7 +3,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (C) 1992 - 1997, 2000-2005 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 1992 - 1997, 2000-2006 Silicon Graphics, Inc. All rights reserved.
*/
#include <linux/bootmem.h>
@@ -21,6 +21,11 @@
#include <asm/sn/tioce_provider.h>
#include "xtalk/hubdev.h"
#include "xtalk/xwidgetdev.h"
+#include <linux/acpi.h>
+
+#define SN_ACPI_BASE_SUPPORT() (acpi_gbl_DSDT->oem_revision >= 0x20101)
+
+static void sn_acpi_setup(void);
static struct list_head sn_sysdata_list;
@@ -113,6 +118,21 @@ static inline u64 sal_get_hubdev_info(u6
}
/*
+ * Perform the early IO init in PROM.
+ */
+static u64
+sal_ioif_init(void)
+{
+ struct ia64_sal_retval ret_stuff;
+ ret_stuff.status = 0;
+ ret_stuff.v0 = 0;
+
+ SAL_CALL_NOLOCK(ret_stuff,
+ (u64) SN_SAL_IOIF_INIT, 0, 0, 0, 0, 0, 0, 0);
+ return ret_stuff.v0;
+}
+
+/*
* Retrieve the pci bus information given the bus number.
*/
static inline u64 sal_get_pcibus_info(u64 segment, u64 busnum, u64 address)
@@ -157,26 +177,86 @@ sn_pcidev_info_get(struct pci_dev *dev)
struct pcidev_info *pcidev;
list_for_each_entry(pcidev,
- &(SN_PCI_CONTROLLER(dev)->pcidev_info), pdi_list) {
- if (pcidev->pdi_linux_pcidev = dev) {
+ &(SN_PLATFORM_DATA(dev)->pcidev_info), pdi_list) {
+ if (pcidev->pdi_linux_pcidev = dev)
return pcidev;
- }
}
return NULL;
}
/*
+ * sn_hubdev_init() - This routine is called to initialize the HUB data
+ * structure for each node in the system.
+ */
+static void __init
+sn_hubdev_init(struct hubdev_info *hubdev)
+{
+
+ struct sn_flush_device_kernel *sn_flush_device_kernel;
+ struct sn_flush_device_kernel *dev_entry;
+ u64 status;
+ int widget, device;
+
+ /* Attach the error interrupt handlers */
+ if (hubdev->hdi_nasid & 1) /* If TIO */
+ ice_error_init(hubdev);
+ else
+ hub_error_init(hubdev);
+
+ for (widget = 0; widget <= HUB_WIDGET_ID_MAX; widget++)
+ hubdev->hdi_xwidget_info[widget].xwi_hubinfo = hubdev;
+
+ if (!hubdev->hdi_flush_nasid_list.widget_p)
+ return;
+
+ hubdev->hdi_flush_nasid_list.widget_p + kzalloc((HUB_WIDGET_ID_MAX + 1) *
+ sizeof(struct sn_flush_device_kernel *),
+ GFP_KERNEL);
+
+ for (widget = 0; widget <= HUB_WIDGET_ID_MAX; widget++) {
+ sn_flush_device_kernel = kzalloc(DEV_PER_WIDGET *
+ sizeof(struct
+ sn_flush_device_kernel),
+ GFP_KERNEL);
+ if (!sn_flush_device_kernel)
+ BUG();
+
+ dev_entry = sn_flush_device_kernel;
+ for (device = 0; device < DEV_PER_WIDGET;
+ device++,dev_entry++) {
+ dev_entry->common = kzalloc(sizeof(struct
+ sn_flush_device_common),
+ GFP_KERNEL);
+ if (!dev_entry->common)
+ BUG();
+ status = sal_get_device_dmaflush_list(hubdev->hdi_nasid,
+ widget,
+ device,
+ (u64)(dev_entry->common));
+ if (status)
+ BUG();
+
+ spin_lock_init(&dev_entry->sfdl_flush_lock);
+ }
+
+ if (sn_flush_device_kernel)
+ hubdev->hdi_flush_nasid_list.widget_p[widget] + sn_flush_device_kernel;
+ }
+}
+
+/*
* sn_fixup_ionodes() - This routine initializes the HUB data strcuture for
* each node in the system.
*/
static void sn_fixup_ionodes(void)
{
- struct sn_flush_device_kernel *sn_flush_device_kernel;
- struct sn_flush_device_kernel *dev_entry;
+
struct hubdev_info *hubdev;
u64 status;
u64 nasid;
- int i, widget, device;
+ int i;
/*
* Get SGI Specific HUB chipset information.
@@ -199,64 +279,9 @@ static void sn_fixup_ionodes(void)
max_segment_number = hubdev->max_segment_number;
max_pcibus_number = hubdev->max_pcibus_number;
}
-
- /* Attach the error interrupt handlers */
- if (nasid & 1)
- ice_error_init(hubdev);
- else
- hub_error_init(hubdev);
-
- for (widget = 0; widget <= HUB_WIDGET_ID_MAX; widget++)
- hubdev->hdi_xwidget_info[widget].xwi_hubinfo = hubdev;
-
- if (!hubdev->hdi_flush_nasid_list.widget_p)
- continue;
-
- hubdev->hdi_flush_nasid_list.widget_p - kmalloc((HUB_WIDGET_ID_MAX + 1) *
- sizeof(struct sn_flush_device_kernel *),
- GFP_KERNEL);
- memset(hubdev->hdi_flush_nasid_list.widget_p, 0x0,
- (HUB_WIDGET_ID_MAX + 1) *
- sizeof(struct sn_flush_device_kernel *));
-
- for (widget = 0; widget <= HUB_WIDGET_ID_MAX; widget++) {
- sn_flush_device_kernel = kmalloc(DEV_PER_WIDGET *
- sizeof(struct
- sn_flush_device_kernel),
- GFP_KERNEL);
- if (!sn_flush_device_kernel)
- BUG();
- memset(sn_flush_device_kernel, 0x0,
- DEV_PER_WIDGET *
- sizeof(struct sn_flush_device_kernel));
-
- dev_entry = sn_flush_device_kernel;
- for (device = 0; device < DEV_PER_WIDGET;
- device++,dev_entry++) {
- dev_entry->common = kmalloc(sizeof(struct
- sn_flush_device_common),
- GFP_KERNEL);
- if (!dev_entry->common)
- BUG();
- memset(dev_entry->common, 0x0, sizeof(struct
- sn_flush_device_common));
-
- status = sal_get_device_dmaflush_list(nasid,
- widget,
- device,
- (u64)(dev_entry->common));
- if (status)
- BUG();
-
- spin_lock_init(&dev_entry->sfdl_flush_lock);
- }
-
- if (sn_flush_device_kernel)
- hubdev->hdi_flush_nasid_list.widget_p[widget] - sn_flush_device_kernel;
- }
+ sn_hubdev_init(hubdev);
}
+
}
/*
@@ -351,9 +376,9 @@ void sn_pci_fixup_slot(struct pci_dev *d
if (status)
BUG(); /* Cannot get platform pci device information */
- /* Add pcidev_info to list in sn_pci_controller struct */
+ /* Add pcidev_info to list in pci_controller.platform_data */
list_add_tail(&pcidev_info->pdi_list,
- &(SN_PCI_CONTROLLER(dev->bus)->pcidev_info));
+ &(SN_PLATFORM_DATA(dev->bus)->pcidev_info));
/* Copy over PIO Mapped Addresses */
for (idx = 0; idx <= PCI_ROM_RESOURCE; idx++) {
@@ -422,70 +447,42 @@ void sn_pci_fixup_slot(struct pci_dev *d
}
/*
- * sn_pci_controller_fixup() - This routine sets up a bus's resources
- * consistent with the Linux PCI abstraction layer.
+ * sn_common_bus_fixup()
*/
-void sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
+static int
+sn_common_bus_fixup(struct pci_bus *bus,
+ struct pcibus_bussoft *prom_bussoft_ptr)
{
- int status = 0;
- int nasid, cnode;
+ int cnode;
struct pci_controller *controller;
- struct sn_pci_controller *sn_controller;
- struct pcibus_bussoft *prom_bussoft_ptr;
struct hubdev_info *hubdev_info;
+ int nasid;
void *provider_soft = NULL;
struct sn_pcibus_provider *provider;
+ struct sn_platform_data *sn_platform_data;
- status = sal_get_pcibus_info((u64) segment, (u64) busnum,
- (u64) ia64_tpa(&prom_bussoft_ptr));
- if (status > 0)
- return; /*bus # does not exist */
- prom_bussoft_ptr = __va(prom_bussoft_ptr);
-
- /* Allocate a sn_pci_controller, which has a pci_controller struct
- * as the first member.
- */
- sn_controller = kzalloc(sizeof(struct sn_pci_controller), GFP_KERNEL);
- if (!sn_controller)
- BUG();
- INIT_LIST_HEAD(&sn_controller->pcidev_info);
- controller = &sn_controller->pci_controller;
- controller->segment = segment;
-
- if (bus = NULL) {
- bus = pci_scan_bus(busnum, &pci_root_ops, controller);
- if (bus = NULL)
- goto error_return; /* error, or bus already scanned */
- bus->sysdata = NULL;
- }
-
- if (bus->sysdata)
- goto error_return; /* sysdata already alloc'd */
-
- /*
- * Per-provider fixup. Copies the contents from prom to local
- * area and links SN_PCIBUS_BUSSOFT().
- */
+ controller = PCI_CONTROLLER(bus);
+ /*
+ * Per-provider fixup. Copies the bus soft structure from prom
+ * to local area and links SN_PCIBUS_BUSSOFT().
+ */
if (prom_bussoft_ptr->bs_asic_type >= PCIIO_ASIC_MAX_TYPES)
- goto error_return; /* unsupported asic type */
+ return -1; /* unsupported asic type */
if (prom_bussoft_ptr->bs_asic_type = PCIIO_ASIC_TYPE_PPB)
- goto error_return; /* no further fixup necessary */
+ return -1; /* no further fixup necessary */
provider = sn_pci_provider[prom_bussoft_ptr->bs_asic_type];
if (provider = NULL)
- goto error_return; /* no provider registerd for this asic */
+ return -1; /* No provider registered for this asic */
- bus->sysdata = controller;
if (provider->bus_fixup)
- provider_soft = (*provider->bus_fixup) (prom_bussoft_ptr, controller);
+ provider_soft = (*provider->bus_fixup) (prom_bussoft_ptr,
+ controller);
- if (provider_soft = NULL) {
- /* fixup failed or not applicable */
- bus->sysdata = NULL;
- goto error_return;
- }
+ if (provider_soft = NULL)
+ return -1; /* fixup failed or not applicable */
/*
* Setup pci_windows for legacy IO and MEM space.
@@ -514,8 +511,15 @@ void sn_pci_controller_fixup(int segment
* Generic bus fixup goes here. Don't reference prom_bussoft_ptr
* after this point.
*/
-
- PCI_CONTROLLER(bus)->platform_data = provider_soft;
+ controller->platform_data + kzalloc(sizeof(struct sn_platform_data), GFP_KERNEL);
+ if (controller->platform_data = NULL)
+ BUG();
+ sn_platform_data + (struct sn_platform_data *) controller->platform_data;
+ sn_platform_data->provider_soft = provider_soft;
+ INIT_LIST_HEAD(&((struct sn_platform_data *)
+ controller->platform_data)->pcidev_info);
nasid = NASID_GET(SN_PCIBUS_BUSSOFT(bus)->bs_base);
cnode = nasid_to_cnodeid(nasid);
hubdev_info = (struct hubdev_info *)(NODEPDA(cnode)->pdinfo);
@@ -523,8 +527,8 @@ void sn_pci_controller_fixup(int segment
&(hubdev_info->hdi_xwidget_info[SN_PCIBUS_BUSSOFT(bus)->bs_xid]);
/*
- * If the node information we obtained during the fixup phase is invalid
- * then set controller->node to -1 (undetermined)
+ * If the node information we obtained during the fixup phase is
+ * invalid then set controller->node to -1 (undetermined)
*/
if (controller->node >= num_online_nodes()) {
struct pcibus_bussoft *b = SN_PCIBUS_BUSSOFT(bus);
@@ -538,11 +542,50 @@ void sn_pci_controller_fixup(int segment
controller->node, num_online_nodes());
controller->node = -1;
}
+ return 0;
+}
+
+/*
+ * sn_pci_controller_fixup() - This routine sets up a bus's resources
+ * consistent with the Linux PCI abstraction layer.
+ */
+void sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
+{
+ int status = 0;
+ struct pci_controller *controller;
+ struct pcibus_bussoft *prom_bussoft_ptr;
+
+ status = sal_get_pcibus_info((u64) segment, (u64) busnum,
+ (u64) ia64_tpa(&prom_bussoft_ptr));
+ if (status > 0)
+ return; /*bus # does not exist */
+ prom_bussoft_ptr = __va(prom_bussoft_ptr);
+
+ controller = kzalloc(sizeof(struct pci_controller), GFP_KERNEL);
+ if (!controller)
+ BUG();
+ controller->segment = segment;
+
+ if (bus = NULL) {
+ bus = pci_scan_bus(busnum, &pci_root_ops, controller);
+ if (bus = NULL)
+ goto error_return; /* error, or bus already scanned */
+ bus->sysdata = NULL;
+ }
+
+ if (bus->sysdata)
+ goto error_return; /* sysdata already alloc'd */
+
+ bus->sysdata = controller;
+ if (sn_common_bus_fixup(bus, prom_bussoft_ptr)) {
+ bus->sysdata = NULL;
+ goto error_return;
+ }
return;
error_return:
- kfree(sn_controller);
+ kfree(controller);
return;
}
@@ -585,6 +628,7 @@ static int __init sn_pci_init(void)
{
int i = 0;
int j = 0;
+ int status = 0;
struct pci_dev *pci_dev = NULL;
extern void sn_init_cpei_timer(void);
#ifdef CONFIG_PROC_FS
@@ -610,6 +654,22 @@ static int __init sn_pci_init(void)
* This is needed to avoid bounce limit checks in the blk layer
*/
ia64_max_iommu_merge_mask = ~PAGE_MASK;
+
+ /*
+ * If we're running with an ACPI 2.0 enabled PROM,
+ * the PROM has generated a ACPI DSDT table, and the Linux
+ * ACPI code will do the PCI bus scanning. We'll still need
+ * to do some 'fixup' later on in sn_io_fixup().
+ */
+ printk("ACPI DSDT OEM Rev 0x%x\n", acpi_gbl_DSDT->oem_revision);
+ if (SN_ACPI_BASE_SUPPORT()) {
+ sn_acpi_setup();
+ status = sal_ioif_init();
+ if (status)
+ BUG();
+ return 0;
+ }
+
sn_fixup_ionodes();
sn_irq_lh_init();
INIT_LIST_HEAD(&sn_sysdata_list);
@@ -679,3 +739,174 @@ EXPORT_SYMBOL(sn_pci_unfixup_slot);
EXPORT_SYMBOL(sn_pci_controller_fixup);
EXPORT_SYMBOL(sn_bus_store_sysdata);
EXPORT_SYMBOL(sn_bus_free_sysdata);
+
+
+
+/* IO ACPI Support */
+
+/* Copy from arch/ia64/kernel/acpi-ext.c */
+struct acpi_vendor_descriptor {
+ u8 guid_id;
+ efi_guid_t guid;
+};
+
+/*
+ * Arbitrary GUID taken from internal SGI machine.
+ * This value must match the UUID the PROM uses
+ * (io/acpi/defblk.c) when building a vendor descriptor.
+ */
+struct acpi_vendor_descriptor sn_descriptor = {
+ .guid_id = 0,
+ .guid = EFI_GUID(0xfea6c62c, 0x449c, 0x11da,
+ 0xa2, 0x7c, 0x08, 0x00, 0x69, 0x13, 0xea, 0x51)
+};
+
+extern acpi_status acpi_find_vendor_resource(acpi_handle,
+ struct acpi_vendor_descriptor *, u8 **, u32 *);
+
+
+/*
+ * sn_hubdev_add() - The 'add' function of the acpi_sn_hubdev_driver.
+ * Called for every "SGIHUB" or "SGITIO" device defined
+ * in the ACPI namespace.
+ */
+static int __init
+sn_hubdev_add(struct acpi_device *device)
+{
+ u8 *data;
+ struct hubdev_info *hubdev;
+ struct hubdev_info *hubdev_ptr;
+ int i;
+ u32 length;
+ u64 nasid;
+ acpi_status status;
+
+ status = acpi_find_vendor_resource(device->handle, &sn_descriptor,
+ &data, &length);
+ if (ACPI_FAILURE(status) || (length != 8)) {
+ printk("sn_hubdev_add: Failure %d - Data length=%d\n",
+ status, length);
+ return 1;
+ }
+
+ hubdev_ptr = __va(*(struct hubdev_info **) data);
+
+ nasid = hubdev_ptr->hdi_nasid;
+ i = nasid_to_cnodeid(nasid);
+ hubdev = (struct hubdev_info *)(NODEPDA(i)->pdinfo);
+ *hubdev = *hubdev_ptr;
+ sn_hubdev_init(hubdev);
+
+ acpi_os_free(data);
+ return 0;
+}
+
+
+/*
+ * sn_pci_bus_fixup() - This routine sets up a bus' resources
+ * consistent with the Linux PCI abstraction layer.
+ */
+static int __init
+sn_pci_bus_fixup(struct pci_bus *bus)
+{
+
+ struct pci_controller *controller;
+ u8 *data;
+ acpi_handle handle;
+ u32 length;
+ struct pcibus_bussoft *prom_bussoft_ptr;
+ int ret = 0;
+ acpi_status status;
+
+ handle = PCI_CONTROLLER(bus)->acpi_handle;
+ controller = PCI_CONTROLLER(bus);
+
+ status = acpi_find_vendor_resource(handle, &sn_descriptor, &data,
+ &length);
+ if (ACPI_FAILURE(status) || (length != 8)) {
+ printk("sn_pci_bus_fixup: Failure %d - length=%d\n",
+ status, length);
+ return -1;
+ }
+ prom_bussoft_ptr = __va(*(struct pcibus_bussoft **) data);
+
+ if (sn_common_bus_fixup(bus, prom_bussoft_ptr)) {
+ ret = -1;
+ }
+ acpi_os_free(data);
+ return ret;
+}
+
+/*
+ * sn_io_fixup() - Perform platform specific bus and device fixup,
+ * if running with an ACPI capable PROM.
+ */
+
+static int __init
+sn_io_fixup(void)
+{
+ struct pci_bus *bus;
+ struct pci_dev *pci_dev = NULL;
+ extern void sn_init_cpei_timer(void);
+#ifdef CONFIG_PROC_FS
+ extern void register_sn_procfs(void);
+#endif
+
+ if (!ia64_platform_is("sn2") || IS_RUNNING_ON_FAKE_PROM())
+ return 0;
+
+ /* Exit if running with old PROM without ACPI support */
+ if (!SN_ACPI_BASE_SUPPORT())
+ return 0;
+
+ sn_irq_lh_init();
+ INIT_LIST_HEAD(&sn_sysdata_list);
+ sn_init_cpei_timer();
+
+#ifdef CONFIG_PROC_FS
+ register_sn_procfs();
+#endif
+
+ /*
+ * Generic Linux PCI Layer has created the pci_bus and pci_dev
+ * structures - time for us to add our SN Platform specific
+ * information.
+ */
+
+ bus = NULL;
+ while ((bus = pci_find_next_bus(bus)) != NULL)
+ sn_pci_bus_fixup(bus);
+
+ while ((pci_dev + pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pci_dev)) != NULL) {
+ sn_pci_fixup_slot(pci_dev);
+ }
+
+ sn_ioif_inited = 1; /* SN I/O infrastructure now initialized */
+
+ return 0;
+}
+
+static struct acpi_driver acpi_sn_hubdev_driver = {
+ .name = "SGI HUBDEV Driver",
+ .ids = "SGIHUB,SGITIO",
+ .ops = {
+ .add = sn_hubdev_add,
+ },
+};
+
+
+/*
+ * sn_acpi_setup() - Register the ACPI driver for the SGIHUB device.
+ * This function is expected to be called prior to
+ * ACPI initialization (acpi_init()).
+ */
+static void __init
+sn_acpi_setup(void)
+{
+ acpi_bus_register_driver(&acpi_sn_hubdev_driver);
+}
+
+fs_initcall(sn_io_fixup);
+
+
Index: acpi_support/include/asm-ia64/sn/sn_sal.h
=================================--- acpi_support.orig/include/asm-ia64/sn/sn_sal.h 2006-01-14 09:59:31.121397078 -0600
+++ acpi_support/include/asm-ia64/sn/sn_sal.h 2006-01-14 10:02:59.821771173 -0600
@@ -8,7 +8,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (c) 2000-2005 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Silicon Graphics, Inc. All rights reserved.
*/
@@ -78,6 +78,7 @@
#define SN_SAL_IOIF_GET_WIDGET_DMAFLUSH_LIST 0x02000058 // deprecated
#define SN_SAL_IOIF_GET_DEVICE_DMAFLUSH_LIST 0x0200005a
+#define SN_SAL_IOIF_INIT 0x0200005f
#define SN_SAL_HUB_ERROR_INTERRUPT 0x02000060
#define SN_SAL_BTE_RECOVER 0x02000061
#define SN_SAL_RESERVED_DO_NOT_USE 0x02000062
Index: acpi_support/arch/ia64/sn/kernel/setup.c
=================================--- acpi_support.orig/arch/ia64/sn/kernel/setup.c 2006-01-14 09:59:31.120420611 -0600
+++ acpi_support/arch/ia64/sn/kernel/setup.c 2006-01-14 10:02:59.822747640 -0600
@@ -3,7 +3,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (C) 1999,2001-2005 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 1999,2001-2006 Silicon Graphics, Inc. All rights reserved.
*/
#include <linux/config.h>
@@ -389,6 +389,14 @@ void __init sn_setup(char **cmdline_p)
ia64_sn_plat_set_error_handling_features(); // obsolete
ia64_sn_set_os_feature(OSF_MCA_SLV_TO_OS_INIT_SLV);
ia64_sn_set_os_feature(OSF_FEAT_LOG_SBES);
+ /*
+ * Note: The calls to notify the PROM of ACPI and PCI Segment
+ * support must be done prior to acpi_load_tables(), as
+ * an ACPI capable PROM will rebuild the DSDT as result
+ * of the call.
+ */
+ ia64_sn_set_os_feature(OSF_PCISEGMENT_ENABLE);
+ ia64_sn_set_os_feature(OSF_ACPI_ENABLE);
#if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE)
Index: acpi_support/include/asm-ia64/sn/sn_feature_sets.h
=================================--- acpi_support.orig/include/asm-ia64/sn/sn_feature_sets.h 2006-01-14 09:59:31.121397078 -0600
+++ acpi_support/include/asm-ia64/sn/sn_feature_sets.h 2006-01-14 10:02:59.823724108 -0600
@@ -8,7 +8,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (c) 2005 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (c) 2005-2006 Silicon Graphics, Inc. All rights reserved.
*/
@@ -50,8 +50,13 @@ extern int sn_prom_feature_available(int
* Once enabled, a feature cannot be disabled.
*
* By default, features are disabled unless explicitly enabled.
+ *
+ * These defines must be kept in sync with the corresponding
+ * PROM definitions in feature_sets.h.
*/
#define OSF_MCA_SLV_TO_OS_INIT_SLV 0
#define OSF_FEAT_LOG_SBES 1
+#define OSF_ACPI_ENABLE 2
+#define OSF_PCISEGMENT_ENABLE 3
#endif /* _ASM_IA64_SN_FEATURE_SETS_H */
Index: acpi_support/include/asm-ia64/sn/pcidev.h
=================================--- acpi_support.orig/include/asm-ia64/sn/pcidev.h 2006-01-14 09:59:31.121397078 -0600
+++ acpi_support/include/asm-ia64/sn/pcidev.h 2006-01-14 10:02:59.824700575 -0600
@@ -3,7 +3,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (C) 1992 - 1997, 2000-2005 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 1992 - 1997, 2000-2006 Silicon Graphics, Inc. All rights reserved.
*/
#ifndef _ASM_IA64_SN_PCI_PCIDEV_H
#define _ASM_IA64_SN_PCI_PCIDEV_H
@@ -12,31 +12,29 @@
/*
* In ia64, pci_dev->sysdata must be a *pci_controller. To provide access to
- * the pcidev_info structs for all devices under a controller, we extend the
- * definition of pci_controller, via sn_pci_controller, to include a list
- * of pcidev_info.
+ * the pcidev_info structs for all devices under a controller, we keep a
+ * list of pcidev_info under pci_controller->platform_data.
*/
-struct sn_pci_controller {
- struct pci_controller pci_controller;
+struct sn_platform_data {
+ void *provider_soft;
struct list_head pcidev_info;
};
-#define SN_PCI_CONTROLLER(dev) ((struct sn_pci_controller *) dev->sysdata)
+#define SN_PLATFORM_DATA(busdev) \
+ ((struct sn_platform_data *)(PCI_CONTROLLER(busdev)->platform_data))
#define SN_PCIDEV_INFO(dev) sn_pcidev_info_get(dev)
-#define SN_PCIBUS_BUSSOFT_INFO(pci_bus) \
- (struct pcibus_info *)((struct pcibus_bussoft *)(PCI_CONTROLLER((pci_bus))->platform_data))
/*
* Given a pci_bus, return the sn pcibus_bussoft struct. Note that
* this only works for root busses, not for busses represented by PPB's.
*/
#define SN_PCIBUS_BUSSOFT(pci_bus) \
- ((struct pcibus_bussoft *)(PCI_CONTROLLER((pci_bus))->platform_data))
+ ((struct pcibus_bussoft *)(SN_PLATFORM_DATA(pci_bus)->provider_soft))
#define SN_PCIBUS_BUSSOFT_INFO(pci_bus) \
- (struct pcibus_info *)((struct pcibus_bussoft *)(PCI_CONTROLLER((pci_bus))->platform_data))
+ ((struct pcibus_info *)(SN_PLATFORM_DATA(pci_bus)->provider_soft))
/*
* Given a struct pci_dev, return the sn pcibus_bussoft struct. Note
* that this is not equivalent to SN_PCIBUS_BUSSOFT(pci_dev->bus) due
Index: acpi_support/arch/ia64/sn/kernel/tiocx.c
=================================--- acpi_support.orig/arch/ia64/sn/kernel/tiocx.c 2006-01-14 09:59:31.120420611 -0600
+++ acpi_support/arch/ia64/sn/kernel/tiocx.c 2006-01-14 10:02:59.824700575 -0600
@@ -3,7 +3,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (c) 2005 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (c) 2005-2006 Silicon Graphics, Inc. All rights reserved.
*/
#include <linux/module.h>
@@ -548,7 +548,7 @@ static void __exit tiocx_exit(void)
bus_unregister(&tiocx_bus_type);
}
-subsys_initcall(tiocx_init);
+fs_initcall(tiocx_init);
module_exit(tiocx_exit);
/************************************************************************
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] RESEND - SN: Add initial ACPI support
2006-01-15 18:23 ` John Keller
(?)
@ 2006-01-15 20:41 ` Prarit Bhargava
-1 siblings, 0 replies; 13+ messages in thread
From: Prarit Bhargava @ 2006-01-15 20:41 UTC (permalink / raw)
To: linux-ia64
John,
Please see my comments below.
Thanks,
P.
>> Index: acpi_support/arch/ia64/kernel/Makefile
>> ================================= >> --- acpi_support.orig/arch/ia64/kernel/Makefile 2006-01-14
09:59:31.119444143 -0600
>> +++ acpi_support/arch/ia64/kernel/Makefile 2006-01-14
10:02:59.812006499 -0600
>> @@ -11,6 +11,7 @@ obj-y := acpi.o entry.o efi.o efi_stub.o
>>
>> obj-$(CONFIG_IA64_BRL_EMU) += brl_emu.o
>> obj-$(CONFIG_IA64_GENERIC) += acpi-ext.o
>> +obj-$(CONFIG_IA64_SGI_SN2) += acpi-ext.o
>> obj-$(CONFIG_IA64_HP_ZX1) += acpi-ext.o
>> obj-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += acpi-ext.o
>> obj-$(CONFIG_IA64_PALINFO) += palinfo.o
>> Index: acpi_support/arch/ia64/sn/kernel/io_init.c
>> ================================= >> --- acpi_support.orig/arch/ia64/sn/kernel/io_init.c 2006-01-14
09:59:31.119444143 -0600
>> +++ acpi_support/arch/ia64/sn/kernel/io_init.c 2006-01-15
11:33:30.679196594 -0600
>> @@ -3,7 +3,7 @@
>> * License. See the file "COPYING" in the main directory of this
archive
>> * for more details.
>> *
>> - * Copyright (C) 1992 - 1997, 2000-2005 Silicon Graphics, Inc. All
rights reserved.
>> + * Copyright (C) 1992 - 1997, 2000-2006 Silicon Graphics, Inc. All
rights reserved.
>> */
>>
>> #include <linux/bootmem.h>
>> @@ -21,6 +21,11 @@
>> #include <asm/sn/tioce_provider.h>
>> #include "xtalk/hubdev.h"
>> #include "xtalk/xwidgetdev.h"
>> +#include <linux/acpi.h>
>> +
>> +#define SN_ACPI_BASE_SUPPORT() (acpi_gbl_DSDT->oem_revision >= 0x20101)
>> +
>> +static void sn_acpi_setup(void);
>>
>> static struct list_head sn_sysdata_list;
>>
>> @@ -113,6 +118,21 @@ static inline u64 sal_get_hubdev_info(u6
>> }
>>
>> /*
>> + * Perform the early IO init in PROM.
>> + */
>> +static u64
>> +sal_ioif_init(void)
>> +{
>> + struct ia64_sal_retval ret_stuff;
>> + ret_stuff.status = 0;
>> + ret_stuff.v0 = 0;
>> +
>> + SAL_CALL_NOLOCK(ret_stuff,
>> + (u64) SN_SAL_IOIF_INIT, 0, 0, 0, 0, 0, 0, 0);
>> + return ret_stuff.v0;
>> +}
I'm currently working on a patch to standardize the SAL calls (general
cleanup, etc.. Would it be possible for you to declare
static s64
sal_ioif_init(u64 *result)
{
struct ia64_sal_retval isrv = { 0,0,0,0};
SAL_CALL_NOLOCK(ret_stuff,
(u64) SN_SAL_IOIF_INIT, 0, 0, 0, 0, 0, 0, 0);
*result = isrv.v0;
return isrv.result;
}
It's important that we get both a result and a status from the SAL call.
>> +
>> +/*
>> * Retrieve the pci bus information given the bus number.
>> */
>> static inline u64 sal_get_pcibus_info(u64 segment, u64 busnum, u64
address)
>> @@ -157,26 +177,86 @@ sn_pcidev_info_get(struct pci_dev *dev)
>> struct pcidev_info *pcidev;
>>
>> list_for_each_entry(pcidev,
>> - &(SN_PCI_CONTROLLER(dev)->pcidev_info), pdi_list) {
>> - if (pcidev->pdi_linux_pcidev = dev) {
>> + &(SN_PLATFORM_DATA(dev)->pcidev_info), pdi_list) {
>> + if (pcidev->pdi_linux_pcidev = dev)
>> return pcidev;
>> - }
>> }
>> return NULL;
>> }
>>
>> /*
>> + * sn_hubdev_init() - This routine is called to initialize the HUB data
>> + * structure for each node in the system.
>> + */
>> +static void __init
>> +sn_hubdev_init(struct hubdev_info *hubdev)
>> +{
>> +
>> + struct sn_flush_device_kernel *sn_flush_device_kernel;
>> + struct sn_flush_device_kernel *dev_entry;
>> + u64 status;
>> + int widget, device;
>> +
>> + /* Attach the error interrupt handlers */
>> + if (hubdev->hdi_nasid & 1) /* If TIO */
>> + ice_error_init(hubdev);
>> + else
>> + hub_error_init(hubdev);
>> +
>> + for (widget = 0; widget <= HUB_WIDGET_ID_MAX; widget++)
>> + hubdev->hdi_xwidget_info[widget].xwi_hubinfo = hubdev;
>> +
>> + if (!hubdev->hdi_flush_nasid_list.widget_p)
>> + return;
>> +
>> + hubdev->hdi_flush_nasid_list.widget_p >> + kzalloc((HUB_WIDGET_ID_MAX + 1) *
>> + sizeof(struct sn_flush_device_kernel *),
>> + GFP_KERNEL);
alignment and spaces instead of tabs
>> +
>> + for (widget = 0; widget <= HUB_WIDGET_ID_MAX; widget++) {
>> + sn_flush_device_kernel = kzalloc(DEV_PER_WIDGET *
>> + sizeof(struct
>> + sn_flush_device_kernel),
>> + GFP_KERNEL);
alignment and spaces instead of tabs
and this should be
sn_flush_device_kernel = kzalloc(DEV_PER_WIDGET *
sizeof(*sn_flush_device_kernel),
GFP_KERNEL);
Or at least that's what Greg KH & Matthew Wilcox learnded me :)
You probably want to make that change throughout the patch.
>> + if (!sn_flush_device_kernel)
>> + BUG();
>> +
>> + dev_entry = sn_flush_device_kernel;
>> + for (device = 0; device < DEV_PER_WIDGET;
>> + device++,dev_entry++) {
>> + dev_entry->common = kzalloc(sizeof(struct
>> + sn_flush_device_common),
>> + GFP_KERNEL);
alignment and spaces instead of tabs
>> + if (!dev_entry->common)
>> + BUG();
>> + status = sal_get_device_dmaflush_list(hubdev->hdi_nasid,
>> + widget,
>> + device,
>> + (u64)(dev_entry->common));
ditto
>> + if (status)
>> + BUG();
>> +
>> + spin_lock_init(&dev_entry->sfdl_flush_lock);
>> + }
>> +
>> + if (sn_flush_device_kernel)
>> + hubdev->hdi_flush_nasid_list.widget_p[widget] >> + sn_flush_device_kernel;
ditto
>> + }
>> +}
>> +
>> +/*
>> * sn_fixup_ionodes() - This routine initializes the HUB data
strcuture for
>> * each node in the system.
>> */
alignment
>> static void sn_fixup_ionodes(void)
>> {
>> - struct sn_flush_device_kernel *sn_flush_device_kernel;
>> - struct sn_flush_device_kernel *dev_entry;
>> +
>> struct hubdev_info *hubdev;
>> u64 status;
>> u64 nasid;
>> - int i, widget, device;
>> + int i;
>>
>> /*
>> * Get SGI Specific HUB chipset information.
>> @@ -199,64 +279,9 @@ static void sn_fixup_ionodes(void)
>> max_segment_number = hubdev->max_segment_number;
>> max_pcibus_number = hubdev->max_pcibus_number;
>> }
>> -
>> - /* Attach the error interrupt handlers */
>> - if (nasid & 1)
>> - ice_error_init(hubdev);
>> - else
>> - hub_error_init(hubdev);
>> -
>> - for (widget = 0; widget <= HUB_WIDGET_ID_MAX; widget++)
>> - hubdev->hdi_xwidget_info[widget].xwi_hubinfo = hubdev;
>> -
>> - if (!hubdev->hdi_flush_nasid_list.widget_p)
>> - continue;
>> -
>> - hubdev->hdi_flush_nasid_list.widget_p >> - kmalloc((HUB_WIDGET_ID_MAX + 1) *
>> - sizeof(struct sn_flush_device_kernel *),
>> - GFP_KERNEL);
>> - memset(hubdev->hdi_flush_nasid_list.widget_p, 0x0,
>> - (HUB_WIDGET_ID_MAX + 1) *
>> - sizeof(struct sn_flush_device_kernel *));
>> -
>> - for (widget = 0; widget <= HUB_WIDGET_ID_MAX; widget++) {
>> - sn_flush_device_kernel = kmalloc(DEV_PER_WIDGET *
>> - sizeof(struct
>> - sn_flush_device_kernel),
>> - GFP_KERNEL);
>> - if (!sn_flush_device_kernel)
>> - BUG();
>> - memset(sn_flush_device_kernel, 0x0,
>> - DEV_PER_WIDGET *
>> - sizeof(struct sn_flush_device_kernel));
>> -
>> - dev_entry = sn_flush_device_kernel;
>> - for (device = 0; device < DEV_PER_WIDGET;
>> - device++,dev_entry++) {
>> - dev_entry->common = kmalloc(sizeof(struct
>> - sn_flush_device_common),
>> - GFP_KERNEL);
>> - if (!dev_entry->common)
>> - BUG();
>> - memset(dev_entry->common, 0x0, sizeof(struct
>> - sn_flush_device_common));
>> -
>> - status = sal_get_device_dmaflush_list(nasid,
>> - widget,
>> - device,
>> - (u64)(dev_entry->common));
>> - if (status)
>> - BUG();
>> -
>> - spin_lock_init(&dev_entry->sfdl_flush_lock);
>> - }
>> -
>> - if (sn_flush_device_kernel)
>> - hubdev->hdi_flush_nasid_list.widget_p[widget] >> - sn_flush_device_kernel;
>> - }
>> + sn_hubdev_init(hubdev);
>> }
>> +
extra line?
>> }
>>
>> /*
>> @@ -351,9 +376,9 @@ void sn_pci_fixup_slot(struct pci_dev *d
>> if (status)
>> BUG(); /* Cannot get platform pci device information */
>>
>> - /* Add pcidev_info to list in sn_pci_controller struct */
>> + /* Add pcidev_info to list in pci_controller.platform_data */
>> list_add_tail(&pcidev_info->pdi_list,
>> - &(SN_PCI_CONTROLLER(dev->bus)->pcidev_info));
>> + &(SN_PLATFORM_DATA(dev->bus)->pcidev_info));
>>
>> /* Copy over PIO Mapped Addresses */
>> for (idx = 0; idx <= PCI_ROM_RESOURCE; idx++) {
>> @@ -422,70 +447,42 @@ void sn_pci_fixup_slot(struct pci_dev *d
>> }
>>
>> /*
>> - * sn_pci_controller_fixup() - This routine sets up a bus's resources
>> - * consistent with the Linux PCI abstraction layer.
>> + * sn_common_bus_fixup()
>> */
>> -void sn_pci_controller_fixup(int segment, int busnum, struct
pci_bus *bus)
>> +static int
>> +sn_common_bus_fixup(struct pci_bus *bus,
>> + struct pcibus_bussoft *prom_bussoft_ptr)
alignment
>> {
>> - int status = 0;
>> - int nasid, cnode;
>> + int cnode;
>> struct pci_controller *controller;
>> - struct sn_pci_controller *sn_controller;
>> - struct pcibus_bussoft *prom_bussoft_ptr;
>> struct hubdev_info *hubdev_info;
>> + int nasid;
>> void *provider_soft = NULL;
>> struct sn_pcibus_provider *provider;
>> + struct sn_platform_data *sn_platform_data;
>>
>> - status = sal_get_pcibus_info((u64) segment, (u64) busnum,
>> - (u64) ia64_tpa(&prom_bussoft_ptr));
>> - if (status > 0)
>> - return; /*bus # does not exist */
>> - prom_bussoft_ptr = __va(prom_bussoft_ptr);
>> -
>> - /* Allocate a sn_pci_controller, which has a pci_controller struct
>> - * as the first member.
>> - */
>> - sn_controller = kzalloc(sizeof(struct sn_pci_controller), GFP_KERNEL);
>> - if (!sn_controller)
>> - BUG();
>> - INIT_LIST_HEAD(&sn_controller->pcidev_info);
>> - controller = &sn_controller->pci_controller;
>> - controller->segment = segment;
>> -
>> - if (bus = NULL) {
>> - bus = pci_scan_bus(busnum, &pci_root_ops, controller);
>> - if (bus = NULL)
>> - goto error_return; /* error, or bus already scanned */
>> - bus->sysdata = NULL;
>> - }
>> -
>> - if (bus->sysdata)
>> - goto error_return; /* sysdata already alloc'd */
>> -
>> - /*
>> - * Per-provider fixup. Copies the contents from prom to local
>> - * area and links SN_PCIBUS_BUSSOFT().
>> - */
>> + controller = PCI_CONTROLLER(bus);
>> + /*
>> + * Per-provider fixup. Copies the bus soft structure from prom
>> + * to local area and links SN_PCIBUS_BUSSOFT().
>> + */
spaces instead of tabs
>>
>> if (prom_bussoft_ptr->bs_asic_type >= PCIIO_ASIC_MAX_TYPES)
>> - goto error_return; /* unsupported asic type */
>> + return -1; /* unsupported asic type */
>>
>> if (prom_bussoft_ptr->bs_asic_type = PCIIO_ASIC_TYPE_PPB)
>> - goto error_return; /* no further fixup necessary */
>> + return -1; /* no further fixup necessary */
>>
>> provider = sn_pci_provider[prom_bussoft_ptr->bs_asic_type];
>> if (provider = NULL)
>> - goto error_return; /* no provider registerd for this asic */
>> + return -1; /* No provider registered for this asic */
>>
>> - bus->sysdata = controller;
>> if (provider->bus_fixup)
>> - provider_soft = (*provider->bus_fixup) (prom_bussoft_ptr,
controller);
>> + provider_soft = (*provider->bus_fixup) (prom_bussoft_ptr,
>> + controller);
:) Thanks for fixing that ...
>>
>> - if (provider_soft = NULL) {
>> - /* fixup failed or not applicable */
>> - bus->sysdata = NULL;
>> - goto error_return;
>> - }
>> + if (provider_soft = NULL)
>> + return -1; /* fixup failed or not applicable */
>>
>> /*
>> * Setup pci_windows for legacy IO and MEM space.
>> @@ -514,8 +511,15 @@ void sn_pci_controller_fixup(int segment
>> * Generic bus fixup goes here. Don't reference prom_bussoft_ptr
>> * after this point.
>> */
>> -
>> - PCI_CONTROLLER(bus)->platform_data = provider_soft;
>> + controller->platform_data >> + kzalloc(sizeof(struct sn_platform_data), GFP_KERNEL);
alignment
>> + if (controller->platform_data = NULL)
>> + BUG();
>> + sn_platform_data >> + (struct sn_platform_data *) controller->platform_data;
alignment
>> + sn_platform_data->provider_soft = provider_soft;
>> + INIT_LIST_HEAD(&((struct sn_platform_data *)
>> + controller->platform_data)->pcidev_info);
alignment
>> nasid = NASID_GET(SN_PCIBUS_BUSSOFT(bus)->bs_base);
>> cnode = nasid_to_cnodeid(nasid);
>> hubdev_info = (struct hubdev_info *)(NODEPDA(cnode)->pdinfo);
>> @@ -523,8 +527,8 @@ void sn_pci_controller_fixup(int segment
>> &(hubdev_info->hdi_xwidget_info[SN_PCIBUS_BUSSOFT(bus)->bs_xid]);
>>
>> /*
>> - * If the node information we obtained during the fixup phase is
invalid
>> - * then set controller->node to -1 (undetermined)
>> + * If the node information we obtained during the fixup phase is
>> + * invalid then set controller->node to -1 (undetermined)
>> */
>> if (controller->node >= num_online_nodes()) {
>> struct pcibus_bussoft *b = SN_PCIBUS_BUSSOFT(bus);
>> @@ -538,11 +542,50 @@ void sn_pci_controller_fixup(int segment
>> controller->node, num_online_nodes());
>> controller->node = -1;
>> }
>> + return 0;
>> +}
>> +
>> +/*
>> + * sn_pci_controller_fixup() - This routine sets up a bus's resources
>> + * consistent with the Linux PCI abstraction layer.
>> + */
>> +void sn_pci_controller_fixup(int segment, int busnum, struct
pci_bus *bus)
>> +{
>> + int status = 0;
>> + struct pci_controller *controller;
>> + struct pcibus_bussoft *prom_bussoft_ptr;
>> +
>> + status = sal_get_pcibus_info((u64) segment, (u64) busnum,
>> + (u64) ia64_tpa(&prom_bussoft_ptr));
>> + if (status > 0)
>> + return; /*bus # does not exist */
>> + prom_bussoft_ptr = __va(prom_bussoft_ptr);
>> +
>> + controller = kzalloc(sizeof(struct pci_controller), GFP_KERNEL);
>> + if (!controller)
>> + BUG();
>> + controller->segment = segment;
>> +
>> + if (bus = NULL) {
>> + bus = pci_scan_bus(busnum, &pci_root_ops, controller);
>> + if (bus = NULL)
>> + goto error_return; /* error, or bus already scanned */
>> + bus->sysdata = NULL;
>> + }
>> +
>> + if (bus->sysdata)
>> + goto error_return; /* sysdata already alloc'd */
>> +
>> + bus->sysdata = controller;
>> + if (sn_common_bus_fixup(bus, prom_bussoft_ptr)) {
>> + bus->sysdata = NULL;
>> + goto error_return;
>> + }
>> return;
>>
>> error_return:
>>
>> - kfree(sn_controller);
>> + kfree(controller);
>> return;
>> }
>>
>> @@ -585,6 +628,7 @@ static int __init sn_pci_init(void)
>> {
>> int i = 0;
>> int j = 0;
>> + int status = 0;
should be s64 status
>> struct pci_dev *pci_dev = NULL;
>> extern void sn_init_cpei_timer(void);
>> #ifdef CONFIG_PROC_FS
>> @@ -610,6 +654,22 @@ static int __init sn_pci_init(void)
>> * This is needed to avoid bounce limit checks in the blk layer
>> */
>> ia64_max_iommu_merge_mask = ~PAGE_MASK;
>> +
>> + /*
>> + * If we're running with an ACPI 2.0 enabled PROM,
>> + * the PROM has generated a ACPI DSDT table, and the Linux
>> + * ACPI code will do the PCI bus scanning. We'll still need
>> + * to do some 'fixup' later on in sn_io_fixup().
>> + */
>> + printk("ACPI DSDT OEM Rev 0x%x\n", acpi_gbl_DSDT->oem_revision);
I noticed you're not including printk levels anywhere. You should do so.
>> + if (SN_ACPI_BASE_SUPPORT()) {
>> + sn_acpi_setup();
>> + status = sal_ioif_init();
With the above change,
status = sal_ioif_init(&result);
>> + if (status)
if (status || result)
>> + BUG();
Hmmm ... maybe something a bit more informational?
How about:
panic("sal_ioif_init failed: [%d] %s\n",
(int)status, ia64_sal_strerror(status));
Okay -- it's part of that SAL call cleanup :) :)
>> + return 0;
>> + }
>> +
>> sn_fixup_ionodes();
>> sn_irq_lh_init();
>> INIT_LIST_HEAD(&sn_sysdata_list);
>> @@ -679,3 +739,174 @@ EXPORT_SYMBOL(sn_pci_unfixup_slot);
>> EXPORT_SYMBOL(sn_pci_controller_fixup);
>> EXPORT_SYMBOL(sn_bus_store_sysdata);
>> EXPORT_SYMBOL(sn_bus_free_sysdata);
>> +
>> +
>> +
>> +/* IO ACPI Support */
>> +
>> +/* Copy from arch/ia64/kernel/acpi-ext.c */
>> +struct acpi_vendor_descriptor {
>> + u8 guid_id;
>> + efi_guid_t guid;
>> +};
>> +
>> +/*
>> + * Arbitrary GUID taken from internal SGI machine.
>> + * This value must match the UUID the PROM uses
>> + * (io/acpi/defblk.c) when building a vendor descriptor.
>> + */
>> +struct acpi_vendor_descriptor sn_descriptor = {
>> + .guid_id = 0,
>> + .guid = EFI_GUID(0xfea6c62c, 0x449c, 0x11da,
>> + 0xa2, 0x7c, 0x08, 0x00, 0x69, 0x13, 0xea, 0x51)
spaces instead of tabs, alignment
>> +};
>> +
>> +extern acpi_status acpi_find_vendor_resource(acpi_handle,
>> + struct acpi_vendor_descriptor *, u8 **, u32 *);
alignment
>> +
>> +
>> +/*
>> + * sn_hubdev_add() - The 'add' function of the acpi_sn_hubdev_driver.
>> + * Called for every "SGIHUB" or "SGITIO" device defined
>> + * in the ACPI namespace.
>> + */
>> +static int __init
>> +sn_hubdev_add(struct acpi_device *device)
>> +{
>> + u8 *data;
>> + struct hubdev_info *hubdev;
>> + struct hubdev_info *hubdev_ptr;
>> + int i;
>> + u32 length;
>> + u64 nasid;
>> + acpi_status status;
>> +
>> + status = acpi_find_vendor_resource(device->handle, &sn_descriptor,
>> + &data, &length);
>> + if (ACPI_FAILURE(status) || (length != 8)) {
>> + printk("sn_hubdev_add: Failure %d - Data length=%d\n",
>> + status, length);
>> + return 1;
>> + }
>> +
>> + hubdev_ptr = __va(*(struct hubdev_info **) data);
>> +
>> + nasid = hubdev_ptr->hdi_nasid;
>> + i = nasid_to_cnodeid(nasid);
>> + hubdev = (struct hubdev_info *)(NODEPDA(i)->pdinfo);
>> + *hubdev = *hubdev_ptr;
>> + sn_hubdev_init(hubdev);
>> +
>> + acpi_os_free(data);
>> + return 0;
>> +}
>> +
>> +
>> +/*
>> + * sn_pci_bus_fixup() - This routine sets up a bus' resources
>> + * consistent with the Linux PCI abstraction layer.
>> + */
>> +static int __init
>> +sn_pci_bus_fixup(struct pci_bus *bus)
>> +{
>> +
>> + struct pci_controller *controller;
>> + u8 *data;
>> + acpi_handle handle;
>> + u32 length;
>> + struct pcibus_bussoft *prom_bussoft_ptr;
>> + int ret = 0;
>> + acpi_status status;
>> +
>> + handle = PCI_CONTROLLER(bus)->acpi_handle;
>> + controller = PCI_CONTROLLER(bus);
>> +
>> + status = acpi_find_vendor_resource(handle, &sn_descriptor, &data,
>> + &length);
>> + if (ACPI_FAILURE(status) || (length != 8)) {
>> + printk("sn_pci_bus_fixup: Failure %d - length=%d\n",
>> + status, length);
>> + return -1;
>> + }
>> + prom_bussoft_ptr = __va(*(struct pcibus_bussoft **) data);
>> +
>> + if (sn_common_bus_fixup(bus, prom_bussoft_ptr)) {
>> + ret = -1;
>> + }
braces not needed
>> + acpi_os_free(data);
>> + return ret;
>> +}
>> +
>> +/*
>> + * sn_io_fixup() - Perform platform specific bus and device fixup,
>> + * if running with an ACPI capable PROM.
>> + */
>> +
>> +static int __init
>> +sn_io_fixup(void)
>> +{
>> + struct pci_bus *bus;
>> + struct pci_dev *pci_dev = NULL;
>> + extern void sn_init_cpei_timer(void);
>> +#ifdef CONFIG_PROC_FS
>> + extern void register_sn_procfs(void);
>> +#endif
>> +
>> + if (!ia64_platform_is("sn2") || IS_RUNNING_ON_FAKE_PROM())
>> + return 0;
>> +
>> + /* Exit if running with old PROM without ACPI support */
>> + if (!SN_ACPI_BASE_SUPPORT())
>> + return 0;
>> +
>> + sn_irq_lh_init();
>> + INIT_LIST_HEAD(&sn_sysdata_list);
>> + sn_init_cpei_timer();
>> +
>> +#ifdef CONFIG_PROC_FS
>> + register_sn_procfs();
>> +#endif
>> +
>> + /*
>> + * Generic Linux PCI Layer has created the pci_bus and pci_dev
>> + * structures - time for us to add our SN Platform specific
>> + * information.
>> + */
>> +
>> + bus = NULL;
>> + while ((bus = pci_find_next_bus(bus)) != NULL)
>> + sn_pci_bus_fixup(bus);
>> +
>> + while ((pci_dev >> + pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pci_dev)) != NULL) {
>> + sn_pci_fixup_slot(pci_dev);
>> + }
>> +
>> + sn_ioif_inited = 1; /* SN I/O infrastructure now initialized */
>> +
>> + return 0;
>> +}
>> +
>> +static struct acpi_driver acpi_sn_hubdev_driver = {
>> + .name = "SGI HUBDEV Driver",
>> + .ids = "SGIHUB,SGITIO",
>> + .ops = {
>> + .add = sn_hubdev_add,
spaces?
>> + },
>> +};
>> +
>> +
>> +/*
>> + * sn_acpi_setup() - Register the ACPI driver for the SGIHUB device.
>> + * This function is expected to be called prior to
>> + * ACPI initialization (acpi_init()).
>> + */
>> +static void __init
>> +sn_acpi_setup(void)
>> +{
>> + acpi_bus_register_driver(&acpi_sn_hubdev_driver);
>> +}
>> +
>> +fs_initcall(sn_io_fixup);
>> +
>> +
>> Index: acpi_support/include/asm-ia64/sn/sn_sal.h
>> ================================= >> --- acpi_support.orig/include/asm-ia64/sn/sn_sal.h 2006-01-14
09:59:31.121397078 -0600
>> +++ acpi_support/include/asm-ia64/sn/sn_sal.h 2006-01-14
10:02:59.821771173 -0600
>> @@ -8,7 +8,7 @@
>> * License. See the file "COPYING" in the main directory of this
archive
>> * for more details.
>> *
>> - * Copyright (c) 2000-2005 Silicon Graphics, Inc. All rights reserved.
>> + * Copyright (c) 2000-2006 Silicon Graphics, Inc. All rights reserved.
>> */
>>
>>
>> @@ -78,6 +78,7 @@
>> #define SN_SAL_IOIF_GET_WIDGET_DMAFLUSH_LIST 0x02000058 //
deprecated
>> #define SN_SAL_IOIF_GET_DEVICE_DMAFLUSH_LIST 0x0200005a
>>
>> +#define SN_SAL_IOIF_INIT 0x0200005f
spaces and tabs mixed ... I'm fixing the rest of the file in a later patch
anyway ... but if you could remove the 3 extra spaces on each line that
would
be great.
>> #define SN_SAL_HUB_ERROR_INTERRUPT 0x02000060
>> #define SN_SAL_BTE_RECOVER 0x02000061
>> #define SN_SAL_RESERVED_DO_NOT_USE 0x02000062
>> Index: acpi_support/arch/ia64/sn/kernel/setup.c
>> ================================= >> --- acpi_support.orig/arch/ia64/sn/kernel/setup.c 2006-01-14
09:59:31.120420611 -0600
>> +++ acpi_support/arch/ia64/sn/kernel/setup.c 2006-01-14
10:02:59.822747640 -0600
>> @@ -3,7 +3,7 @@
>> * License. See the file "COPYING" in the main directory of this
archive
>> * for more details.
>> *
>> - * Copyright (C) 1999,2001-2005 Silicon Graphics, Inc. All rights
reserved.
>> + * Copyright (C) 1999,2001-2006 Silicon Graphics, Inc. All rights
reserved.
>> */
>>
>> #include <linux/config.h>
>> @@ -389,6 +389,14 @@ void __init sn_setup(char **cmdline_p)
>> ia64_sn_plat_set_error_handling_features(); // obsolete
>> ia64_sn_set_os_feature(OSF_MCA_SLV_TO_OS_INIT_SLV);
>> ia64_sn_set_os_feature(OSF_FEAT_LOG_SBES);
>> + /*
>> + * Note: The calls to notify the PROM of ACPI and PCI Segment
>> + * support must be done prior to acpi_load_tables(), as
>> + * an ACPI capable PROM will rebuild the DSDT as result
>> + * of the call.
>> + */
>> + ia64_sn_set_os_feature(OSF_PCISEGMENT_ENABLE);
>> + ia64_sn_set_os_feature(OSF_ACPI_ENABLE);
>>
>>
>> #if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE)
>> Index: acpi_support/include/asm-ia64/sn/sn_feature_sets.h
>> ================================= >> --- acpi_support.orig/include/asm-ia64/sn/sn_feature_sets.h
2006-01-14 09:59:31.121397078 -0600
>> +++ acpi_support/include/asm-ia64/sn/sn_feature_sets.h 2006-01-14
10:02:59.823724108 -0600
>> @@ -8,7 +8,7 @@
>> * License. See the file "COPYING" in the main directory of this
archive
>> * for more details.
>> *
>> - * Copyright (c) 2005 Silicon Graphics, Inc. All rights reserved.
>> + * Copyright (c) 2005-2006 Silicon Graphics, Inc. All rights reserved.
>> */
>>
>>
>> @@ -50,8 +50,13 @@ extern int sn_prom_feature_available(int
>> * Once enabled, a feature cannot be disabled.
>> *
>> * By default, features are disabled unless explicitly enabled.
>> + *
>> + * These defines must be kept in sync with the corresponding
>> + * PROM definitions in feature_sets.h.
>> */
>> #define OSF_MCA_SLV_TO_OS_INIT_SLV 0
>> #define OSF_FEAT_LOG_SBES 1
>> +#define OSF_ACPI_ENABLE 2
>> +#define OSF_PCISEGMENT_ENABLE 3
>>
Weird alignment here on "3"
>> #endif /* _ASM_IA64_SN_FEATURE_SETS_H */
>> Index: acpi_support/include/asm-ia64/sn/pcidev.h
>> ================================= >> --- acpi_support.orig/include/asm-ia64/sn/pcidev.h 2006-01-14
09:59:31.121397078 -0600
>> +++ acpi_support/include/asm-ia64/sn/pcidev.h 2006-01-14
10:02:59.824700575 -0600
>> @@ -3,7 +3,7 @@
>> * License. See the file "COPYING" in the main directory of this
archive
>> * for more details.
>> *
>> - * Copyright (C) 1992 - 1997, 2000-2005 Silicon Graphics, Inc. All
rights reserved.
>> + * Copyright (C) 1992 - 1997, 2000-2006 Silicon Graphics, Inc. All
rights reserved.
>> */
>> #ifndef _ASM_IA64_SN_PCI_PCIDEV_H
>> #define _ASM_IA64_SN_PCI_PCIDEV_H
>> @@ -12,31 +12,29 @@
>>
>> /*
>> * In ia64, pci_dev->sysdata must be a *pci_controller. To provide
access to
>> - * the pcidev_info structs for all devices under a controller, we
extend the
>> - * definition of pci_controller, via sn_pci_controller, to include
a list
>> - * of pcidev_info.
>> + * the pcidev_info structs for all devices under a controller, we
keep a
>> + * list of pcidev_info under pci_controller->platform_data.
>> */
>> -struct sn_pci_controller {
>> - struct pci_controller pci_controller;
>> +struct sn_platform_data {
>> + void *provider_soft;
>> struct list_head pcidev_info;
>> };
>>
>> -#define SN_PCI_CONTROLLER(dev) ((struct sn_pci_controller *)
dev->sysdata)
>> +#define SN_PLATFORM_DATA(busdev) \
>> + ((struct sn_platform_data *)(PCI_CONTROLLER(busdev)->platform_data))
>>
>> #define SN_PCIDEV_INFO(dev) sn_pcidev_info_get(dev)
>>
>> -#define SN_PCIBUS_BUSSOFT_INFO(pci_bus) \
>> - (struct pcibus_info *)((struct pcibus_bussoft
*)(PCI_CONTROLLER((pci_bus))->platform_data))
>> /*
>> * Given a pci_bus, return the sn pcibus_bussoft struct. Note that
>> * this only works for root busses, not for busses represented by
PPB's.
>> */
>>
>> #define SN_PCIBUS_BUSSOFT(pci_bus) \
>> - ((struct pcibus_bussoft
*)(PCI_CONTROLLER((pci_bus))->platform_data))
>> + ((struct pcibus_bussoft
*)(SN_PLATFORM_DATA(pci_bus)->provider_soft))
>>
spaces instead of tabs
>> #define SN_PCIBUS_BUSSOFT_INFO(pci_bus) \
>> - (struct pcibus_info *)((struct pcibus_bussoft
*)(PCI_CONTROLLER((pci_bus))->platform_data))
>> + ((struct pcibus_info *)(SN_PLATFORM_DATA(pci_bus)->provider_soft))
>> /*
>> * Given a struct pci_dev, return the sn pcibus_bussoft struct. Note
>> * that this is not equivalent to SN_PCIBUS_BUSSOFT(pci_dev->bus) due
>> Index: acpi_support/arch/ia64/sn/kernel/tiocx.c
>> ================================= >> --- acpi_support.orig/arch/ia64/sn/kernel/tiocx.c 2006-01-14
09:59:31.120420611 -0600
>> +++ acpi_support/arch/ia64/sn/kernel/tiocx.c 2006-01-14
10:02:59.824700575 -0600
>> @@ -3,7 +3,7 @@
>> * License. See the file "COPYING" in the main directory of this
archive
>> * for more details.
>> *
>> - * Copyright (c) 2005 Silicon Graphics, Inc. All rights reserved.
>> + * Copyright (c) 2005-2006 Silicon Graphics, Inc. All rights reserved.
>> */
>>
>> #include <linux/module.h>
>> @@ -548,7 +548,7 @@ static void __exit tiocx_exit(void)
>> bus_unregister(&tiocx_bus_type);
>> }
>>
>> -subsys_initcall(tiocx_init);
>> +fs_initcall(tiocx_init);
>> module_exit(tiocx_exit);
>>
>>
/************************************************************************
>> -
>> To unsubscribe from this list: send the line "unsubscribe linux-ia64" in
>> the body of a message to majordomo@vger.kernel.org
>> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] RESEND - SN: Add initial ACPI support
2006-01-15 18:23 ` John Keller
@ 2006-01-16 8:21 ` Jes Sorensen
-1 siblings, 0 replies; 13+ messages in thread
From: Jes Sorensen @ 2006-01-16 8:21 UTC (permalink / raw)
To: John Keller; +Cc: linux-ia64, linux-acpi
>>>>> "John" == John Keller <jpk@sgi.com> writes:
John> Please disregard the earlier (01/14) post of this patch. I
John> erroneously sent out an early version, which was not fully
John> merged with the latest ia64 git tree.
Hi John,
Looks much better. On top of Prarit's comments I just noticed this
one:
+ if (!hubdev->hdi_flush_nasid_list.widget_p)
+ return;
+
+ hubdev->hdi_flush_nasid_list.widget_p =
+ kzalloc((HUB_WIDGET_ID_MAX + 1) *
+ sizeof(struct sn_flush_device_kernel *),
+ GFP_KERNEL);
This doesn't look right, if widget_p is NULL no alloc ortherwise
overwrite it? Did the order get reversed?
Cheers,
Jes
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] RESEND - SN: Add initial ACPI support
@ 2006-01-16 8:21 ` Jes Sorensen
0 siblings, 0 replies; 13+ messages in thread
From: Jes Sorensen @ 2006-01-16 8:21 UTC (permalink / raw)
To: John Keller; +Cc: linux-ia64, linux-acpi
>>>>> "John" = John Keller <jpk@sgi.com> writes:
John> Please disregard the earlier (01/14) post of this patch. I
John> erroneously sent out an early version, which was not fully
John> merged with the latest ia64 git tree.
Hi John,
Looks much better. On top of Prarit's comments I just noticed this
one:
+ if (!hubdev->hdi_flush_nasid_list.widget_p)
+ return;
+
+ hubdev->hdi_flush_nasid_list.widget_p + kzalloc((HUB_WIDGET_ID_MAX + 1) *
+ sizeof(struct sn_flush_device_kernel *),
+ GFP_KERNEL);
This doesn't look right, if widget_p is NULL no alloc ortherwise
overwrite it? Did the order get reversed?
Cheers,
Jes
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH] RESEND - SN: Add initial ACPI support
2006-01-15 18:23 ` John Keller
@ 2006-01-23 16:00 ` John Keller
-1 siblings, 0 replies; 13+ messages in thread
From: John Keller @ 2006-01-23 16:00 UTC (permalink / raw)
To: linux-ia64; +Cc: linux-acpi, John Keller
resend #3
Changes made to correct alignment, white space,
and coding style issues.
-------
First phase in introducing ACPI support to SN.
In this phase, when running with an ACPI capable PROM,
the DSDT will define the root busses and all SN nodes
(SGIHUB, SGITIO). An acpi bus driver will be registered
for the node devices, with the acpi_pci_root_driver being
used for the root busses. Platform specific info is passed
via vendor descriptors, eliminating the corresponding SAL
calls. SN fixup code no longer needs to initiate the
pci bus scans, as the acpi_pci_root_driver takes care of that
now.
To maintain backward compatibility with non-ACPI capable PROMs,
none of the current 'fixup' code has been deleted.
Signed-off-by: John Keller <jpk@sgi.com>
Index: acpi_support.0117/arch/ia64/kernel/Makefile
===================================================================
--- acpi_support.0117.orig/arch/ia64/kernel/Makefile 2006-01-17 07:57:05.147876633 -0600
+++ acpi_support.0117/arch/ia64/kernel/Makefile 2006-01-17 07:58:39.615201038 -0600
@@ -11,6 +11,7 @@ obj-y := acpi.o entry.o efi.o efi_stub.o
obj-$(CONFIG_IA64_BRL_EMU) += brl_emu.o
obj-$(CONFIG_IA64_GENERIC) += acpi-ext.o
+obj-$(CONFIG_IA64_SGI_SN2) += acpi-ext.o
obj-$(CONFIG_IA64_HP_ZX1) += acpi-ext.o
obj-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += acpi-ext.o
obj-$(CONFIG_IA64_PALINFO) += palinfo.o
Index: acpi_support.0117/arch/ia64/sn/kernel/io_init.c
===================================================================
--- acpi_support.0117.orig/arch/ia64/sn/kernel/io_init.c 2006-01-17 07:57:05.369534645 -0600
+++ acpi_support.0117/arch/ia64/sn/kernel/io_init.c 2006-01-19 07:53:17.925675991 -0600
@@ -3,7 +3,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (C) 1992 - 1997, 2000-2005 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 1992 - 1997, 2000-2006 Silicon Graphics, Inc. All rights reserved.
*/
#include <linux/bootmem.h>
@@ -21,6 +21,11 @@
#include <asm/sn/tioce_provider.h>
#include "xtalk/hubdev.h"
#include "xtalk/xwidgetdev.h"
+#include <linux/acpi.h>
+
+#define SN_ACPI_BASE_SUPPORT() (acpi_gbl_DSDT->oem_revision >= 0x20101)
+
+static void sn_acpi_setup(void);
static struct list_head sn_sysdata_list;
@@ -113,6 +118,20 @@ static inline u64 sal_get_hubdev_info(u6
}
/*
+ * Perform the early IO init in PROM.
+ */
+static s64
+sal_ioif_init(u64 *result)
+{
+ struct ia64_sal_retval isrv = {0,0,0,0};
+
+ SAL_CALL_NOLOCK(isrv,
+ SN_SAL_IOIF_INIT, 0, 0, 0, 0, 0, 0, 0);
+ *result = isrv.v0;
+ return isrv.status;
+}
+
+/*
* Retrieve the pci bus information given the bus number.
*/
static inline u64 sal_get_pcibus_info(u64 segment, u64 busnum, u64 address)
@@ -157,26 +176,87 @@ sn_pcidev_info_get(struct pci_dev *dev)
struct pcidev_info *pcidev;
list_for_each_entry(pcidev,
- &(SN_PCI_CONTROLLER(dev)->pcidev_info), pdi_list) {
- if (pcidev->pdi_linux_pcidev == dev) {
+ &(SN_PLATFORM_DATA(dev)->pcidev_info), pdi_list) {
+ if (pcidev->pdi_linux_pcidev == dev)
return pcidev;
- }
}
return NULL;
}
/*
- * sn_fixup_ionodes() - This routine initializes the HUB data strcuture for
- * each node in the system.
+ * sn_hubdev_init() - This routine is called to initialize the HUB data
+ * structure for each node in the system.
*/
-static void sn_fixup_ionodes(void)
+static void __init
+sn_hubdev_init(struct hubdev_info *hubdev)
{
+
struct sn_flush_device_kernel *sn_flush_device_kernel;
struct sn_flush_device_kernel *dev_entry;
+ s64 status;
+ int widget, device;
+
+ /* Attach the error interrupt handlers */
+ if (hubdev->hdi_nasid & 1) /* If TIO */
+ ice_error_init(hubdev);
+ else
+ hub_error_init(hubdev);
+
+ for (widget = 0; widget <= HUB_WIDGET_ID_MAX; widget++)
+ hubdev->hdi_xwidget_info[widget].xwi_hubinfo = hubdev;
+
+ if (!hubdev->hdi_flush_nasid_list.widget_p)
+ return;
+
+ hubdev->hdi_flush_nasid_list.widget_p =
+ kzalloc((HUB_WIDGET_ID_MAX + 1) *
+ sizeof(struct sn_flush_device_kernel *),
+ GFP_KERNEL);
+ if (!hubdev->hdi_flush_nasid_list.widget_p)
+ BUG();
+
+ for (widget = 0; widget <= HUB_WIDGET_ID_MAX; widget++) {
+ sn_flush_device_kernel = kzalloc(DEV_PER_WIDGET *
+ sizeof(*sn_flush_device_kernel),
+ GFP_KERNEL);
+ if (!sn_flush_device_kernel)
+ BUG();
+
+ dev_entry = sn_flush_device_kernel;
+ for (device = 0; device < DEV_PER_WIDGET;
+ device++, dev_entry++) {
+ dev_entry->common = kzalloc(sizeof(struct
+ sn_flush_device_common),
+ GFP_KERNEL);
+ if (!dev_entry->common)
+ BUG();
+ status = sal_get_device_dmaflush_list(hubdev->hdi_nasid,
+ widget,
+ device,
+ (u64)(dev_entry->common));
+ if (status)
+ BUG();
+
+ spin_lock_init(&dev_entry->sfdl_flush_lock);
+ }
+
+ if (sn_flush_device_kernel)
+ hubdev->hdi_flush_nasid_list.widget_p[widget] =
+ sn_flush_device_kernel;
+ }
+}
+
+/*
+ * sn_fixup_ionodes() - This routine initializes the HUB data strcuture for
+ * each node in the system.
+ */
+static void sn_fixup_ionodes(void)
+{
+
struct hubdev_info *hubdev;
u64 status;
u64 nasid;
- int i, widget, device;
+ int i;
/*
* Get SGI Specific HUB chipset information.
@@ -199,63 +279,7 @@ static void sn_fixup_ionodes(void)
max_segment_number = hubdev->max_segment_number;
max_pcibus_number = hubdev->max_pcibus_number;
}
-
- /* Attach the error interrupt handlers */
- if (nasid & 1)
- ice_error_init(hubdev);
- else
- hub_error_init(hubdev);
-
- for (widget = 0; widget <= HUB_WIDGET_ID_MAX; widget++)
- hubdev->hdi_xwidget_info[widget].xwi_hubinfo = hubdev;
-
- if (!hubdev->hdi_flush_nasid_list.widget_p)
- continue;
-
- hubdev->hdi_flush_nasid_list.widget_p =
- kmalloc((HUB_WIDGET_ID_MAX + 1) *
- sizeof(struct sn_flush_device_kernel *),
- GFP_KERNEL);
- memset(hubdev->hdi_flush_nasid_list.widget_p, 0x0,
- (HUB_WIDGET_ID_MAX + 1) *
- sizeof(struct sn_flush_device_kernel *));
-
- for (widget = 0; widget <= HUB_WIDGET_ID_MAX; widget++) {
- sn_flush_device_kernel = kmalloc(DEV_PER_WIDGET *
- sizeof(struct
- sn_flush_device_kernel),
- GFP_KERNEL);
- if (!sn_flush_device_kernel)
- BUG();
- memset(sn_flush_device_kernel, 0x0,
- DEV_PER_WIDGET *
- sizeof(struct sn_flush_device_kernel));
-
- dev_entry = sn_flush_device_kernel;
- for (device = 0; device < DEV_PER_WIDGET;
- device++,dev_entry++) {
- dev_entry->common = kmalloc(sizeof(struct
- sn_flush_device_common),
- GFP_KERNEL);
- if (!dev_entry->common)
- BUG();
- memset(dev_entry->common, 0x0, sizeof(struct
- sn_flush_device_common));
-
- status = sal_get_device_dmaflush_list(nasid,
- widget,
- device,
- (u64)(dev_entry->common));
- if (status)
- BUG();
-
- spin_lock_init(&dev_entry->sfdl_flush_lock);
- }
-
- if (sn_flush_device_kernel)
- hubdev->hdi_flush_nasid_list.widget_p[widget] =
- sn_flush_device_kernel;
- }
+ sn_hubdev_init(hubdev);
}
}
@@ -351,9 +375,9 @@ void sn_pci_fixup_slot(struct pci_dev *d
if (status)
BUG(); /* Cannot get platform pci device information */
- /* Add pcidev_info to list in sn_pci_controller struct */
+ /* Add pcidev_info to list in pci_controller.platform_data */
list_add_tail(&pcidev_info->pdi_list,
- &(SN_PCI_CONTROLLER(dev->bus)->pcidev_info));
+ &(SN_PLATFORM_DATA(dev->bus)->pcidev_info));
/* Copy over PIO Mapped Addresses */
for (idx = 0; idx <= PCI_ROM_RESOURCE; idx++) {
@@ -422,70 +446,42 @@ void sn_pci_fixup_slot(struct pci_dev *d
}
/*
- * sn_pci_controller_fixup() - This routine sets up a bus's resources
- * consistent with the Linux PCI abstraction layer.
+ * sn_common_bus_fixup()
*/
-void sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
+static int
+sn_common_bus_fixup(struct pci_bus *bus,
+ struct pcibus_bussoft *prom_bussoft_ptr)
{
- int status = 0;
- int nasid, cnode;
+ int cnode;
struct pci_controller *controller;
- struct sn_pci_controller *sn_controller;
- struct pcibus_bussoft *prom_bussoft_ptr;
struct hubdev_info *hubdev_info;
+ int nasid;
void *provider_soft = NULL;
struct sn_pcibus_provider *provider;
+ struct sn_platform_data *sn_platform_data;
- status = sal_get_pcibus_info((u64) segment, (u64) busnum,
- (u64) ia64_tpa(&prom_bussoft_ptr));
- if (status > 0)
- return; /*bus # does not exist */
- prom_bussoft_ptr = __va(prom_bussoft_ptr);
-
- /* Allocate a sn_pci_controller, which has a pci_controller struct
- * as the first member.
- */
- sn_controller = kzalloc(sizeof(struct sn_pci_controller), GFP_KERNEL);
- if (!sn_controller)
- BUG();
- INIT_LIST_HEAD(&sn_controller->pcidev_info);
- controller = &sn_controller->pci_controller;
- controller->segment = segment;
-
- if (bus == NULL) {
- bus = pci_scan_bus(busnum, &pci_root_ops, controller);
- if (bus == NULL)
- goto error_return; /* error, or bus already scanned */
- bus->sysdata = NULL;
- }
-
- if (bus->sysdata)
- goto error_return; /* sysdata already alloc'd */
-
+ controller = PCI_CONTROLLER(bus);
/*
- * Per-provider fixup. Copies the contents from prom to local
- * area and links SN_PCIBUS_BUSSOFT().
+ * Per-provider fixup. Copies the bus soft structure from prom
+ * to local area and links SN_PCIBUS_BUSSOFT().
*/
if (prom_bussoft_ptr->bs_asic_type >= PCIIO_ASIC_MAX_TYPES)
- goto error_return; /* unsupported asic type */
+ return -1; /* unsupported asic type */
if (prom_bussoft_ptr->bs_asic_type == PCIIO_ASIC_TYPE_PPB)
- goto error_return; /* no further fixup necessary */
+ return -1; /* no further fixup necessary */
provider = sn_pci_provider[prom_bussoft_ptr->bs_asic_type];
if (provider == NULL)
- goto error_return; /* no provider registerd for this asic */
+ return -1; /* No provider registered for this asic */
- bus->sysdata = controller;
if (provider->bus_fixup)
- provider_soft = (*provider->bus_fixup) (prom_bussoft_ptr, controller);
+ provider_soft = (*provider->bus_fixup) (prom_bussoft_ptr,
+ controller);
- if (provider_soft == NULL) {
- /* fixup failed or not applicable */
- bus->sysdata = NULL;
- goto error_return;
- }
+ if (provider_soft == NULL)
+ return -1; /* fixup failed or not applicable */
/*
* Setup pci_windows for legacy IO and MEM space.
@@ -514,8 +510,15 @@ void sn_pci_controller_fixup(int segment
* Generic bus fixup goes here. Don't reference prom_bussoft_ptr
* after this point.
*/
-
- PCI_CONTROLLER(bus)->platform_data = provider_soft;
+ controller->platform_data = kzalloc(sizeof(struct sn_platform_data),
+ GFP_KERNEL);
+ if (controller->platform_data == NULL)
+ BUG();
+ sn_platform_data =
+ (struct sn_platform_data *) controller->platform_data;
+ sn_platform_data->provider_soft = provider_soft;
+ INIT_LIST_HEAD(&((struct sn_platform_data *)
+ controller->platform_data)->pcidev_info);
nasid = NASID_GET(SN_PCIBUS_BUSSOFT(bus)->bs_base);
cnode = nasid_to_cnodeid(nasid);
hubdev_info = (struct hubdev_info *)(NODEPDA(cnode)->pdinfo);
@@ -523,26 +526,65 @@ void sn_pci_controller_fixup(int segment
&(hubdev_info->hdi_xwidget_info[SN_PCIBUS_BUSSOFT(bus)->bs_xid]);
/*
- * If the node information we obtained during the fixup phase is invalid
- * then set controller->node to -1 (undetermined)
+ * If the node information we obtained during the fixup phase is
+ * invalid then set controller->node to -1 (undetermined)
*/
if (controller->node >= num_online_nodes()) {
struct pcibus_bussoft *b = SN_PCIBUS_BUSSOFT(bus);
printk(KERN_WARNING "Device ASIC=%u XID=%u PBUSNUM=%u"
- "L_IO=%lx L_MEM=%lx BASE=%lx\n",
- b->bs_asic_type, b->bs_xid, b->bs_persist_busnum,
- b->bs_legacy_io, b->bs_legacy_mem, b->bs_base);
+ "L_IO=%lx L_MEM=%lx BASE=%lx\n",
+ b->bs_asic_type, b->bs_xid, b->bs_persist_busnum,
+ b->bs_legacy_io, b->bs_legacy_mem, b->bs_base);
printk(KERN_WARNING "on node %d but only %d nodes online."
- "Association set to undetermined.\n",
- controller->node, num_online_nodes());
+ "Association set to undetermined.\n",
+ controller->node, num_online_nodes());
controller->node = -1;
}
+ return 0;
+}
+
+/*
+ * sn_pci_controller_fixup() - This routine sets up a bus's resources
+ * consistent with the Linux PCI abstraction layer.
+ */
+void sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
+{
+ s64 status = 0;
+ struct pci_controller *controller;
+ struct pcibus_bussoft *prom_bussoft_ptr;
+
+ status = sal_get_pcibus_info((u64) segment, (u64) busnum,
+ (u64) ia64_tpa(&prom_bussoft_ptr));
+ if (status > 0)
+ return; /*bus # does not exist */
+ prom_bussoft_ptr = __va(prom_bussoft_ptr);
+
+ controller = kzalloc(sizeof(*controller), GFP_KERNEL);
+ if (!controller)
+ BUG();
+ controller->segment = segment;
+
+ if (bus == NULL) {
+ bus = pci_scan_bus(busnum, &pci_root_ops, controller);
+ if (bus == NULL)
+ goto error_return; /* error, or bus already scanned */
+ bus->sysdata = NULL;
+ }
+
+ if (bus->sysdata)
+ goto error_return; /* sysdata already alloc'd */
+
+ bus->sysdata = controller;
+ if (sn_common_bus_fixup(bus, prom_bussoft_ptr)) {
+ bus->sysdata = NULL;
+ goto error_return;
+ }
return;
error_return:
- kfree(sn_controller);
+ kfree(controller);
return;
}
@@ -585,6 +627,8 @@ static int __init sn_pci_init(void)
{
int i = 0;
int j = 0;
+ u64 result;
+ s64 status = 0;
struct pci_dev *pci_dev = NULL;
extern void sn_init_cpei_timer(void);
#ifdef CONFIG_PROC_FS
@@ -610,6 +654,24 @@ static int __init sn_pci_init(void)
* This is needed to avoid bounce limit checks in the blk layer
*/
ia64_max_iommu_merge_mask = ~PAGE_MASK;
+
+ /*
+ * If we're running with an ACPI 2.0 enabled PROM,
+ * the PROM has generated a ACPI DSDT table, and the Linux
+ * ACPI code will do the PCI bus scanning. We'll still need
+ * to do some 'fixup' later on in sn_io_fixup().
+ */
+ printk(KERN_INFO "ACPI DSDT OEM Rev 0x%x\n",
+ acpi_gbl_DSDT->oem_revision);
+ if (SN_ACPI_BASE_SUPPORT()) {
+ sn_acpi_setup();
+ status = sal_ioif_init(&result);
+ if (status || result)
+ panic("sal_ioif_init failed: [%lx] %s\n",
+ status, ia64_sal_strerror(status));
+ return 0;
+ }
+
sn_fixup_ionodes();
sn_irq_lh_init();
INIT_LIST_HEAD(&sn_sysdata_list);
@@ -679,3 +741,171 @@ EXPORT_SYMBOL(sn_pci_unfixup_slot);
EXPORT_SYMBOL(sn_pci_controller_fixup);
EXPORT_SYMBOL(sn_bus_store_sysdata);
EXPORT_SYMBOL(sn_bus_free_sysdata);
+
+
+
+/* IO ACPI Support */
+
+/* Copy from arch/ia64/kernel/acpi-ext.c */
+struct acpi_vendor_descriptor {
+ u8 guid_id;
+ efi_guid_t guid;
+};
+
+/*
+ * Arbitrary GUID taken from internal SGI machine. * This value must match the UUID the PROM uses * (io/acpi/defblk.c) when building a vendor descriptor. */
+struct acpi_vendor_descriptor sn_descriptor = {
+ .guid_id = 0,
+ .guid = EFI_GUID(0xfea6c62c, 0x449c, 0x11da,
+ 0xa2, 0x7c, 0x08, 0x00, 0x69, 0x13, 0xea, 0x51)
+};
+
+extern acpi_status acpi_find_vendor_resource(acpi_handle,
+ struct acpi_vendor_descriptor *,
+ u8 **, u32 *);
+
+
+/*
+ * sn_hubdev_add() - The 'add' function of the acpi_sn_hubdev_driver.
+ * Called for every "SGIHUB" or "SGITIO" device defined
+ * in the ACPI namespace.
+ */
+static int __init
+sn_hubdev_add(struct acpi_device *device)
+{
+ u8 *data;
+ struct hubdev_info *hubdev;
+ struct hubdev_info *hubdev_ptr;
+ int i;
+ u32 length;
+ u64 nasid;
+ acpi_status status;
+
+ status = acpi_find_vendor_resource(device->handle, &sn_descriptor,
+ &data, &length);
+ if (ACPI_FAILURE(status) || (length != 8)) {
+ printk(KERN_ERR "sn_hubdev_add: Failure %d - Data length=%d\n",
+ status, length);
+ return 1;
+ }
+
+ hubdev_ptr = __va(*(struct hubdev_info **) data);
+
+ nasid = hubdev_ptr->hdi_nasid;
+ i = nasid_to_cnodeid(nasid);
+ hubdev = (struct hubdev_info *)(NODEPDA(i)->pdinfo);
+ *hubdev = *hubdev_ptr;
+ sn_hubdev_init(hubdev);
+
+ acpi_os_free(data);
+ return 0;
+}
+
+
+/*
+ * sn_pci_bus_fixup() - This routine sets up a bus' resources
+ * consistent with the Linux PCI abstraction layer.
+ */
+static int __init
+sn_pci_bus_fixup(struct pci_bus *bus)
+{
+
+ struct pci_controller *controller;
+ u8 *data;
+ acpi_handle handle;
+ u32 length;
+ struct pcibus_bussoft *prom_bussoft_ptr;
+ int ret = 0;
+ acpi_status status;
+
+ handle = PCI_CONTROLLER(bus)->acpi_handle;
+ controller = PCI_CONTROLLER(bus);
+
+ status = acpi_find_vendor_resource(handle, &sn_descriptor, &data,
+ &length);
+ if (ACPI_FAILURE(status) || (length != 8)) {
+ printk(KERN_ERR "sn_pci_bus_fixup: Failure %d - length=%d\n",
+ status, length);
+ return -1;
+ }
+ prom_bussoft_ptr = __va(*(struct pcibus_bussoft **) data);
+
+ if (sn_common_bus_fixup(bus, prom_bussoft_ptr))
+ ret = -1;
+ acpi_os_free(data);
+ return ret;
+}
+
+/*
+ * sn_io_fixup() - Perform platform specific bus and device fixup,
+ * if running with an ACPI capable PROM.
+ */
+
+static int __init
+sn_io_fixup(void)
+{
+ struct pci_bus *bus;
+ struct pci_dev *pci_dev = NULL;
+ extern void sn_init_cpei_timer(void);
+#ifdef CONFIG_PROC_FS
+ extern void register_sn_procfs(void);
+#endif
+
+ if (!ia64_platform_is("sn2") || IS_RUNNING_ON_FAKE_PROM())
+ return 0;
+
+ /* Exit if running with old PROM without ACPI support */
+ if (!SN_ACPI_BASE_SUPPORT())
+ return 0;
+
+ sn_irq_lh_init();
+ INIT_LIST_HEAD(&sn_sysdata_list);
+ sn_init_cpei_timer();
+
+#ifdef CONFIG_PROC_FS
+ register_sn_procfs();
+#endif
+
+ /*
+ * Generic Linux PCI Layer has created the pci_bus and pci_dev
+ * structures - time for us to add our SN Platform specific
+ * information.
+ */
+
+ bus = NULL;
+ while ((bus = pci_find_next_bus(bus)) != NULL)
+ sn_pci_bus_fixup(bus);
+
+ while ((pci_dev =
+ pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pci_dev)) != NULL) {
+ sn_pci_fixup_slot(pci_dev);
+ }
+
+ sn_ioif_inited = 1; /* SN I/O infrastructure now initialized */
+
+ return 0;
+}
+
+static struct acpi_driver acpi_sn_hubdev_driver = {
+ .name = "SGI HUBDEV Driver",
+ .ids = "SGIHUB,SGITIO",
+ .ops = {
+ .add = sn_hubdev_add,
+ },
+};
+
+
+/*
+ * sn_acpi_setup() - Register the ACPI driver for the SGIHUB device.
+ * This function is expected to be called prior to
+ * ACPI initialization (acpi_init()).
+ */
+static void __init
+sn_acpi_setup(void)
+{
+ acpi_bus_register_driver(&acpi_sn_hubdev_driver);
+}
+
+fs_initcall(sn_io_fixup);
+
+
Index: acpi_support.0117/include/asm-ia64/sn/sn_sal.h
===================================================================
--- acpi_support.0117.orig/include/asm-ia64/sn/sn_sal.h 2006-01-17 07:57:27.084208031 -0600
+++ acpi_support.0117/include/asm-ia64/sn/sn_sal.h 2006-01-17 08:53:26.304384528 -0600
@@ -8,7 +8,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (c) 2000-2005 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Silicon Graphics, Inc. All rights reserved.
*/
@@ -78,6 +78,7 @@
#define SN_SAL_IOIF_GET_WIDGET_DMAFLUSH_LIST 0x02000058 // deprecated
#define SN_SAL_IOIF_GET_DEVICE_DMAFLUSH_LIST 0x0200005a
+#define SN_SAL_IOIF_INIT 0x0200005f
#define SN_SAL_HUB_ERROR_INTERRUPT 0x02000060
#define SN_SAL_BTE_RECOVER 0x02000061
#define SN_SAL_RESERVED_DO_NOT_USE 0x02000062
Index: acpi_support.0117/arch/ia64/sn/kernel/setup.c
===================================================================
--- acpi_support.0117.orig/arch/ia64/sn/kernel/setup.c 2006-01-17 07:57:05.372464046 -0600
+++ acpi_support.0117/arch/ia64/sn/kernel/setup.c 2006-01-17 07:58:39.623012774 -0600
@@ -3,7 +3,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (C) 1999,2001-2005 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 1999,2001-2006 Silicon Graphics, Inc. All rights reserved.
*/
#include <linux/config.h>
@@ -389,6 +389,14 @@ void __init sn_setup(char **cmdline_p)
ia64_sn_plat_set_error_handling_features(); // obsolete
ia64_sn_set_os_feature(OSF_MCA_SLV_TO_OS_INIT_SLV);
ia64_sn_set_os_feature(OSF_FEAT_LOG_SBES);
+ /*
+ * Note: The calls to notify the PROM of ACPI and PCI Segment
+ * support must be done prior to acpi_load_tables(), as
+ * an ACPI capable PROM will rebuild the DSDT as result
+ * of the call.
+ */
+ ia64_sn_set_os_feature(OSF_PCISEGMENT_ENABLE);
+ ia64_sn_set_os_feature(OSF_ACPI_ENABLE);
#if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE)
Index: acpi_support.0117/include/asm-ia64/sn/sn_feature_sets.h
===================================================================
--- acpi_support.0117.orig/include/asm-ia64/sn/sn_feature_sets.h 2006-01-17 07:57:27.067608091 -0600
+++ acpi_support.0117/include/asm-ia64/sn/sn_feature_sets.h 2006-01-17 08:54:33.551701922 -0600
@@ -8,7 +8,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (c) 2005 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (c) 2005-2006 Silicon Graphics, Inc. All rights reserved.
*/
@@ -50,8 +50,13 @@ extern int sn_prom_feature_available(int
* Once enabled, a feature cannot be disabled.
*
* By default, features are disabled unless explicitly enabled.
+ *
+ * These defines must be kept in sync with the corresponding
+ * PROM definitions in feature_sets.h.
*/
#define OSF_MCA_SLV_TO_OS_INIT_SLV 0
#define OSF_FEAT_LOG_SBES 1
+#define OSF_ACPI_ENABLE 2
+#define OSF_PCISEGMENT_ENABLE 3
#endif /* _ASM_IA64_SN_FEATURE_SETS_H */
Index: acpi_support.0117/include/asm-ia64/sn/pcidev.h
===================================================================
--- acpi_support.0117.orig/include/asm-ia64/sn/pcidev.h 2006-01-17 07:57:27.060772822 -0600
+++ acpi_support.0117/include/asm-ia64/sn/pcidev.h 2006-01-17 08:55:39.340174903 -0600
@@ -3,7 +3,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (C) 1992 - 1997, 2000-2005 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 1992 - 1997, 2000-2006 Silicon Graphics, Inc. All rights reserved.
*/
#ifndef _ASM_IA64_SN_PCI_PCIDEV_H
#define _ASM_IA64_SN_PCI_PCIDEV_H
@@ -12,31 +12,29 @@
/*
* In ia64, pci_dev->sysdata must be a *pci_controller. To provide access to
- * the pcidev_info structs for all devices under a controller, we extend the
- * definition of pci_controller, via sn_pci_controller, to include a list
- * of pcidev_info.
+ * the pcidev_info structs for all devices under a controller, we keep a
+ * list of pcidev_info under pci_controller->platform_data.
*/
-struct sn_pci_controller {
- struct pci_controller pci_controller;
+struct sn_platform_data {
+ void *provider_soft;
struct list_head pcidev_info;
};
-#define SN_PCI_CONTROLLER(dev) ((struct sn_pci_controller *) dev->sysdata)
+#define SN_PLATFORM_DATA(busdev) \
+ ((struct sn_platform_data *)(PCI_CONTROLLER(busdev)->platform_data))
#define SN_PCIDEV_INFO(dev) sn_pcidev_info_get(dev)
-#define SN_PCIBUS_BUSSOFT_INFO(pci_bus) \
- (struct pcibus_info *)((struct pcibus_bussoft *)(PCI_CONTROLLER((pci_bus))->platform_data))
/*
* Given a pci_bus, return the sn pcibus_bussoft struct. Note that
* this only works for root busses, not for busses represented by PPB's.
*/
#define SN_PCIBUS_BUSSOFT(pci_bus) \
- ((struct pcibus_bussoft *)(PCI_CONTROLLER((pci_bus))->platform_data))
+ ((struct pcibus_bussoft *)(SN_PLATFORM_DATA(pci_bus)->provider_soft))
#define SN_PCIBUS_BUSSOFT_INFO(pci_bus) \
- (struct pcibus_info *)((struct pcibus_bussoft *)(PCI_CONTROLLER((pci_bus))->platform_data))
+ ((struct pcibus_info *)(SN_PLATFORM_DATA(pci_bus)->provider_soft))
/*
* Given a struct pci_dev, return the sn pcibus_bussoft struct. Note
* that this is not equivalent to SN_PCIBUS_BUSSOFT(pci_dev->bus) due
Index: acpi_support.0117/arch/ia64/sn/kernel/tiocx.c
===================================================================
--- acpi_support.0117.orig/arch/ia64/sn/kernel/tiocx.c 2006-01-17 07:57:05.388087518 -0600
+++ acpi_support.0117/arch/ia64/sn/kernel/tiocx.c 2006-01-17 07:58:39.624965708 -0600
@@ -3,7 +3,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (c) 2005 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (c) 2005-2006 Silicon Graphics, Inc. All rights reserved.
*/
#include <linux/module.h>
@@ -548,7 +548,7 @@ static void __exit tiocx_exit(void)
bus_unregister(&tiocx_bus_type);
}
-subsys_initcall(tiocx_init);
+fs_initcall(tiocx_init);
module_exit(tiocx_exit);
/************************************************************************
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH] RESEND - SN: Add initial ACPI support
@ 2006-01-23 16:00 ` John Keller
0 siblings, 0 replies; 13+ messages in thread
From: John Keller @ 2006-01-23 16:00 UTC (permalink / raw)
To: linux-ia64; +Cc: linux-acpi, John Keller
resend #3
Changes made to correct alignment, white space,
and coding style issues.
-------
First phase in introducing ACPI support to SN.
In this phase, when running with an ACPI capable PROM,
the DSDT will define the root busses and all SN nodes
(SGIHUB, SGITIO). An acpi bus driver will be registered
for the node devices, with the acpi_pci_root_driver being
used for the root busses. Platform specific info is passed
via vendor descriptors, eliminating the corresponding SAL
calls. SN fixup code no longer needs to initiate the
pci bus scans, as the acpi_pci_root_driver takes care of that
now.
To maintain backward compatibility with non-ACPI capable PROMs,
none of the current 'fixup' code has been deleted.
Signed-off-by: John Keller <jpk@sgi.com>
Index: acpi_support.0117/arch/ia64/kernel/Makefile
=================================--- acpi_support.0117.orig/arch/ia64/kernel/Makefile 2006-01-17 07:57:05.147876633 -0600
+++ acpi_support.0117/arch/ia64/kernel/Makefile 2006-01-17 07:58:39.615201038 -0600
@@ -11,6 +11,7 @@ obj-y := acpi.o entry.o efi.o efi_stub.o
obj-$(CONFIG_IA64_BRL_EMU) += brl_emu.o
obj-$(CONFIG_IA64_GENERIC) += acpi-ext.o
+obj-$(CONFIG_IA64_SGI_SN2) += acpi-ext.o
obj-$(CONFIG_IA64_HP_ZX1) += acpi-ext.o
obj-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += acpi-ext.o
obj-$(CONFIG_IA64_PALINFO) += palinfo.o
Index: acpi_support.0117/arch/ia64/sn/kernel/io_init.c
=================================--- acpi_support.0117.orig/arch/ia64/sn/kernel/io_init.c 2006-01-17 07:57:05.369534645 -0600
+++ acpi_support.0117/arch/ia64/sn/kernel/io_init.c 2006-01-19 07:53:17.925675991 -0600
@@ -3,7 +3,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (C) 1992 - 1997, 2000-2005 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 1992 - 1997, 2000-2006 Silicon Graphics, Inc. All rights reserved.
*/
#include <linux/bootmem.h>
@@ -21,6 +21,11 @@
#include <asm/sn/tioce_provider.h>
#include "xtalk/hubdev.h"
#include "xtalk/xwidgetdev.h"
+#include <linux/acpi.h>
+
+#define SN_ACPI_BASE_SUPPORT() (acpi_gbl_DSDT->oem_revision >= 0x20101)
+
+static void sn_acpi_setup(void);
static struct list_head sn_sysdata_list;
@@ -113,6 +118,20 @@ static inline u64 sal_get_hubdev_info(u6
}
/*
+ * Perform the early IO init in PROM.
+ */
+static s64
+sal_ioif_init(u64 *result)
+{
+ struct ia64_sal_retval isrv = {0,0,0,0};
+
+ SAL_CALL_NOLOCK(isrv,
+ SN_SAL_IOIF_INIT, 0, 0, 0, 0, 0, 0, 0);
+ *result = isrv.v0;
+ return isrv.status;
+}
+
+/*
* Retrieve the pci bus information given the bus number.
*/
static inline u64 sal_get_pcibus_info(u64 segment, u64 busnum, u64 address)
@@ -157,26 +176,87 @@ sn_pcidev_info_get(struct pci_dev *dev)
struct pcidev_info *pcidev;
list_for_each_entry(pcidev,
- &(SN_PCI_CONTROLLER(dev)->pcidev_info), pdi_list) {
- if (pcidev->pdi_linux_pcidev = dev) {
+ &(SN_PLATFORM_DATA(dev)->pcidev_info), pdi_list) {
+ if (pcidev->pdi_linux_pcidev = dev)
return pcidev;
- }
}
return NULL;
}
/*
- * sn_fixup_ionodes() - This routine initializes the HUB data strcuture for
- * each node in the system.
+ * sn_hubdev_init() - This routine is called to initialize the HUB data
+ * structure for each node in the system.
*/
-static void sn_fixup_ionodes(void)
+static void __init
+sn_hubdev_init(struct hubdev_info *hubdev)
{
+
struct sn_flush_device_kernel *sn_flush_device_kernel;
struct sn_flush_device_kernel *dev_entry;
+ s64 status;
+ int widget, device;
+
+ /* Attach the error interrupt handlers */
+ if (hubdev->hdi_nasid & 1) /* If TIO */
+ ice_error_init(hubdev);
+ else
+ hub_error_init(hubdev);
+
+ for (widget = 0; widget <= HUB_WIDGET_ID_MAX; widget++)
+ hubdev->hdi_xwidget_info[widget].xwi_hubinfo = hubdev;
+
+ if (!hubdev->hdi_flush_nasid_list.widget_p)
+ return;
+
+ hubdev->hdi_flush_nasid_list.widget_p + kzalloc((HUB_WIDGET_ID_MAX + 1) *
+ sizeof(struct sn_flush_device_kernel *),
+ GFP_KERNEL);
+ if (!hubdev->hdi_flush_nasid_list.widget_p)
+ BUG();
+
+ for (widget = 0; widget <= HUB_WIDGET_ID_MAX; widget++) {
+ sn_flush_device_kernel = kzalloc(DEV_PER_WIDGET *
+ sizeof(*sn_flush_device_kernel),
+ GFP_KERNEL);
+ if (!sn_flush_device_kernel)
+ BUG();
+
+ dev_entry = sn_flush_device_kernel;
+ for (device = 0; device < DEV_PER_WIDGET;
+ device++, dev_entry++) {
+ dev_entry->common = kzalloc(sizeof(struct
+ sn_flush_device_common),
+ GFP_KERNEL);
+ if (!dev_entry->common)
+ BUG();
+ status = sal_get_device_dmaflush_list(hubdev->hdi_nasid,
+ widget,
+ device,
+ (u64)(dev_entry->common));
+ if (status)
+ BUG();
+
+ spin_lock_init(&dev_entry->sfdl_flush_lock);
+ }
+
+ if (sn_flush_device_kernel)
+ hubdev->hdi_flush_nasid_list.widget_p[widget] + sn_flush_device_kernel;
+ }
+}
+
+/*
+ * sn_fixup_ionodes() - This routine initializes the HUB data strcuture for
+ * each node in the system.
+ */
+static void sn_fixup_ionodes(void)
+{
+
struct hubdev_info *hubdev;
u64 status;
u64 nasid;
- int i, widget, device;
+ int i;
/*
* Get SGI Specific HUB chipset information.
@@ -199,63 +279,7 @@ static void sn_fixup_ionodes(void)
max_segment_number = hubdev->max_segment_number;
max_pcibus_number = hubdev->max_pcibus_number;
}
-
- /* Attach the error interrupt handlers */
- if (nasid & 1)
- ice_error_init(hubdev);
- else
- hub_error_init(hubdev);
-
- for (widget = 0; widget <= HUB_WIDGET_ID_MAX; widget++)
- hubdev->hdi_xwidget_info[widget].xwi_hubinfo = hubdev;
-
- if (!hubdev->hdi_flush_nasid_list.widget_p)
- continue;
-
- hubdev->hdi_flush_nasid_list.widget_p - kmalloc((HUB_WIDGET_ID_MAX + 1) *
- sizeof(struct sn_flush_device_kernel *),
- GFP_KERNEL);
- memset(hubdev->hdi_flush_nasid_list.widget_p, 0x0,
- (HUB_WIDGET_ID_MAX + 1) *
- sizeof(struct sn_flush_device_kernel *));
-
- for (widget = 0; widget <= HUB_WIDGET_ID_MAX; widget++) {
- sn_flush_device_kernel = kmalloc(DEV_PER_WIDGET *
- sizeof(struct
- sn_flush_device_kernel),
- GFP_KERNEL);
- if (!sn_flush_device_kernel)
- BUG();
- memset(sn_flush_device_kernel, 0x0,
- DEV_PER_WIDGET *
- sizeof(struct sn_flush_device_kernel));
-
- dev_entry = sn_flush_device_kernel;
- for (device = 0; device < DEV_PER_WIDGET;
- device++,dev_entry++) {
- dev_entry->common = kmalloc(sizeof(struct
- sn_flush_device_common),
- GFP_KERNEL);
- if (!dev_entry->common)
- BUG();
- memset(dev_entry->common, 0x0, sizeof(struct
- sn_flush_device_common));
-
- status = sal_get_device_dmaflush_list(nasid,
- widget,
- device,
- (u64)(dev_entry->common));
- if (status)
- BUG();
-
- spin_lock_init(&dev_entry->sfdl_flush_lock);
- }
-
- if (sn_flush_device_kernel)
- hubdev->hdi_flush_nasid_list.widget_p[widget] - sn_flush_device_kernel;
- }
+ sn_hubdev_init(hubdev);
}
}
@@ -351,9 +375,9 @@ void sn_pci_fixup_slot(struct pci_dev *d
if (status)
BUG(); /* Cannot get platform pci device information */
- /* Add pcidev_info to list in sn_pci_controller struct */
+ /* Add pcidev_info to list in pci_controller.platform_data */
list_add_tail(&pcidev_info->pdi_list,
- &(SN_PCI_CONTROLLER(dev->bus)->pcidev_info));
+ &(SN_PLATFORM_DATA(dev->bus)->pcidev_info));
/* Copy over PIO Mapped Addresses */
for (idx = 0; idx <= PCI_ROM_RESOURCE; idx++) {
@@ -422,70 +446,42 @@ void sn_pci_fixup_slot(struct pci_dev *d
}
/*
- * sn_pci_controller_fixup() - This routine sets up a bus's resources
- * consistent with the Linux PCI abstraction layer.
+ * sn_common_bus_fixup()
*/
-void sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
+static int
+sn_common_bus_fixup(struct pci_bus *bus,
+ struct pcibus_bussoft *prom_bussoft_ptr)
{
- int status = 0;
- int nasid, cnode;
+ int cnode;
struct pci_controller *controller;
- struct sn_pci_controller *sn_controller;
- struct pcibus_bussoft *prom_bussoft_ptr;
struct hubdev_info *hubdev_info;
+ int nasid;
void *provider_soft = NULL;
struct sn_pcibus_provider *provider;
+ struct sn_platform_data *sn_platform_data;
- status = sal_get_pcibus_info((u64) segment, (u64) busnum,
- (u64) ia64_tpa(&prom_bussoft_ptr));
- if (status > 0)
- return; /*bus # does not exist */
- prom_bussoft_ptr = __va(prom_bussoft_ptr);
-
- /* Allocate a sn_pci_controller, which has a pci_controller struct
- * as the first member.
- */
- sn_controller = kzalloc(sizeof(struct sn_pci_controller), GFP_KERNEL);
- if (!sn_controller)
- BUG();
- INIT_LIST_HEAD(&sn_controller->pcidev_info);
- controller = &sn_controller->pci_controller;
- controller->segment = segment;
-
- if (bus = NULL) {
- bus = pci_scan_bus(busnum, &pci_root_ops, controller);
- if (bus = NULL)
- goto error_return; /* error, or bus already scanned */
- bus->sysdata = NULL;
- }
-
- if (bus->sysdata)
- goto error_return; /* sysdata already alloc'd */
-
+ controller = PCI_CONTROLLER(bus);
/*
- * Per-provider fixup. Copies the contents from prom to local
- * area and links SN_PCIBUS_BUSSOFT().
+ * Per-provider fixup. Copies the bus soft structure from prom
+ * to local area and links SN_PCIBUS_BUSSOFT().
*/
if (prom_bussoft_ptr->bs_asic_type >= PCIIO_ASIC_MAX_TYPES)
- goto error_return; /* unsupported asic type */
+ return -1; /* unsupported asic type */
if (prom_bussoft_ptr->bs_asic_type = PCIIO_ASIC_TYPE_PPB)
- goto error_return; /* no further fixup necessary */
+ return -1; /* no further fixup necessary */
provider = sn_pci_provider[prom_bussoft_ptr->bs_asic_type];
if (provider = NULL)
- goto error_return; /* no provider registerd for this asic */
+ return -1; /* No provider registered for this asic */
- bus->sysdata = controller;
if (provider->bus_fixup)
- provider_soft = (*provider->bus_fixup) (prom_bussoft_ptr, controller);
+ provider_soft = (*provider->bus_fixup) (prom_bussoft_ptr,
+ controller);
- if (provider_soft = NULL) {
- /* fixup failed or not applicable */
- bus->sysdata = NULL;
- goto error_return;
- }
+ if (provider_soft = NULL)
+ return -1; /* fixup failed or not applicable */
/*
* Setup pci_windows for legacy IO and MEM space.
@@ -514,8 +510,15 @@ void sn_pci_controller_fixup(int segment
* Generic bus fixup goes here. Don't reference prom_bussoft_ptr
* after this point.
*/
-
- PCI_CONTROLLER(bus)->platform_data = provider_soft;
+ controller->platform_data = kzalloc(sizeof(struct sn_platform_data),
+ GFP_KERNEL);
+ if (controller->platform_data = NULL)
+ BUG();
+ sn_platform_data + (struct sn_platform_data *) controller->platform_data;
+ sn_platform_data->provider_soft = provider_soft;
+ INIT_LIST_HEAD(&((struct sn_platform_data *)
+ controller->platform_data)->pcidev_info);
nasid = NASID_GET(SN_PCIBUS_BUSSOFT(bus)->bs_base);
cnode = nasid_to_cnodeid(nasid);
hubdev_info = (struct hubdev_info *)(NODEPDA(cnode)->pdinfo);
@@ -523,26 +526,65 @@ void sn_pci_controller_fixup(int segment
&(hubdev_info->hdi_xwidget_info[SN_PCIBUS_BUSSOFT(bus)->bs_xid]);
/*
- * If the node information we obtained during the fixup phase is invalid
- * then set controller->node to -1 (undetermined)
+ * If the node information we obtained during the fixup phase is
+ * invalid then set controller->node to -1 (undetermined)
*/
if (controller->node >= num_online_nodes()) {
struct pcibus_bussoft *b = SN_PCIBUS_BUSSOFT(bus);
printk(KERN_WARNING "Device ASIC=%u XID=%u PBUSNUM=%u"
- "L_IO=%lx L_MEM=%lx BASE=%lx\n",
- b->bs_asic_type, b->bs_xid, b->bs_persist_busnum,
- b->bs_legacy_io, b->bs_legacy_mem, b->bs_base);
+ "L_IO=%lx L_MEM=%lx BASE=%lx\n",
+ b->bs_asic_type, b->bs_xid, b->bs_persist_busnum,
+ b->bs_legacy_io, b->bs_legacy_mem, b->bs_base);
printk(KERN_WARNING "on node %d but only %d nodes online."
- "Association set to undetermined.\n",
- controller->node, num_online_nodes());
+ "Association set to undetermined.\n",
+ controller->node, num_online_nodes());
controller->node = -1;
}
+ return 0;
+}
+
+/*
+ * sn_pci_controller_fixup() - This routine sets up a bus's resources
+ * consistent with the Linux PCI abstraction layer.
+ */
+void sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
+{
+ s64 status = 0;
+ struct pci_controller *controller;
+ struct pcibus_bussoft *prom_bussoft_ptr;
+
+ status = sal_get_pcibus_info((u64) segment, (u64) busnum,
+ (u64) ia64_tpa(&prom_bussoft_ptr));
+ if (status > 0)
+ return; /*bus # does not exist */
+ prom_bussoft_ptr = __va(prom_bussoft_ptr);
+
+ controller = kzalloc(sizeof(*controller), GFP_KERNEL);
+ if (!controller)
+ BUG();
+ controller->segment = segment;
+
+ if (bus = NULL) {
+ bus = pci_scan_bus(busnum, &pci_root_ops, controller);
+ if (bus = NULL)
+ goto error_return; /* error, or bus already scanned */
+ bus->sysdata = NULL;
+ }
+
+ if (bus->sysdata)
+ goto error_return; /* sysdata already alloc'd */
+
+ bus->sysdata = controller;
+ if (sn_common_bus_fixup(bus, prom_bussoft_ptr)) {
+ bus->sysdata = NULL;
+ goto error_return;
+ }
return;
error_return:
- kfree(sn_controller);
+ kfree(controller);
return;
}
@@ -585,6 +627,8 @@ static int __init sn_pci_init(void)
{
int i = 0;
int j = 0;
+ u64 result;
+ s64 status = 0;
struct pci_dev *pci_dev = NULL;
extern void sn_init_cpei_timer(void);
#ifdef CONFIG_PROC_FS
@@ -610,6 +654,24 @@ static int __init sn_pci_init(void)
* This is needed to avoid bounce limit checks in the blk layer
*/
ia64_max_iommu_merge_mask = ~PAGE_MASK;
+
+ /*
+ * If we're running with an ACPI 2.0 enabled PROM,
+ * the PROM has generated a ACPI DSDT table, and the Linux
+ * ACPI code will do the PCI bus scanning. We'll still need
+ * to do some 'fixup' later on in sn_io_fixup().
+ */
+ printk(KERN_INFO "ACPI DSDT OEM Rev 0x%x\n",
+ acpi_gbl_DSDT->oem_revision);
+ if (SN_ACPI_BASE_SUPPORT()) {
+ sn_acpi_setup();
+ status = sal_ioif_init(&result);
+ if (status || result)
+ panic("sal_ioif_init failed: [%lx] %s\n",
+ status, ia64_sal_strerror(status));
+ return 0;
+ }
+
sn_fixup_ionodes();
sn_irq_lh_init();
INIT_LIST_HEAD(&sn_sysdata_list);
@@ -679,3 +741,171 @@ EXPORT_SYMBOL(sn_pci_unfixup_slot);
EXPORT_SYMBOL(sn_pci_controller_fixup);
EXPORT_SYMBOL(sn_bus_store_sysdata);
EXPORT_SYMBOL(sn_bus_free_sysdata);
+
+
+
+/* IO ACPI Support */
+
+/* Copy from arch/ia64/kernel/acpi-ext.c */
+struct acpi_vendor_descriptor {
+ u8 guid_id;
+ efi_guid_t guid;
+};
+
+/*
+ * Arbitrary GUID taken from internal SGI machine. * This value must match the UUID the PROM uses * (io/acpi/defblk.c) when building a vendor descriptor. */
+struct acpi_vendor_descriptor sn_descriptor = {
+ .guid_id = 0,
+ .guid = EFI_GUID(0xfea6c62c, 0x449c, 0x11da,
+ 0xa2, 0x7c, 0x08, 0x00, 0x69, 0x13, 0xea, 0x51)
+};
+
+extern acpi_status acpi_find_vendor_resource(acpi_handle,
+ struct acpi_vendor_descriptor *,
+ u8 **, u32 *);
+
+
+/*
+ * sn_hubdev_add() - The 'add' function of the acpi_sn_hubdev_driver.
+ * Called for every "SGIHUB" or "SGITIO" device defined
+ * in the ACPI namespace.
+ */
+static int __init
+sn_hubdev_add(struct acpi_device *device)
+{
+ u8 *data;
+ struct hubdev_info *hubdev;
+ struct hubdev_info *hubdev_ptr;
+ int i;
+ u32 length;
+ u64 nasid;
+ acpi_status status;
+
+ status = acpi_find_vendor_resource(device->handle, &sn_descriptor,
+ &data, &length);
+ if (ACPI_FAILURE(status) || (length != 8)) {
+ printk(KERN_ERR "sn_hubdev_add: Failure %d - Data length=%d\n",
+ status, length);
+ return 1;
+ }
+
+ hubdev_ptr = __va(*(struct hubdev_info **) data);
+
+ nasid = hubdev_ptr->hdi_nasid;
+ i = nasid_to_cnodeid(nasid);
+ hubdev = (struct hubdev_info *)(NODEPDA(i)->pdinfo);
+ *hubdev = *hubdev_ptr;
+ sn_hubdev_init(hubdev);
+
+ acpi_os_free(data);
+ return 0;
+}
+
+
+/*
+ * sn_pci_bus_fixup() - This routine sets up a bus' resources
+ * consistent with the Linux PCI abstraction layer.
+ */
+static int __init
+sn_pci_bus_fixup(struct pci_bus *bus)
+{
+
+ struct pci_controller *controller;
+ u8 *data;
+ acpi_handle handle;
+ u32 length;
+ struct pcibus_bussoft *prom_bussoft_ptr;
+ int ret = 0;
+ acpi_status status;
+
+ handle = PCI_CONTROLLER(bus)->acpi_handle;
+ controller = PCI_CONTROLLER(bus);
+
+ status = acpi_find_vendor_resource(handle, &sn_descriptor, &data,
+ &length);
+ if (ACPI_FAILURE(status) || (length != 8)) {
+ printk(KERN_ERR "sn_pci_bus_fixup: Failure %d - length=%d\n",
+ status, length);
+ return -1;
+ }
+ prom_bussoft_ptr = __va(*(struct pcibus_bussoft **) data);
+
+ if (sn_common_bus_fixup(bus, prom_bussoft_ptr))
+ ret = -1;
+ acpi_os_free(data);
+ return ret;
+}
+
+/*
+ * sn_io_fixup() - Perform platform specific bus and device fixup,
+ * if running with an ACPI capable PROM.
+ */
+
+static int __init
+sn_io_fixup(void)
+{
+ struct pci_bus *bus;
+ struct pci_dev *pci_dev = NULL;
+ extern void sn_init_cpei_timer(void);
+#ifdef CONFIG_PROC_FS
+ extern void register_sn_procfs(void);
+#endif
+
+ if (!ia64_platform_is("sn2") || IS_RUNNING_ON_FAKE_PROM())
+ return 0;
+
+ /* Exit if running with old PROM without ACPI support */
+ if (!SN_ACPI_BASE_SUPPORT())
+ return 0;
+
+ sn_irq_lh_init();
+ INIT_LIST_HEAD(&sn_sysdata_list);
+ sn_init_cpei_timer();
+
+#ifdef CONFIG_PROC_FS
+ register_sn_procfs();
+#endif
+
+ /*
+ * Generic Linux PCI Layer has created the pci_bus and pci_dev
+ * structures - time for us to add our SN Platform specific
+ * information.
+ */
+
+ bus = NULL;
+ while ((bus = pci_find_next_bus(bus)) != NULL)
+ sn_pci_bus_fixup(bus);
+
+ while ((pci_dev + pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pci_dev)) != NULL) {
+ sn_pci_fixup_slot(pci_dev);
+ }
+
+ sn_ioif_inited = 1; /* SN I/O infrastructure now initialized */
+
+ return 0;
+}
+
+static struct acpi_driver acpi_sn_hubdev_driver = {
+ .name = "SGI HUBDEV Driver",
+ .ids = "SGIHUB,SGITIO",
+ .ops = {
+ .add = sn_hubdev_add,
+ },
+};
+
+
+/*
+ * sn_acpi_setup() - Register the ACPI driver for the SGIHUB device.
+ * This function is expected to be called prior to
+ * ACPI initialization (acpi_init()).
+ */
+static void __init
+sn_acpi_setup(void)
+{
+ acpi_bus_register_driver(&acpi_sn_hubdev_driver);
+}
+
+fs_initcall(sn_io_fixup);
+
+
Index: acpi_support.0117/include/asm-ia64/sn/sn_sal.h
=================================--- acpi_support.0117.orig/include/asm-ia64/sn/sn_sal.h 2006-01-17 07:57:27.084208031 -0600
+++ acpi_support.0117/include/asm-ia64/sn/sn_sal.h 2006-01-17 08:53:26.304384528 -0600
@@ -8,7 +8,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (c) 2000-2005 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (c) 2000-2006 Silicon Graphics, Inc. All rights reserved.
*/
@@ -78,6 +78,7 @@
#define SN_SAL_IOIF_GET_WIDGET_DMAFLUSH_LIST 0x02000058 // deprecated
#define SN_SAL_IOIF_GET_DEVICE_DMAFLUSH_LIST 0x0200005a
+#define SN_SAL_IOIF_INIT 0x0200005f
#define SN_SAL_HUB_ERROR_INTERRUPT 0x02000060
#define SN_SAL_BTE_RECOVER 0x02000061
#define SN_SAL_RESERVED_DO_NOT_USE 0x02000062
Index: acpi_support.0117/arch/ia64/sn/kernel/setup.c
=================================--- acpi_support.0117.orig/arch/ia64/sn/kernel/setup.c 2006-01-17 07:57:05.372464046 -0600
+++ acpi_support.0117/arch/ia64/sn/kernel/setup.c 2006-01-17 07:58:39.623012774 -0600
@@ -3,7 +3,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (C) 1999,2001-2005 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 1999,2001-2006 Silicon Graphics, Inc. All rights reserved.
*/
#include <linux/config.h>
@@ -389,6 +389,14 @@ void __init sn_setup(char **cmdline_p)
ia64_sn_plat_set_error_handling_features(); // obsolete
ia64_sn_set_os_feature(OSF_MCA_SLV_TO_OS_INIT_SLV);
ia64_sn_set_os_feature(OSF_FEAT_LOG_SBES);
+ /*
+ * Note: The calls to notify the PROM of ACPI and PCI Segment
+ * support must be done prior to acpi_load_tables(), as
+ * an ACPI capable PROM will rebuild the DSDT as result
+ * of the call.
+ */
+ ia64_sn_set_os_feature(OSF_PCISEGMENT_ENABLE);
+ ia64_sn_set_os_feature(OSF_ACPI_ENABLE);
#if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE)
Index: acpi_support.0117/include/asm-ia64/sn/sn_feature_sets.h
=================================--- acpi_support.0117.orig/include/asm-ia64/sn/sn_feature_sets.h 2006-01-17 07:57:27.067608091 -0600
+++ acpi_support.0117/include/asm-ia64/sn/sn_feature_sets.h 2006-01-17 08:54:33.551701922 -0600
@@ -8,7 +8,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (c) 2005 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (c) 2005-2006 Silicon Graphics, Inc. All rights reserved.
*/
@@ -50,8 +50,13 @@ extern int sn_prom_feature_available(int
* Once enabled, a feature cannot be disabled.
*
* By default, features are disabled unless explicitly enabled.
+ *
+ * These defines must be kept in sync with the corresponding
+ * PROM definitions in feature_sets.h.
*/
#define OSF_MCA_SLV_TO_OS_INIT_SLV 0
#define OSF_FEAT_LOG_SBES 1
+#define OSF_ACPI_ENABLE 2
+#define OSF_PCISEGMENT_ENABLE 3
#endif /* _ASM_IA64_SN_FEATURE_SETS_H */
Index: acpi_support.0117/include/asm-ia64/sn/pcidev.h
=================================--- acpi_support.0117.orig/include/asm-ia64/sn/pcidev.h 2006-01-17 07:57:27.060772822 -0600
+++ acpi_support.0117/include/asm-ia64/sn/pcidev.h 2006-01-17 08:55:39.340174903 -0600
@@ -3,7 +3,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (C) 1992 - 1997, 2000-2005 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (C) 1992 - 1997, 2000-2006 Silicon Graphics, Inc. All rights reserved.
*/
#ifndef _ASM_IA64_SN_PCI_PCIDEV_H
#define _ASM_IA64_SN_PCI_PCIDEV_H
@@ -12,31 +12,29 @@
/*
* In ia64, pci_dev->sysdata must be a *pci_controller. To provide access to
- * the pcidev_info structs for all devices under a controller, we extend the
- * definition of pci_controller, via sn_pci_controller, to include a list
- * of pcidev_info.
+ * the pcidev_info structs for all devices under a controller, we keep a
+ * list of pcidev_info under pci_controller->platform_data.
*/
-struct sn_pci_controller {
- struct pci_controller pci_controller;
+struct sn_platform_data {
+ void *provider_soft;
struct list_head pcidev_info;
};
-#define SN_PCI_CONTROLLER(dev) ((struct sn_pci_controller *) dev->sysdata)
+#define SN_PLATFORM_DATA(busdev) \
+ ((struct sn_platform_data *)(PCI_CONTROLLER(busdev)->platform_data))
#define SN_PCIDEV_INFO(dev) sn_pcidev_info_get(dev)
-#define SN_PCIBUS_BUSSOFT_INFO(pci_bus) \
- (struct pcibus_info *)((struct pcibus_bussoft *)(PCI_CONTROLLER((pci_bus))->platform_data))
/*
* Given a pci_bus, return the sn pcibus_bussoft struct. Note that
* this only works for root busses, not for busses represented by PPB's.
*/
#define SN_PCIBUS_BUSSOFT(pci_bus) \
- ((struct pcibus_bussoft *)(PCI_CONTROLLER((pci_bus))->platform_data))
+ ((struct pcibus_bussoft *)(SN_PLATFORM_DATA(pci_bus)->provider_soft))
#define SN_PCIBUS_BUSSOFT_INFO(pci_bus) \
- (struct pcibus_info *)((struct pcibus_bussoft *)(PCI_CONTROLLER((pci_bus))->platform_data))
+ ((struct pcibus_info *)(SN_PLATFORM_DATA(pci_bus)->provider_soft))
/*
* Given a struct pci_dev, return the sn pcibus_bussoft struct. Note
* that this is not equivalent to SN_PCIBUS_BUSSOFT(pci_dev->bus) due
Index: acpi_support.0117/arch/ia64/sn/kernel/tiocx.c
=================================--- acpi_support.0117.orig/arch/ia64/sn/kernel/tiocx.c 2006-01-17 07:57:05.388087518 -0600
+++ acpi_support.0117/arch/ia64/sn/kernel/tiocx.c 2006-01-17 07:58:39.624965708 -0600
@@ -3,7 +3,7 @@
* License. See the file "COPYING" in the main directory of this archive
* for more details.
*
- * Copyright (c) 2005 Silicon Graphics, Inc. All rights reserved.
+ * Copyright (c) 2005-2006 Silicon Graphics, Inc. All rights reserved.
*/
#include <linux/module.h>
@@ -548,7 +548,7 @@ static void __exit tiocx_exit(void)
bus_unregister(&tiocx_bus_type);
}
-subsys_initcall(tiocx_init);
+fs_initcall(tiocx_init);
module_exit(tiocx_exit);
/************************************************************************
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] RESEND - SN: Add initial ACPI support
2006-01-23 16:00 ` John Keller
@ 2006-01-26 17:20 ` Bjorn Helgaas
-1 siblings, 0 replies; 13+ messages in thread
From: Bjorn Helgaas @ 2006-01-26 17:20 UTC (permalink / raw)
To: John Keller; +Cc: linux-ia64, linux-acpi
On Monday 23 January 2006 09:00, John Keller wrote:
> +obj-$(CONFIG_IA64_SGI_SN2) += acpi-ext.o
Just FYI, this code is moving into drivers/acpi soon. Robert Moore
might have made a trivial interface change when he integrated it into
the ACPI CA. No big deal, basically acpi-ext.c was arch-independent
and we moved it to generic code.
> + * sn_fixup_ionodes() - This routine initializes the HUB data strcuture for
s/strcuture/structure/
> /*
> - * sn_pci_controller_fixup() - This routine sets up a bus's resources
> - * consistent with the Linux PCI abstraction layer.
> + * sn_common_bus_fixup()
> */
Nit: A comment that merely restates the function name is useless.
Actually, it's worse than useless because it takes up space and
requires maintenance.
> +void sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
This function looks very much like pci_acpi_scan_root(). Is this the
old, non-ACPI path?
> + printk(KERN_INFO "ACPI DSDT OEM Rev 0x%x\n",
> + acpi_gbl_DSDT->oem_revision);
Doesn't ACPI print something like this for you already? (I think it's
KERN_DEBUG now, so usually not on the console, but still in dmesg.)
> +static int __init
> +sn_io_fixup(void)
> +{
> + struct pci_bus *bus;
> + struct pci_dev *pci_dev = NULL;
> + extern void sn_init_cpei_timer(void);
> +#ifdef CONFIG_PROC_FS
> + extern void register_sn_procfs(void);
> +#endif
> +
> + if (!ia64_platform_is("sn2") || IS_RUNNING_ON_FAKE_PROM())
> + return 0;
> +
> + /* Exit if running with old PROM without ACPI support */
> + if (!SN_ACPI_BASE_SUPPORT())
> + return 0;
> +
> + sn_irq_lh_init();
> + INIT_LIST_HEAD(&sn_sysdata_list);
> + sn_init_cpei_timer();
Seems like a weird place to call sn_init_cpei_timer(). I guess I
have no idea what the CPEI stuff is, but it looks like it *could*
report platform errors other than PCI. And you probably want to
call it even if you don't have ACPI support, don't you?
> +
> +#ifdef CONFIG_PROC_FS
> + register_sn_procfs();
> +#endif
> +
> + /*
> + * Generic Linux PCI Layer has created the pci_bus and pci_dev
> + * structures - time for us to add our SN Platform specific
> + * information.
> + */
> +
> + bus = NULL;
> + while ((bus = pci_find_next_bus(bus)) != NULL)
> + sn_pci_bus_fixup(bus);
> +
> + while ((pci_dev =
> + pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pci_dev)) != NULL) {
> + sn_pci_fixup_slot(pci_dev);
> + }
You're doing these fixups with an fs_initcall(). I think they should
be done by hooking into pcibios_fixup_bus() (maybe we need a new platform
vector or optional function pointer there; I think PPC has something
like that already). The initcall scheme won't work if you hot-plug
things.
Bjorn
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] RESEND - SN: Add initial ACPI support
@ 2006-01-26 17:20 ` Bjorn Helgaas
0 siblings, 0 replies; 13+ messages in thread
From: Bjorn Helgaas @ 2006-01-26 17:20 UTC (permalink / raw)
To: John Keller; +Cc: linux-ia64, linux-acpi
On Monday 23 January 2006 09:00, John Keller wrote:
> +obj-$(CONFIG_IA64_SGI_SN2) += acpi-ext.o
Just FYI, this code is moving into drivers/acpi soon. Robert Moore
might have made a trivial interface change when he integrated it into
the ACPI CA. No big deal, basically acpi-ext.c was arch-independent
and we moved it to generic code.
> + * sn_fixup_ionodes() - This routine initializes the HUB data strcuture for
s/strcuture/structure/
> /*
> - * sn_pci_controller_fixup() - This routine sets up a bus's resources
> - * consistent with the Linux PCI abstraction layer.
> + * sn_common_bus_fixup()
> */
Nit: A comment that merely restates the function name is useless.
Actually, it's worse than useless because it takes up space and
requires maintenance.
> +void sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
This function looks very much like pci_acpi_scan_root(). Is this the
old, non-ACPI path?
> + printk(KERN_INFO "ACPI DSDT OEM Rev 0x%x\n",
> + acpi_gbl_DSDT->oem_revision);
Doesn't ACPI print something like this for you already? (I think it's
KERN_DEBUG now, so usually not on the console, but still in dmesg.)
> +static int __init
> +sn_io_fixup(void)
> +{
> + struct pci_bus *bus;
> + struct pci_dev *pci_dev = NULL;
> + extern void sn_init_cpei_timer(void);
> +#ifdef CONFIG_PROC_FS
> + extern void register_sn_procfs(void);
> +#endif
> +
> + if (!ia64_platform_is("sn2") || IS_RUNNING_ON_FAKE_PROM())
> + return 0;
> +
> + /* Exit if running with old PROM without ACPI support */
> + if (!SN_ACPI_BASE_SUPPORT())
> + return 0;
> +
> + sn_irq_lh_init();
> + INIT_LIST_HEAD(&sn_sysdata_list);
> + sn_init_cpei_timer();
Seems like a weird place to call sn_init_cpei_timer(). I guess I
have no idea what the CPEI stuff is, but it looks like it *could*
report platform errors other than PCI. And you probably want to
call it even if you don't have ACPI support, don't you?
> +
> +#ifdef CONFIG_PROC_FS
> + register_sn_procfs();
> +#endif
> +
> + /*
> + * Generic Linux PCI Layer has created the pci_bus and pci_dev
> + * structures - time for us to add our SN Platform specific
> + * information.
> + */
> +
> + bus = NULL;
> + while ((bus = pci_find_next_bus(bus)) != NULL)
> + sn_pci_bus_fixup(bus);
> +
> + while ((pci_dev > + pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pci_dev)) != NULL) {
> + sn_pci_fixup_slot(pci_dev);
> + }
You're doing these fixups with an fs_initcall(). I think they should
be done by hooking into pcibios_fixup_bus() (maybe we need a new platform
vector or optional function pointer there; I think PPC has something
like that already). The initcall scheme won't work if you hot-plug
things.
Bjorn
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] RESEND - SN: Add initial ACPI support
2006-01-26 17:20 ` Bjorn Helgaas
@ 2006-01-26 23:04 ` John Keller
-1 siblings, 0 replies; 13+ messages in thread
From: John Keller @ 2006-01-26 23:04 UTC (permalink / raw)
To: Bjorn Helgaas; +Cc: linux-ia64, linux-acpi
>
> On Monday 23 January 2006 09:00, John Keller wrote:
> > +obj-$(CONFIG_IA64_SGI_SN2) += acpi-ext.o
>
> Just FYI, this code is moving into drivers/acpi soon. Robert Moore
> might have made a trivial interface change when he integrated it into
> the ACPI CA. No big deal, basically acpi-ext.c was arch-independent
> and we moved it to generic code.
>
> > + * sn_fixup_ionodes() - This routine initializes the HUB data strcuture for
>
> s/strcuture/structure/
>
> > /*
> > - * sn_pci_controller_fixup() - This routine sets up a bus's resources
> > - * consistent with the Linux PCI abstraction layer.
> > + * sn_common_bus_fixup()
> > */
>
> Nit: A comment that merely restates the function name is useless.
> Actually, it's worse than useless because it takes up space and
> requires maintenance.
Yeah, I agree, my mistake.
>
> > +void sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
>
> This function looks very much like pci_acpi_scan_root(). Is this the
> old, non-ACPI path?
>
> > + printk(KERN_INFO "ACPI DSDT OEM Rev 0x%x\n",
> > + acpi_gbl_DSDT->oem_revision);
>
> Doesn't ACPI print something like this for you already? (I think it's
> KERN_DEBUG now, so usually not on the console, but still in dmesg.)
I haven't seen it. If so, I'll remove this.
>
> > +static int __init
> > +sn_io_fixup(void)
> > +{
> > + struct pci_bus *bus;
> > + struct pci_dev *pci_dev = NULL;
> > + extern void sn_init_cpei_timer(void);
> > +#ifdef CONFIG_PROC_FS
> > + extern void register_sn_procfs(void);
> > +#endif
> > +
> > + if (!ia64_platform_is("sn2") || IS_RUNNING_ON_FAKE_PROM())
> > + return 0;
> > +
> > + /* Exit if running with old PROM without ACPI support */
> > + if (!SN_ACPI_BASE_SUPPORT())
> > + return 0;
> > +
> > + sn_irq_lh_init();
> > + INIT_LIST_HEAD(&sn_sysdata_list);
> > + sn_init_cpei_timer();
>
> Seems like a weird place to call sn_init_cpei_timer(). I guess I
> have no idea what the CPEI stuff is, but it looks like it *could*
> report platform errors other than PCI. And you probably want to
> call it even if you don't have ACPI support, don't you?
I'll look into what this call is all about. The current code is
doing this in the io fixup path, and I just kept it in the new
SN ACPI code path.
>
> > +
> > +#ifdef CONFIG_PROC_FS
> > + register_sn_procfs();
> > +#endif
> > +
> > + /*
> > + * Generic Linux PCI Layer has created the pci_bus and pci_dev
> > + * structures - time for us to add our SN Platform specific
> > + * information.
> > + */
> > +
> > + bus = NULL;
> > + while ((bus = pci_find_next_bus(bus)) != NULL)
> > + sn_pci_bus_fixup(bus);
> > +
> > + while ((pci_dev =
> > + pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pci_dev)) != NULL) {
> > + sn_pci_fixup_slot(pci_dev);
> > + }
>
> You're doing these fixups with an fs_initcall(). I think they should
> be done by hooking into pcibios_fixup_bus() (maybe we need a new platform
> vector or optional function pointer there; I think PPC has something
> like that already). The initcall scheme won't work if you hot-plug
> things.
Is there a preferred way to do this (platform vector vs PPC way)?
Or is there some way to register an ACPI driver to invoke this
code? (I guess the acpi_pci_root_driver is already registered for
the bridge.)
>
> Bjorn
>
> -
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] RESEND - SN: Add initial ACPI support
@ 2006-01-26 23:04 ` John Keller
0 siblings, 0 replies; 13+ messages in thread
From: John Keller @ 2006-01-26 23:04 UTC (permalink / raw)
To: Bjorn Helgaas; +Cc: linux-ia64, linux-acpi
>
> On Monday 23 January 2006 09:00, John Keller wrote:
> > +obj-$(CONFIG_IA64_SGI_SN2) += acpi-ext.o
>
> Just FYI, this code is moving into drivers/acpi soon. Robert Moore
> might have made a trivial interface change when he integrated it into
> the ACPI CA. No big deal, basically acpi-ext.c was arch-independent
> and we moved it to generic code.
>
> > + * sn_fixup_ionodes() - This routine initializes the HUB data strcuture for
>
> s/strcuture/structure/
>
> > /*
> > - * sn_pci_controller_fixup() - This routine sets up a bus's resources
> > - * consistent with the Linux PCI abstraction layer.
> > + * sn_common_bus_fixup()
> > */
>
> Nit: A comment that merely restates the function name is useless.
> Actually, it's worse than useless because it takes up space and
> requires maintenance.
Yeah, I agree, my mistake.
>
> > +void sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
>
> This function looks very much like pci_acpi_scan_root(). Is this the
> old, non-ACPI path?
>
> > + printk(KERN_INFO "ACPI DSDT OEM Rev 0x%x\n",
> > + acpi_gbl_DSDT->oem_revision);
>
> Doesn't ACPI print something like this for you already? (I think it's
> KERN_DEBUG now, so usually not on the console, but still in dmesg.)
I haven't seen it. If so, I'll remove this.
>
> > +static int __init
> > +sn_io_fixup(void)
> > +{
> > + struct pci_bus *bus;
> > + struct pci_dev *pci_dev = NULL;
> > + extern void sn_init_cpei_timer(void);
> > +#ifdef CONFIG_PROC_FS
> > + extern void register_sn_procfs(void);
> > +#endif
> > +
> > + if (!ia64_platform_is("sn2") || IS_RUNNING_ON_FAKE_PROM())
> > + return 0;
> > +
> > + /* Exit if running with old PROM without ACPI support */
> > + if (!SN_ACPI_BASE_SUPPORT())
> > + return 0;
> > +
> > + sn_irq_lh_init();
> > + INIT_LIST_HEAD(&sn_sysdata_list);
> > + sn_init_cpei_timer();
>
> Seems like a weird place to call sn_init_cpei_timer(). I guess I
> have no idea what the CPEI stuff is, but it looks like it *could*
> report platform errors other than PCI. And you probably want to
> call it even if you don't have ACPI support, don't you?
I'll look into what this call is all about. The current code is
doing this in the io fixup path, and I just kept it in the new
SN ACPI code path.
>
> > +
> > +#ifdef CONFIG_PROC_FS
> > + register_sn_procfs();
> > +#endif
> > +
> > + /*
> > + * Generic Linux PCI Layer has created the pci_bus and pci_dev
> > + * structures - time for us to add our SN Platform specific
> > + * information.
> > + */
> > +
> > + bus = NULL;
> > + while ((bus = pci_find_next_bus(bus)) != NULL)
> > + sn_pci_bus_fixup(bus);
> > +
> > + while ((pci_dev > > + pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pci_dev)) != NULL) {
> > + sn_pci_fixup_slot(pci_dev);
> > + }
>
> You're doing these fixups with an fs_initcall(). I think they should
> be done by hooking into pcibios_fixup_bus() (maybe we need a new platform
> vector or optional function pointer there; I think PPC has something
> like that already). The initcall scheme won't work if you hot-plug
> things.
Is there a preferred way to do this (platform vector vs PPC way)?
Or is there some way to register an ACPI driver to invoke this
code? (I guess the acpi_pci_root_driver is already registered for
the bridge.)
>
> Bjorn
>
> -
> To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] RESEND - SN: Add initial ACPI support
2006-01-26 17:20 ` Bjorn Helgaas
@ 2006-01-27 13:54 ` John Keller
-1 siblings, 0 replies; 13+ messages in thread
From: John Keller @ 2006-01-27 13:54 UTC (permalink / raw)
To: Bjorn Helgaas; +Cc: linux-ia64, linux-acpi
Bjorn,
Just noticed that my last reply didn't respond to all your comments....
John
----
>
> On Monday 23 January 2006 09:00, John Keller wrote:
> > +obj-$(CONFIG_IA64_SGI_SN2) += acpi-ext.o
>
> Just FYI, this code is moving into drivers/acpi soon. Robert Moore
> might have made a trivial interface change when he integrated it into
> the ACPI CA. No big deal, basically acpi-ext.c was arch-independent
> and we moved it to generic code.
Yes, I saw earlier discussions of this, and am aware it's coming soon,
and I believe it is already in Len's acpica tree.
...
>
> > +void sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
>
> This function looks very much like pci_acpi_scan_root(). Is this the
> old, non-ACPI path?
Correct. sn_pci_controller_fixup() is the old non-ACPI path.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH] RESEND - SN: Add initial ACPI support
@ 2006-01-27 13:54 ` John Keller
0 siblings, 0 replies; 13+ messages in thread
From: John Keller @ 2006-01-27 13:54 UTC (permalink / raw)
To: Bjorn Helgaas; +Cc: linux-ia64, linux-acpi
Bjorn,
Just noticed that my last reply didn't respond to all your comments....
John
----
>
> On Monday 23 January 2006 09:00, John Keller wrote:
> > +obj-$(CONFIG_IA64_SGI_SN2) += acpi-ext.o
>
> Just FYI, this code is moving into drivers/acpi soon. Robert Moore
> might have made a trivial interface change when he integrated it into
> the ACPI CA. No big deal, basically acpi-ext.c was arch-independent
> and we moved it to generic code.
Yes, I saw earlier discussions of this, and am aware it's coming soon,
and I believe it is already in Len's acpica tree.
...
>
> > +void sn_pci_controller_fixup(int segment, int busnum, struct pci_bus *bus)
>
> This function looks very much like pci_acpi_scan_root(). Is this the
> old, non-ACPI path?
Correct. sn_pci_controller_fixup() is the old non-ACPI path.
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2006-01-27 13:54 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-01-23 16:00 [PATCH] RESEND - SN: Add initial ACPI support John Keller
2006-01-23 16:00 ` John Keller
2006-01-26 17:20 ` Bjorn Helgaas
2006-01-26 17:20 ` Bjorn Helgaas
2006-01-26 23:04 ` John Keller
2006-01-26 23:04 ` John Keller
2006-01-27 13:54 ` John Keller
2006-01-27 13:54 ` John Keller
-- strict thread matches above, loose matches on Subject: below --
2006-01-15 18:23 John Keller
2006-01-15 18:23 ` John Keller
2006-01-15 20:41 ` Prarit Bhargava
2006-01-16 8:21 ` Jes Sorensen
2006-01-16 8:21 ` Jes Sorensen
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.