Staging: et131x: Collapse all the function definitions into one place (69ea5fcb) · Commits · 戴 / test

drivers/staging/et131x/et1310_eeprom.c

+33 −8

Original line number	Diff line number	Diff line
		@@ -84,17 +84,42 @@
		#include <linux/ioport.h>

		#include "et1310_phy.h"
		#include "et1310_pm.h"
		#include "et1310_jagcore.h"
		#include "et1310_eeprom.h"

		#include "et131x_adapter.h"
		#include "et131x_initpci.h"
		#include "et131x_isr.h"

		#include "et1310_tx.h"
		#include "et131x.h"

		/*
		* EEPROM Defines
		*/

		/* LBCIF Register Groups (addressed via 32-bit offsets) */
		#define LBCIF_DWORD0_GROUP 0xAC
		#define LBCIF_DWORD1_GROUP 0xB0

		/* LBCIF Registers (addressed via 8-bit offsets) */
		#define LBCIF_ADDRESS_REGISTER 0xAC
		#define LBCIF_DATA_REGISTER 0xB0
		#define LBCIF_CONTROL_REGISTER 0xB1
		#define LBCIF_STATUS_REGISTER 0xB2

		/* LBCIF Control Register Bits */
		#define LBCIF_CONTROL_SEQUENTIAL_READ 0x01
		#define LBCIF_CONTROL_PAGE_WRITE 0x02
		#define LBCIF_CONTROL_EEPROM_RELOAD 0x08
		#define LBCIF_CONTROL_TWO_BYTE_ADDR 0x20
		#define LBCIF_CONTROL_I2C_WRITE 0x40
		#define LBCIF_CONTROL_LBCIF_ENABLE 0x80

		/* LBCIF Status Register Bits */
		#define LBCIF_STATUS_PHY_QUEUE_AVAIL 0x01
		#define LBCIF_STATUS_I2C_IDLE 0x02
		#define LBCIF_STATUS_ACK_ERROR 0x04
		#define LBCIF_STATUS_GENERAL_ERROR 0x08
		#define LBCIF_STATUS_CHECKSUM_ERROR 0x40
		#define LBCIF_STATUS_EEPROM_PRESENT 0x80

		/* Miscellaneous Constraints */
		#define MAX_NUM_REGISTER_POLLS 1000
		#define MAX_NUM_WRITE_RETRIES 2

		static int eeprom_wait_ready(struct pci_dev pdev, u32 status)
		{

drivers/staging/et131x/et1310_eeprom.h

deleted100644 → 0

+0 −103

Original line number	Diff line number	Diff line
		/*
		* Agere Systems Inc.
		* 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs
		*
		* Copyright © 2005 Agere Systems Inc.
		* All rights reserved.
		* http://www.agere.com
		*
		*------------------------------------------------------------------------------
		*
		* et1310_eeprom.h - Defines, structs, enums, prototypes, etc. used for EEPROM
		* access routines
		*
		*------------------------------------------------------------------------------
		*
		* SOFTWARE LICENSE
		*
		* This software is provided subject to the following terms and conditions,
		* which you should read carefully before using the software. Using this
		* software indicates your acceptance of these terms and conditions. If you do
		* not agree with these terms and conditions, do not use the software.
		*
		* Copyright © 2005 Agere Systems Inc.
		* All rights reserved.
		*
		* Redistribution and use in source or binary forms, with or without
		* modifications, are permitted provided that the following conditions are met:
		*
		* . Redistributions of source code must retain the above copyright notice, this
		* list of conditions and the following Disclaimer as comments in the code as
		* well as in the documentation and/or other materials provided with the
		* distribution.
		*
		* . Redistributions in binary form must reproduce the above copyright notice,
		* this list of conditions and the following Disclaimer in the documentation
		* and/or other materials provided with the distribution.
		*
		* . Neither the name of Agere Systems Inc. nor the names of the contributors
		* may be used to endorse or promote products derived from this software
		* without specific prior written permission.
		*
		* Disclaimer
		*
		* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
		* INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
		* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY
		* USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN
		* RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY
		* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
		* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
		* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
		* ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT
		* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
		* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
		* DAMAGE.
		*
		*/

		#ifndef __ET1310_EEPROM_H__
		#define __ET1310_EEPROM_H__

		#include "et1310_address_map.h"

		/*
		* EEPROM Defines
		*/

		/* LBCIF Register Groups (addressed via 32-bit offsets) */
		#define LBCIF_DWORD0_GROUP 0xAC
		#define LBCIF_DWORD1_GROUP 0xB0

		/* LBCIF Registers (addressed via 8-bit offsets) */
		#define LBCIF_ADDRESS_REGISTER 0xAC
		#define LBCIF_DATA_REGISTER 0xB0
		#define LBCIF_CONTROL_REGISTER 0xB1
		#define LBCIF_STATUS_REGISTER 0xB2

		/* LBCIF Control Register Bits */
		#define LBCIF_CONTROL_SEQUENTIAL_READ 0x01
		#define LBCIF_CONTROL_PAGE_WRITE 0x02
		#define LBCIF_CONTROL_EEPROM_RELOAD 0x08
		#define LBCIF_CONTROL_TWO_BYTE_ADDR 0x20
		#define LBCIF_CONTROL_I2C_WRITE 0x40
		#define LBCIF_CONTROL_LBCIF_ENABLE 0x80

		/* LBCIF Status Register Bits */
		#define LBCIF_STATUS_PHY_QUEUE_AVAIL 0x01
		#define LBCIF_STATUS_I2C_IDLE 0x02
		#define LBCIF_STATUS_ACK_ERROR 0x04
		#define LBCIF_STATUS_GENERAL_ERROR 0x08
		#define LBCIF_STATUS_CHECKSUM_ERROR 0x40
		#define LBCIF_STATUS_EEPROM_PRESENT 0x80

		/* Miscellaneous Constraints */
		#define MAX_NUM_REGISTER_POLLS 1000
		#define MAX_NUM_WRITE_RETRIES 2

		/* Forward declaration of the private adapter structure */
		struct et131x_adapter;

		int et131x_init_eeprom(struct et131x_adapter *etdev);

		#endif /* _ET1310_EEPROM_H_ */

drivers/staging/et131x/et1310_jagcore.h

deleted100644 → 0

+0 −94

Original line number	Diff line number	Diff line
		/*
		* Agere Systems Inc.
		* 10/100/1000 Base-T Ethernet Driver for the ET1301 and ET131x series MACs
		*
		* Copyright © 2005 Agere Systems Inc.
		* All rights reserved.
		* http://www.agere.com
		*
		*------------------------------------------------------------------------------
		*
		* et1310_jagcore.h - Defines, structs, enums, prototypes, etc. pertaining to
		* the JAGCore
		*
		*------------------------------------------------------------------------------
		*
		* SOFTWARE LICENSE
		*
		* This software is provided subject to the following terms and conditions,
		* which you should read carefully before using the software. Using this
		* software indicates your acceptance of these terms and conditions. If you do
		* not agree with these terms and conditions, do not use the software.
		*
		* Copyright © 2005 Agere Systems Inc.
		* All rights reserved.
		*
		* Redistribution and use in source or binary forms, with or without
		* modifications, are permitted provided that the following conditions are met:
		*
		* . Redistributions of source code must retain the above copyright notice, this
		* list of conditions and the following Disclaimer as comments in the code as
		* well as in the documentation and/or other materials provided with the
		* distribution.
		*
		* . Redistributions in binary form must reproduce the above copyright notice,
		* this list of conditions and the following Disclaimer in the documentation
		* and/or other materials provided with the distribution.
		*
		* . Neither the name of Agere Systems Inc. nor the names of the contributors
		* may be used to endorse or promote products derived from this software
		* without specific prior written permission.
		*
		* Disclaimer
		*
		* THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
		* INCLUDING, BUT NOT LIMITED TO, INFRINGEMENT AND THE IMPLIED WARRANTIES OF
		* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. ANY
		* USE, MODIFICATION OR DISTRIBUTION OF THIS SOFTWARE IS SOLELY AT THE USERS OWN
		* RISK. IN NO EVENT SHALL AGERE SYSTEMS INC. OR CONTRIBUTORS BE LIABLE FOR ANY
		* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
		* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
		* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
		* ON ANY THEORY OF LIABILITY, INCLUDING, BUT NOT LIMITED TO, CONTRACT, STRICT
		* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
		* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
		* DAMAGE.
		*
		*/

		#ifndef __ET1310_JAGCORE_H__
		#define __ET1310_JAGCORE_H__

		#include "et1310_address_map.h"


		#define INTERNAL_MEM_SIZE 0x400 /* 1024 of internal memory */
		#define INTERNAL_MEM_RX_OFFSET 0x1FF /* 50% Tx, 50% Rx */

		/*
		* For interrupts, normal running is:
		* rxdma_xfr_done, phy_interrupt, mac_stat_interrupt,
		* watchdog_interrupt & txdma_xfer_done
		*
		* In both cases, when flow control is enabled for either Tx or bi-direction,
		* we additional enable rx_fbr0_low and rx_fbr1_low, so we know when the
		* buffer rings are running low.
		*/
		#define INT_MASK_DISABLE 0xffffffff

		/* NOTE: Masking out MAC_STAT Interrupt for now...
		* #define INT_MASK_ENABLE 0xfff6bf17
		* #define INT_MASK_ENABLE_NO_FLOW 0xfff6bfd7
		*/
		#define INT_MASK_ENABLE 0xfffebf17
		#define INT_MASK_ENABLE_NO_FLOW 0xfffebfd7

		/* Forward declaration of the private adapter structure */
		struct et131x_adapter;

		void ConfigGlobalRegs(struct et131x_adapter *pAdapter);
		void ConfigMMCRegs(struct et131x_adapter *pAdapter);
		void et131x_enable_interrupts(struct et131x_adapter *adapter);
		void et131x_disable_interrupts(struct et131x_adapter *adapter);

		#endif /* __ET1310_JAGCORE_H__ */

drivers/staging/et131x/et1310_mac.c

+12 −5

Original line number	Diff line number	Diff line
		@@ -85,12 +85,19 @@
		#include <linux/crc32.h>

		#include "et1310_phy.h"
		#include "et1310_pm.h"
		#include "et1310_jagcore.h"
		#include "et1310_mac.h"

		#include "et131x_adapter.h"
		#include "et131x_initpci.h"
		#include "et131x.h"


		#define COUNTER_WRAP_28_BIT 0x10000000
		#define COUNTER_WRAP_22_BIT 0x400000
		#define COUNTER_WRAP_16_BIT 0x10000
		#define COUNTER_WRAP_12_BIT 0x1000

		#define COUNTER_MASK_28_BIT (COUNTER_WRAP_28_BIT - 1)
		#define COUNTER_MASK_22_BIT (COUNTER_WRAP_22_BIT - 1)
		#define COUNTER_MASK_16_BIT (COUNTER_WRAP_16_BIT - 1)
		#define COUNTER_MASK_12_BIT (COUNTER_WRAP_12_BIT - 1)

		/**
		* ConfigMacRegs1 - Initialize the first part of MAC regs

drivers/staging/et131x/et1310_phy.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -85,17 +85,14 @@
		#include <linux/random.h>

		#include "et1310_phy.h"
		#include "et1310_pm.h"
		#include "et1310_jagcore.h"

		#include "et131x_adapter.h"
		#include "et131x_netdev.h"
		#include "et131x_initpci.h"

		#include "et1310_address_map.h"
		#include "et1310_tx.h"
		#include "et1310_rx.h"
		#include "et1310_mac.h"

		#include "et131x.h"

		/* Prototypes for functions with local scope */
		static void et131x_xcvr_init(struct et131x_adapter *etdev);

Admin message