Print this page
Just the 5719/5720 changes

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/common/io/bge/bge_impl.h
          +++ new/usr/src/uts/common/io/bge/bge_impl.h
↓ open down ↓ 15 lines elided ↑ open up ↑
  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  /*
  23   23   * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
  24   24   */
  25   25  
       26 +/*
       27 + * Copyright 2012 Nexenta Systems, Inc.  All rights reserved.
       28 + */
       29 +
  26   30  #ifndef _BGE_IMPL_H
  27   31  #define _BGE_IMPL_H
  28   32  
  29   33  
  30   34  #ifdef __cplusplus
  31   35  extern "C" {
  32   36  #endif
  33   37  
  34   38  #include <sys/types.h>
  35   39  #include <sys/stream.h>
↓ open down ↓ 562 lines elided ↑ open up ↑
 598  602  
 599  603          uint16_t                vendor;         /* vendor-id            */
 600  604          uint16_t                device;         /* device-id            */
 601  605          uint16_t                subven;         /* subsystem-vendor-id  */
 602  606          uint16_t                subdev;         /* subsystem-id         */
 603  607          uint8_t                 revision;       /* revision-id          */
 604  608          uint8_t                 clsize;         /* cache-line-size      */
 605  609          uint8_t                 latency;        /* latency-timer        */
 606  610  
 607  611          uint8_t                 flags;
      612 +        uint32_t                chip_type;      /* see CHIP_TYPE_ in bge_hw.h */
 608  613          uint16_t                chip_label;     /* numeric part only    */
 609  614                                                  /* (e.g. 5703/5794/etc) */
 610  615          uint32_t                mbuf_base;      /* Mbuf pool parameters */
 611  616          uint32_t                mbuf_length;    /* depend on chiptype   */
 612  617          uint32_t                pci_type;
 613  618          uint32_t                statistic_type;
 614  619          uint32_t                bge_dma_rwctrl;
 615  620          uint32_t                bge_mlcr_default;
 616  621          uint32_t                recv_slots;     /* receive ring size    */
 617  622          enum bge_nvmem_type     nvtype;         /* SEEPROM or Flash     */
↓ open down ↓ 15 lines elided ↑ open up ↑
 633  638          bge_mac_addr_t          vendor_addr;    /* transform of same    */
 634  639          boolean_t               msi_enabled;    /* default to true */
 635  640  
 636  641          uint32_t                rx_ticks_norm;
 637  642          uint32_t                rx_count_norm;
 638  643          uint32_t                tx_ticks_norm;
 639  644          uint32_t                tx_count_norm;
 640  645          uint32_t                mask_pci_int;
 641  646  } chip_id_t;
 642  647  
 643      -#define CHIP_FLAG_SUPPORTED     0x80
 644      -#define CHIP_FLAG_SERDES        0x40
 645      -#define CHIP_FLAG_PARTIAL_CSUM  0x20
 646      -#define CHIP_FLAG_NO_JUMBO      0x1
      648 +#define CHIP_FLAG_SUPPORTED      0x80
      649 +#define CHIP_FLAG_SERDES         0x40
      650 +#define CHIP_FLAG_PARTIAL_CSUM   0x20
      651 +#define CHIP_FLAG_NO_CHECK_RESET 0x2
      652 +#define CHIP_FLAG_NO_JUMBO       0x1
 647  653  
 648  654  /*
 649  655   * Collection of physical-layer functions to:
 650  656   *      (re)initialise the physical layer
 651  657   *      update it to match software settings
 652  658   *      check for link status change
 653  659   */
 654  660  typedef struct {
 655  661          int                     (*phys_restart)(struct bge *, boolean_t);
 656  662          int                     (*phys_update)(struct bge *);
↓ open down ↓ 638 lines elided ↑ open up ↑
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX