From owner-svn-src-projects@FreeBSD.ORG Tue Mar 29 00:33:04 2011 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8DC7F1065676; Tue, 29 Mar 2011 00:33:04 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 2A7408FC15; Tue, 29 Mar 2011 00:33:03 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p2T0X3NE011344; Tue, 29 Mar 2011 00:33:03 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p2T0X3iu011342; Tue, 29 Mar 2011 00:33:03 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201103290033.p2T0X3iu011342@svn.freebsd.org> From: Marcel Moolenaar Date: Tue, 29 Mar 2011 00:33:03 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r220118 - projects/altix/sys/ia64/ia64 X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Mar 2011 00:33:04 -0000 Author: marcel Date: Tue Mar 29 00:33:02 2011 New Revision: 220118 URL: http://svn.freebsd.org/changeset/base/220118 Log: Remove Altix cruft now that we have the SHub driver. Modified: projects/altix/sys/ia64/ia64/machdep.c Modified: projects/altix/sys/ia64/ia64/machdep.c ============================================================================== --- projects/altix/sys/ia64/ia64/machdep.c Tue Mar 29 00:06:02 2011 (r220117) +++ projects/altix/sys/ia64/ia64/machdep.c Tue Mar 29 00:33:02 2011 (r220118) @@ -174,70 +174,6 @@ struct kva_md_info kmi; #define Mhz 1000000L #define Ghz (1000L*Mhz) -#define SN_SAL_SET_OS_FEATURE_SET 0x02000066 - -#define OSF_ACPI_ENABLE 2 -#define OSF_PCISEGMENT_ENABLE 3 - -#include -#include -#include - -static void -srat_dump_entry(ACPI_SUBTABLE_HEADER *entry, void *arg) -{ - ACPI_SRAT_CPU_AFFINITY *cpu; - ACPI_SRAT_MEM_AFFINITY *mem; - uint32_t domain; - uint16_t sapicid; - - switch (entry->Type) { - case ACPI_SRAT_TYPE_CPU_AFFINITY: - cpu = (ACPI_SRAT_CPU_AFFINITY *)entry; - domain = cpu->ProximityDomainLo | - cpu->ProximityDomainHi[0] << 8 | - cpu->ProximityDomainHi[1] << 16 | - cpu->ProximityDomainHi[2] << 24; - sapicid = (cpu->ApicId << 8) | cpu->LocalSapicEid; - printf("SRAT: Sapic ID %u domain %d: %s\n", sapicid, domain, - (cpu->Flags & ACPI_SRAT_CPU_ENABLED) ? "enabled" : - "disabled"); - break; - case ACPI_SRAT_TYPE_MEMORY_AFFINITY: - mem = (ACPI_SRAT_MEM_AFFINITY *)entry; - printf("SRAT: memory domain %d addr %lx len %lx: %s\n", - mem->ProximityDomain, mem->BaseAddress, mem->Length, - (mem->Flags & ACPI_SRAT_MEM_ENABLED) ? "enabled" : - "disabled"); - break; - default: - printf("SRAT: unknown type (%u)\n", entry->Type); - break; - } -} - -static void -check_sn_sal(void) -{ - struct ia64_sal_result r; - ACPI_TABLE_HEADER *tbl; - void *ptr; - - r = ia64_sal_entry(SAL_SGISN_SN_INFO, 0, 0, 0, 0, 0, 0, 0); - printf("XXX: %s: stat=%ld, res0=%#lx, res1=%#lx, res2=%#lx\n", - __func__, r.sal_status, r.sal_result[0], r.sal_result[1], - r.sal_result[2]); - if (r.sal_status != 0) - return; - - tbl = ptr = acpi_find_table(ACPI_SIG_SRAT); - printf("XXX: %s: SRAT table at %p\n", __func__, ptr); - acpi_walk_subtables((char *)ptr + sizeof(ACPI_TABLE_SRAT), - (char *)ptr + tbl->Length, srat_dump_entry, ptr); - tbl = acpi_find_table(ACPI_SIG_SLIT); - printf("XXX: %s: SLIT table at %p\n", __func__, tbl); -} - static void identifycpu(void) { @@ -867,8 +803,6 @@ ia64_init(struct bootinfo *bi) if (metadata_missing) printf("WARNING: loader(8) metadata is missing!\n"); - check_sn_sal(); - /* Get FPSWA interface */ fpswa_iface = (bootinfo->bi_fpswa == 0) ? NULL : (struct fpswa_iface *)IA64_PHYS_TO_RR7(bootinfo->bi_fpswa);