From owner-p4-projects@FreeBSD.ORG Sun Jul 16 04:41:02 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B1DD16A4E0; Sun, 16 Jul 2006 04:41:02 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3486316A4DE for ; Sun, 16 Jul 2006 04:41:02 +0000 (UTC) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id F0E0043D49 for ; Sun, 16 Jul 2006 04:41:01 +0000 (GMT) (envelope-from kmacy@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k6G4f11A074207 for ; Sun, 16 Jul 2006 04:41:01 GMT (envelope-from kmacy@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6G4f1Qe074204 for perforce@freebsd.org; Sun, 16 Jul 2006 04:41:01 GMT (envelope-from kmacy@freebsd.org) Date: Sun, 16 Jul 2006 04:41:01 GMT Message-Id: <200607160441.k6G4f1Qe074204@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to kmacy@freebsd.org using -f From: Kip Macy To: Perforce Change Reviews Cc: Subject: PERFORCE change 101683 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 16 Jul 2006 04:41:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=101683 Change 101683 by kmacy@kmacy_storage:sun4v_work_stable on 2006/07/16 04:40:27 remove unused fields pc_node and pc_mid add pc_caller field for tracking last call site Affected files ... .. //depot/projects/kmacy_sun4v_stable/src/sys/sparc64/sparc64/genassym.c#3 edit .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/include/pcpu.h#3 edit .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/machdep.c#4 edit .. //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/mp_machdep.c#2 edit Differences ... ==== //depot/projects/kmacy_sun4v_stable/src/sys/sparc64/sparc64/genassym.c#3 (text+ko) ==== @@ -198,13 +198,13 @@ ASSYM(V_INTR, offsetof(struct vmmeter, v_intr)); ASSYM(PC_CURTHREAD, offsetof(struct pcpu, pc_curthread)); +ASSYM(PC_CALLER, offsetof(struct pcpu, pc_caller)); ASSYM(PC_CURPCB, offsetof(struct pcpu, pc_curpcb)); ASSYM(PC_CPUID, offsetof(struct pcpu, pc_cpuid)); ASSYM(PC_CPUMASK, offsetof(struct pcpu, pc_cpumask)); ASSYM(PC_IRHEAD, offsetof(struct pcpu, pc_irhead)); ASSYM(PC_IRTAIL, offsetof(struct pcpu, pc_irtail)); ASSYM(PC_IRFREE, offsetof(struct pcpu, pc_irfree)); -ASSYM(PC_MID, offsetof(struct pcpu, pc_mid)); ASSYM(PC_CNT, offsetof(struct pcpu, pc_cnt)); ASSYM(PC_SIZEOF, sizeof(struct pcpu)); @@ -230,6 +230,7 @@ ASSYM(PCB_KSTACK, offsetof(struct pcb, pcb_kstack)); ASSYM(INTR_REPORT_SIZE, INTR_REPORT_SIZE); #else +ASSYM(PC_MID, offsetof(struct pcpu, pc_mid)); ASSYM(PC_TLB_CTX, offsetof(struct pcpu, pc_tlb_ctx)); ASSYM(PC_TLB_CTX_MAX, offsetof(struct pcpu, pc_tlb_ctx_max)); ASSYM(PC_TLB_CTX_MIN, offsetof(struct pcpu, pc_tlb_ctx_min)); ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/include/pcpu.h#3 (text+ko) ==== @@ -72,14 +72,13 @@ u_long pc_lookup_field; \ u_long pc_last_field; \ u_long pc_tickadj; \ - u_int pc_mid; \ struct rwindow pc_kwbuf; \ u_long pc_kwbuf_sp; \ u_int pc_kwbuf_full; \ struct rwindow pc_tsbwbuf[2]; \ - u_int pc_node; \ + uint64_t pc_caller; \ uint16_t pc_cpulist[MAXCPU]; \ - uint64_t pad[6]; + uint64_t pad[7]; /* XXX SUN4V_FIXME - as we access the *_ra and *_size fields in quick * succession we _really_ want them to be L1 cache line size aligned ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/machdep.c#4 (text+ko) ==== @@ -394,7 +394,6 @@ pc->pc_mid = UPA_CR_GET_MID(ldxa(0, ASI_UPA_CONFIG_REG)); #endif pc->pc_addr = (vm_offset_t)pcpu0; - pc->pc_node = child; /* * Initialize global registers. ==== //depot/projects/kmacy_sun4v_stable/src/sys/sun4v/sun4v/mp_machdep.c#2 (text+ko) ==== @@ -165,7 +165,6 @@ int cpus; all_cpus = 1 << PCPU_GET(cpuid); - mp_boot_mid = PCPU_GET(mid); mp_ncpus = 1; cpus = 0; @@ -262,7 +261,6 @@ pc = (struct pcpu *)(va + (PCPU_PAGES * PAGE_SIZE)) - 1; pcpu_init(pc, cpuid, sizeof(*pc)); pc->pc_addr = va; - pc->pc_node = child; all_cpus |= 1 << cpuid;