Re: [PATCH] skge: remove unused declarations

Re: [PATCH] skge: remove unused declarations

[Dave Jones]

On Tue, Jun 28, 2005 at 12:16:44PM -0700, Linux Kernel wrote:
 > tree 6154380f95d261126525fc95eb149ddc8478eeea
 > parent 4707953454677f985289b4e4bcbea41f0cc651c2
 > author Stephen Hemminger <shemminger@osdl.org> Tue, 28 Jun 2005 01:33:08 -0700
 > committer Jeff Garzik <jgarzik@pobox.com> Tue, 28 Jun 2005 02:05:06 -0400
 > 
 > [PATCH] skge: remove unused declarations
 > 
 > Get rid of definitions for chip versions and PHY chips that
 > this driver does not support.
 > 
 > Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
 > ...
 > -	PCI_EN_DUMMY_RD = 1<<3, /* Enable Dummy Read */
 > -	PCI_REV_DESC    = 1<<2, /* Reverse Desc. Bytes */
 > -	PCI_USEDATA64   = 1<<0, /* Use 64Bit Data bus ext */
 > -};

This bit breaks PPC builds, due to ..

   3145 #ifdef __BIG_ENDIAN
   3146     /* byte swap decriptors in hardware */
   3147     {
   3148         u32 reg;
   3149
   3150         pci_read_config_dword(pdev, PCI_DEV_REG2, &reg);
   3151         reg |= 1 << 2;  /* PCI_REV_DESC */
   3152         pci_write_config_dword(pdev, PCI_DEV_REG2, reg);
   3153     }
   3154 #endif

For my builds, I've just hardcoded it, I don't know if you prefer
to put the enum back or not..

		Dave

Re: [PATCH] skge: remove unused declarations

[Stephen Hemminger]

Here is a patch that adds back the dev reg enum's. 
BTW: I haven't tested this driver on big endian systems yet.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>

Index: sky2/drivers/net/skge.h
===================================================================
--- sky2.orig/drivers/net/skge.h
+++ sky2/drivers/net/skge.h
@@ -8,6 +8,19 @@
 #define PCI_DEV_REG1	0x40
 #define PCI_DEV_REG2	0x44
 
+enum pci_dev_reg_2 {
+	PCI_VPD_WR_THR	= 0xffL<<24,	/* Bit 31..24:	VPD Write Threshold */
+	PCI_DEV_SEL	= 0x7fL<<17,	/* Bit 23..17:	EEPROM Device Select */
+	PCI_VPD_ROM_SZ	= 7L<<14,	/* Bit 16..14:	VPD ROM Size	*/
+
+	PCI_PATCH_DIR	= 0xfL<<8,	/* Bit 11.. 8:	Ext Patches dir 3..0 */
+	PCI_EXT_PATCHS	= 0xfL<<4,	/* Bit	7.. 4:	Extended Patches 3..0 */
+	PCI_EN_DUMMY_RD	= 1<<3,		/* Enable Dummy Read */
+	PCI_REV_DESC	= 1<<2,		/* Reverse Desc. Bytes */
+
+	PCI_USEDATA64	= 1<<0,		/* Use 64Bit Data bus ext */
+};
+
 #define PCI_STATUS_ERROR_BITS (PCI_STATUS_DETECTED_PARITY | \
 			       PCI_STATUS_SIG_SYSTEM_ERROR | \
 			       PCI_STATUS_REC_MASTER_ABORT | \