Print this page
8620 pcplusmp shouldn't support x2APIC mode
Reviewed by: Robert Mustacchi <rm@joyent.com>
Reviewed by: Jerry Jelinek <jerry.jelinek@joyent.com>

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/i86pc/sys/apic.h
          +++ new/usr/src/uts/i86pc/sys/apic.h
↓ open down ↓ 12 lines elided ↑ open up ↑
  13   13   * When distributing Covered Code, include this CDDL HEADER in each
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  /*
  22   22   * Copyright (c) 1993, 2010, Oracle and/or its affiliates. All rights reserved.
       23 + * Copyright 2017 Joyent, Inc.
  23   24   */
  24      -
  25   25  /*
  26   26   * Copyright (c) 2010, Intel Corporation.
  27   27   * All rights reserved.
  28   28   */
  29   29  
  30   30  #ifndef _SYS_APIC_APIC_H
  31   31  #define _SYS_APIC_APIC_H
  32   32  
  33   33  #include <sys/psm_types.h>
  34   34  #include <sys/avintr.h>
↓ open down ↓ 75 lines elided ↑ open up ↑
 110  110          LOCAL_X2APIC
 111  111  } apic_mode_t;
 112  112  
 113  113  /* x2APIC SELF IPI Register */
 114  114  #define X2APIC_SELF_IPI         0xFC
 115  115  
 116  116  /* General x2APIC constants used at various places */
 117  117  #define APIC_SVR_SUPPRESS_BROADCAST_EOI         0x1000
 118  118  #define APIC_DIRECTED_EOI_BIT                   0x1000000
 119  119  
      120 +/* x2APIC enable bit in REG_APIC_BASE_MSR */
      121 +#define X2APIC_ENABLE_BIT       10
      122 +
 120  123  /* IRR register */
 121  124  #define APIC_IRR_REG            0x80
 122  125  
 123  126  /* ISR register */
 124  127  #define APIC_ISR_REG            0x40
 125  128  
 126  129  #define APIC_IO_REG             0x0
 127  130  #define APIC_IO_DATA            0x4
 128  131  #define APIC_IO_EOI             0x10
 129  132  
↓ open down ↓ 730 lines elided ↑ open up ↑
 860  863  extern int apic_enable_acpi;
 861  864  extern int apic_nproc;
 862  865  extern int apic_max_nproc;
 863  866  extern int apic_next_bind_cpu;
 864  867  extern int apic_redistribute_sample_interval;
 865  868  extern int apic_multi_msi_enable;
 866  869  extern int apic_sci_vect;
 867  870  extern int apic_hpet_vect;
 868  871  extern uchar_t apic_ipls[];
 869  872  extern apic_reg_ops_t *apic_reg_ops;
      873 +extern apic_reg_ops_t local_apic_regs_ops;
 870  874  extern apic_mode_t apic_mode;
 871  875  extern void x2apic_update_psm();
 872  876  extern void apic_change_ops();
 873  877  extern void apic_common_send_ipi(int, int);
 874  878  extern void apic_set_directed_EOI_handler();
 875  879  extern int apic_directed_EOI_supported();
 876  880  
 877  881  extern apic_intrmap_ops_t *apic_vt_ops;
 878  882  
 879  883  #ifdef  __cplusplus
 880  884  }
 881  885  #endif
 882  886  
 883  887  #endif  /* _SYS_APIC_APIC_H */
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX