RE: [LinuxBIOS] LNXI Merge: lnxi-patch02/16

[Lu, Yinghai]

Why usb2?

Amd8111 usb2 already be disabled, and can not be used ....

YH

-----Original Message-----
From: [e-mail]
[mailto:[e-mail]] On Behalf Of jason schildt
Sent: Friday, September 02, 2005 3:03 PM
To: [e-mail]
Subject: [LinuxBIOS] LNXI Merge: lnxi-patch02/16

DESCRIPTION:
---------------------------------------------------------
## lnxi-patch-2 ## - (3)files
src/southbridge/amd/amd8111/amd8111_lpc.c
    powermanagment removed.
    copied to public tree

src/southbridge/amd/amd8111/Config.lb
    
src/southbridge/amd/amd8111/amd8111_usb.c
    uncommented amd8111_enable

DIFFSTAT:
---------------------------------------------------------
Config.lb     |    9 ++++-----
  amd8111_lpc.c |   12 ++++--------
  amd8111_usb.c |    2 +-
  3 files changed, 9 insertions(+), 14 deletions(-)

PATCH:
---------------------------------------------------------

Index: amd8111_lpc.c
===================================================================
--- amd8111_lpc.c	(revision 1105)
+++ amd8111_lpc.c	(working copy)
@@ -84,7 +84,7 @@
    		return;
    	}
    	printk_spew("for IRQ, reg 0x%08x value 0x%08x 0x%08x\n",
-			    a->reg, a->value_low, a->value_high);
+			a->reg, a->value_low, a->value_high);
    }
  }

@@ -113,13 +113,9 @@
    byte = pci_read_config8(dev, 0x46);
    pci_write_config8(dev, 0x46, byte | (1<<0));

-	/* power after power fail */
+	/* Enable 5Mib Rom window */
    byte = pci_read_config8(dev, 0x43);
-	if (pwr_on) {
-		byte &= ~(1<<6);
-	} else {
-		byte |= (1<<6);
-	}
+	byte |= 0xC0;
    pci_write_config8(dev, 0x43, byte);

/* Enable Port 92 fast reset */
@@ -179,7 +175,7 @@
  static void lpci_set_subsystem(device_t dev, unsigned vendor, unsigned

device)
  {
    pci_write_config32(dev, 0x70,
-			   ((device & 0xffff) << 16) | (vendor &
0xffff));
+		((device & 0xffff) << 16) | (vendor & 0xffff));
  }

static struct pci_operations lops_pci = {
Index: Config.lb
===================================================================
--- Config.lb	(revision 1105)
+++ Config.lb	(working copy)
@@ -1,12 +1,11 @@
  config chip.h
  driver amd8111.o
-#driver amd8111_usb.o
+driver amd8111_usb.o
  driver amd8111_lpc.o
  driver amd8111_ide.o
  driver amd8111_acpi.o
-#driver amd8111_usb2.o
-#driver amd8111_ac97.o
-#driver amd8111_nic.o
+driver amd8111_usb2.o
+driver amd8111_ac97.o
+driver amd8111_nic.o
  driver amd8111_pci.o
  driver amd8111_smbus.o
-object amd8111_reset.o
Index: amd8111_usb.c
===================================================================
--- amd8111_usb.c	(revision 1105)
+++ amd8111_usb.c	(working copy)
@@ -26,7 +26,7 @@
    .enable_resources = pci_dev_enable_resources,
    .init             = 0,
    .scan_bus         = scan_static_bus,
-//	.enable           = amd8111_enable,
+	.enable           = amd8111_enable,
    .ops_pci          = &lops_pci,
  };

[LinuxBIOS] LNXI Merge: lnxi-patch02/16

"Lu, Yinghai"  writes:
> Why usb2?
>
> Amd8111 usb2 already be disabled, and can not be used ....

That seems to match my recollections.  In which case the code
should be modified to always disable usb2 unconditionally with
an appropriate comment.  Simply not compiling the code is confusing
and appears to be a board specific hack in generic code.

Eric