public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [edk2-platforms PATCH 2/5] Silicon/Synopsys/DesignWare: Replace BSD License with BSD+Patent License
       [not found] <20200717100203.724-1-vinxue@outlook.com>
@ 2020-07-17 10:02 ` Vin Xue
  2020-07-17 10:02 ` [edk2-platforms PATCH 3/5] Silicon/Synopsys/DesignWare: Remove platform specific init code Vin Xue
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 4+ messages in thread
From: Vin Xue @ 2020-07-17 10:02 UTC (permalink / raw)
  To: devel; +Cc: Vin Xue, Ard Biesheuvel, Leif Lindholm

Replace BSD 2-Clause License with BSD+Patent License.

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Signed-off-by: Vin Xue <vinxue@outlook.com>
---
 .../DesignWare/Drivers/UsbDeviceDxe/ComponentName.c    |  8 +-------
 .../DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.c     |  8 +-------
 .../DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.h     |  8 +-------
 .../DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.inf   |  8 +-------
 .../DesignWare/Drivers/UsbDeviceDxe/UsbDeviceMode.c    |  8 +-------
 .../DesignWare/Drivers/UsbDeviceDxe/UsbDeviceMode.h    |  8 +-------
 .../DesignWare/Drivers/UsbDeviceDxe/UsbFuncIo.c        |  8 +-------
 .../DesignWare/Drivers/UsbDeviceDxe/UsbFuncIo.h        |  8 +-------
 .../DesignWare/Drivers/UsbDeviceDxe/UsbIoNode.c        |  8 +-------
 .../DesignWare/Drivers/UsbDeviceDxe/UsbIoNode.h        |  8 +-------
 .../DesignWare/Drivers/UsbDeviceDxe/XdciCommon.h       |  8 +-------
 .../Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciDWC.c | 10 ++--------
 .../Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciDWC.h |  8 +-------
 .../DesignWare/Drivers/UsbDeviceDxe/XdciDevice.c       |  8 +-------
 .../DesignWare/Drivers/UsbDeviceDxe/XdciDevice.h       |  8 +-------
 .../DesignWare/Drivers/UsbDeviceDxe/XdciInterface.h    |  8 +-------
 .../DesignWare/Drivers/UsbDeviceDxe/XdciTable.c        |  8 +-------
 .../DesignWare/Drivers/UsbDeviceDxe/XdciUtility.c      |  8 +-------
 .../DesignWare/Drivers/UsbDeviceDxe/XdciUtility.h      |  8 +-------
 .../Synopsys/DesignWare/Include/Library/UsbDeviceLib.h |  8 +-------
 .../Synopsys/DesignWare/Include/Protocol/EfiUsbFnIo.h  |  8 +-------
 .../Include/Protocol/UsbDeviceModeProtocol.h           |  8 +-------
 22 files changed, 23 insertions(+), 155 deletions(-)

diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/ComponentName.c b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/ComponentName.c
index acb4b6a23d..2380a40aaf 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/ComponentName.c
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/ComponentName.c
@@ -1,13 +1,7 @@
 /** @file
   Copyright (c) 2004 - 2017, Intel Corporation. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php.
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.c b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.c
index 2732cc2e31..32fcbb1824 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.c
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.c
@@ -1,13 +1,7 @@
 /** @file
   Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php.
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.h b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.h
index 36620f9b12..2cdf553d37 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.h
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.h
@@ -1,13 +1,7 @@
 /** @file
   Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php.
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.inf b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.inf
index acf5021327..92baaa9a0a 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.inf
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.inf
@@ -2,13 +2,7 @@
 #
 #  Copyright (c) 2008 - 2017, Intel Corporation. All rights reserved.<BR>
 #
-#  This program and the accompanying materials
-#  are licensed and made available under the terms and conditions of the BSD License
-#  which accompanies this distribution. The full text of the license may be found at
-#  http://opensource.org/licenses/bsd-license.php
-#
-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+#  SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 ##
 
diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceMode.c b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceMode.c
index 48a37a37fb..8e6da670fd 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceMode.c
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceMode.c
@@ -1,13 +1,7 @@
 /** @file
   Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php.
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceMode.h b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceMode.h
index ac9c89b2f1..0e9fa11078 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceMode.h
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceMode.h
@@ -1,13 +1,7 @@
 /** @file
   Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php.
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbFuncIo.c b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbFuncIo.c
index a4138328fd..566e23ec69 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbFuncIo.c
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbFuncIo.c
@@ -1,13 +1,7 @@
 /** @file
   Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php.
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbFuncIo.h b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbFuncIo.h
index ad3d296db9..6bfd17fa69 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbFuncIo.h
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbFuncIo.h
@@ -1,13 +1,7 @@
 /** @file
   Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php.
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbIoNode.c b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbIoNode.c
index 8fc6e10046..062e130df2 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbIoNode.c
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbIoNode.c
@@ -1,13 +1,7 @@
 /** @file
   Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php.
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbIoNode.h b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbIoNode.h
index ecedb2748b..850653f9d6 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbIoNode.h
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbIoNode.h
@@ -1,13 +1,7 @@
 /** @file
   Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php.
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciCommon.h b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciCommon.h
index 6a53068681..4606d1625e 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciCommon.h
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciCommon.h
@@ -1,13 +1,7 @@
 /** @file
   Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php.
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciDWC.c b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciDWC.c
index 3569ba6975..03791b039d 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciDWC.c
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciDWC.c
@@ -1,13 +1,7 @@
 /** @file
   Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php.
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
@@ -515,7 +509,7 @@ DwcXdciCoreInitTrb (
     DEBUG ((DEBUG_INFO, "ERROR: DwcXdciCoreInitTrb: INVALID handle\n"));
     return EFI_INVALID_PARAMETER;
   }
-  
+
    //
    // Init TRB fields
    // NOTE: Assuming we are only using 32-bit addresses
diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciDWC.h b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciDWC.h
index 9c1b2d1d85..bf32ceeec1 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciDWC.h
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciDWC.h
@@ -1,13 +1,7 @@
 /** @file
   Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php.
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciDevice.c b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciDevice.c
index 7c94de0a60..1a5e4d96d7 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciDevice.c
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciDevice.c
@@ -1,13 +1,7 @@
 /** @file
   Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php.
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciDevice.h b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciDevice.h
index a10ec61732..705419481f 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciDevice.h
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciDevice.h
@@ -1,13 +1,7 @@
 /** @file
   Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php.
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciInterface.h b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciInterface.h
index 75ce0ecab3..7cd4c9c5e7 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciInterface.h
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciInterface.h
@@ -1,13 +1,7 @@
 /** @file
   Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php.
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciTable.c b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciTable.c
index 97a97db3db..0d72d783ba 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciTable.c
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciTable.c
@@ -1,13 +1,7 @@
 /** @file
   Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php.
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciUtility.c b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciUtility.c
index 2e02475cd0..20cf49eea7 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciUtility.c
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciUtility.c
@@ -1,13 +1,7 @@
 /** @file
   Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php.
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciUtility.h b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciUtility.h
index e3d004e579..b968757cd2 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciUtility.h
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciUtility.h
@@ -1,13 +1,7 @@
 /** @file
   Copyright (c) 2006 - 2017, Intel Corporation. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php.
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Synopsys/DesignWare/Include/Library/UsbDeviceLib.h b/Silicon/Synopsys/DesignWare/Include/Library/UsbDeviceLib.h
index fe5f3bcd03..18e09ebd52 100644
--- a/Silicon/Synopsys/DesignWare/Include/Library/UsbDeviceLib.h
+++ b/Silicon/Synopsys/DesignWare/Include/Library/UsbDeviceLib.h
@@ -1,13 +1,7 @@
 /** @file
   Copyright (c) 2009 - 2016, Intel Corporation. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php.
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Synopsys/DesignWare/Include/Protocol/EfiUsbFnIo.h b/Silicon/Synopsys/DesignWare/Include/Protocol/EfiUsbFnIo.h
index 97f276f1cc..4399eb547b 100644
--- a/Silicon/Synopsys/DesignWare/Include/Protocol/EfiUsbFnIo.h
+++ b/Silicon/Synopsys/DesignWare/Include/Protocol/EfiUsbFnIo.h
@@ -3,13 +3,7 @@
   This protocol supports Usb Function IO API.
   Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php.
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
diff --git a/Silicon/Synopsys/DesignWare/Include/Protocol/UsbDeviceModeProtocol.h b/Silicon/Synopsys/DesignWare/Include/Protocol/UsbDeviceModeProtocol.h
index c301fa00d3..c75a263852 100644
--- a/Silicon/Synopsys/DesignWare/Include/Protocol/UsbDeviceModeProtocol.h
+++ b/Silicon/Synopsys/DesignWare/Include/Protocol/UsbDeviceModeProtocol.h
@@ -1,13 +1,7 @@
 /** @file
   Copyright (c) 1999 - 2017, Intel Corporation. All rights reserved.<BR>
 
-  This program and the accompanying materials
-  are licensed and made available under the terms and conditions of the BSD License
-  which accompanies this distribution.  The full text of the license may be found at
-  http://opensource.org/licenses/bsd-license.php.
-
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
+  SPDX-License-Identifier: BSD-2-Clause-Patent
 
 **/
 
-- 
2.27.0.windows.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [edk2-platforms PATCH 3/5] Silicon/Synopsys/DesignWare: Remove platform specific init code.
       [not found] <20200717100203.724-1-vinxue@outlook.com>
  2020-07-17 10:02 ` [edk2-platforms PATCH 2/5] Silicon/Synopsys/DesignWare: Replace BSD License with BSD+Patent License Vin Xue
@ 2020-07-17 10:02 ` Vin Xue
  2020-07-17 10:02 ` [edk2-platforms PATCH 4/5] Silicon/Synopsys/DesignWare: Support build against DesignWare.dsc Vin Xue
  2020-07-17 10:02 ` [edk2-platforms PATCH 5/5] Silicon/Synopsys/DesignWare: Basic support for USB SuperSpeedPlus Vin Xue
  3 siblings, 0 replies; 4+ messages in thread
From: Vin Xue @ 2020-07-17 10:02 UTC (permalink / raw)
  To: devel; +Cc: Vin Xue, Ard Biesheuvel, Leif Lindholm

Remove platform specific init code for device mode enable.
The code is different for different silicon vendor.

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Signed-off-by: Vin Xue <vinxue@outlook.com>
---
 .../Drivers/UsbDeviceDxe/UsbDeviceDxe.c       | 18 -----
 .../Drivers/UsbDeviceDxe/UsbDeviceDxe.h       |  8 ++-
 .../Drivers/UsbDeviceDxe/UsbDeviceDxe.inf     |  4 --
 .../Drivers/UsbDeviceDxe/UsbDeviceMode.c      | 23 ------
 .../Drivers/UsbDeviceDxe/UsbFuncIo.c          | 71 +------------------
 .../Drivers/UsbDeviceDxe/UsbFuncIo.h          |  2 -
 .../Drivers/UsbDeviceDxe/UsbIoNode.h          |  1 -
 7 files changed, 6 insertions(+), 121 deletions(-)

diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.c b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.c
index 32fcbb1824..cf5b87f5d7 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.c
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.c
@@ -25,25 +25,7 @@ PlatformSpecificInit (
   VOID
   )
 {
-  UINTN                 XhciPciMmBase;
-  EFI_PHYSICAL_ADDRESS  XhciMemBaseAddress;
 
-  XhciPciMmBase   = MmPciAddress (
-                      0,
-                      0,
-                      PCI_DEVICE_NUMBER_XHCI,
-                      PCI_FUNCTION_NUMBER_XHCI,
-                      0
-                      );
-
-
-  XhciMemBaseAddress = MmioRead32 ((UINTN) (XhciPciMmBase + R_XHCI_MEM_BASE)) & B_XHCI_MEM_BASE_BA;
-  DEBUG ((DEBUG_INFO, "XhciPciMmBase=%x, XhciMemBaseAddress=%x\n", XhciPciMmBase, XhciMemBaseAddress));
-
-  MmioWrite32 ((UINTN)(XhciMemBaseAddress + R_XHCI_MEM_DUAL_ROLE_CFG0), 0x1310800);
-
-  PmicUSBSwitchControl (TRUE);//conduction USB switch.
-  return;
 }
 
 
diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.h b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.h
index 2cdf553d37..ea2f2bdc7f 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.h
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.h
@@ -9,15 +9,15 @@
 #define __USB_DEVICE_DXE_H__
 
 #include <Uefi.h>
+#include <Library/UefiLib.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/DevicePathLib.h>
-#include <Library/DriverLib.h>
 #include <Library/PcdLib.h>
 #include <Library/IoLib.h>
+#include <Protocol/PciIo.h>
 #include <Protocol/EfiUsbFnIo.h>
 #include <Protocol/UsbDeviceModeProtocol.h>
-#include <PlatformBaseAddresses.h>
-#include <ScAccess.h>
+#include <IndustryStandard/Pci.h>
 #include "UsbFuncIo.h"
 #include "UsbDeviceMode.h"
 
@@ -28,6 +28,8 @@
 #define USBFUIO_CONTEXT_FROM_PROTOCOL(a)   CR (a, USB_XDCI_DEV_CONTEXT, UsbFunIoProtocol, EFI_USB_DEV_SIGNATURE)
 #define USBUSBD_CONTEXT_FROM_PROTOCOL(a)   CR (a, USB_XDCI_DEV_CONTEXT, UsbDevModeProtocol, EFI_USB_DEV_SIGNATURE)
 
+#define R_OTG_BAR0                         0x10        // BAR 0
+#define B_OTG_BAR0_BA                      0xFFE00000  // Base Address
 
 typedef struct _USB_FUIO_EVENT_NODE   USB_FUIO_EVENT_NODE;
 
diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.inf b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.inf
index 92baaa9a0a..a5fbe2336a 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.inf
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.inf
@@ -33,20 +33,16 @@
 
 [Packages]
   MdePkg/MdePkg.dec
-  BroxtonSiPkg/BroxtonSiPkg.dec
-  BroxtonPlatformPkg/PlatformPkg.dec
 
 [LibraryClasses]
   BaseMemoryLib
   DebugLib
   DevicePathLib
   MemoryAllocationLib
-  TimerLib
   PcdLib
   UefiBootServicesTableLib
   UefiDriverEntryPoint
   UefiLib
-  PmicLib
 
 [Protocols]
   gEfiUsbDeviceModeProtocolGuid
diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceMode.c b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceMode.c
index 8e6da670fd..1a0248fa6a 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceMode.c
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceMode.c
@@ -9,8 +9,6 @@
 #include <Library/BaseLib.h>
 #include <Library/UefiBootServicesTableLib.h>
 #include <Library/IoLib.h>
-#include <PlatformBaseAddresses.h>
-#include <ScAccess.h>
 #include "XdciUtility.h"
 #include "UsbDeviceMode.h"
 #include "UsbDeviceDxe.h"
@@ -50,28 +48,7 @@ BOOLEAN mXdciRun = FALSE;
 STATIC VOID
 XhciSwitchSwid(BOOLEAN enable)
 {
-  UINTN                             XhciPciMmBase;
-  EFI_PHYSICAL_ADDRESS              XhciMemBaseAddress;
-  UINT32                            DualRoleCfg0;
-  UINT32                            DualRoleCfg1;
-
-  XhciPciMmBase = MmPciAddress (0, 0, PCI_DEVICE_NUMBER_XHCI, PCI_FUNCTION_NUMBER_XHCI, 0);
-  XhciMemBaseAddress = MmioRead32 ((UINTN) (XhciPciMmBase + R_XHCI_MEM_BASE)) & B_XHCI_MEM_BASE_BA;
-  DEBUG ((DEBUG_INFO, "XhciPciMmBase=%x, XhciMemBaseAddress=%x\n", XhciPciMmBase, XhciMemBaseAddress));
-
-  DualRoleCfg0 = MmioRead32 ((UINTN)(XhciMemBaseAddress + R_XHCI_MEM_DUAL_ROLE_CFG0));
-  if (enable) {
-    DualRoleCfg0 = DualRoleCfg0 | (1 << 24) | (1 << 21) | (1 << 20);
-    DEBUG ((DEBUG_INFO, "DualRoleCfg0 : Set SW ID : 0x%x \n", DualRoleCfg0));
-  }
-  else {
-    DualRoleCfg0 = DualRoleCfg0 & ~(1 << 24) & ~(1 << 21) & ~(1 << 20);
-    DEBUG ((DEBUG_INFO, "DualRoleCfg0 : Clear SW ID : 0x%x \n", DualRoleCfg0));
-  }
-  MmioWrite32 ((UINTN)(XhciMemBaseAddress + R_XHCI_MEM_DUAL_ROLE_CFG0), DualRoleCfg0);
 
-  DualRoleCfg1 = MmioRead32 ((UINTN)(XhciMemBaseAddress + R_XHCI_MEM_DUAL_ROLE_CFG1));
-  DEBUG ((DEBUG_INFO, "DualRoleCfg1 : 0x%x \n", DualRoleCfg1));
 }
 
 VOID
diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbFuncIo.c b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbFuncIo.c
index 566e23ec69..d4eea39e6d 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbFuncIo.c
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbFuncIo.c
@@ -107,76 +107,7 @@ DetectPort (
   OUT EFI_USBFN_PORT_TYPE    *PortType
   )
 {
-  USB_XDCI_DEV_CONTEXT  *UsbFuncIoDevPtr;
-  EFI_STATUS            Status;
-  UINT8                 Value8;
-
-  DEBUG ((USB_FUIO_DEBUG_INFO, "DetectPort - Entry\n"));
-
-  UsbFuncIoDevPtr = USBFUIO_CONTEXT_FROM_PROTOCOL (This);
-
-  //
-  // USBSRCDETRSLT Bit[5:2]
-  // Result of USB HW Source Detection algorithm
-  // Power-Domain: VRTC
-  // Result of USB HW Source Detection algorithm :
-  // 0000 = Not determined
-  // 0001 = SDP Attached
-  // 0010 = DCP Attached
-  // 0011 = CDP Attached
-  // 0100 = ACA Attached
-  // 0101 = SE1 Attached
-  // 0110 = MHL Attached
-  // 0111 = Floating D+/D- Attached
-  // 1000 = Other Attached
-  // 1001 = DCP detected by ext. USB PHY
-  // 1010-1111 = Rsvd
-  // Reset: 0000B
-  //
-
-  Value8 =PmicRead8 (0x5E, 0X29);
-  if ((Value8 & 0x03) != 0x02) {
-    *PortType = EfiUsbUnknownPort;
-    Status = EFI_NOT_READY;
-    goto out;
-  }
-
-  Value8 = Value8 >> 2 & 0x0f;
-  Status = EFI_SUCCESS;
-  switch (Value8) {
-    case 1:
-      *PortType = EfiUsbStandardDownstreamPort;
-      break;
-    case 2:
-      *PortType = EfiUsbDedicatedChargingPort;
-      break;
-    case 3:
-      *PortType = EfiUsbChargingDownstreamPort;
-      break;
-
-    case 4:
-    case 5:
-    case 6:
-    case 7:
-    case 8:
-    case 9:
-      *PortType = EfiUsbUnknownPort;
-      break;
-    case 0:
-    case 10:
-    case 11:
-    case 12:
-    case 13:
-    case 14:
-    case 15:
-      *PortType = EfiUsbUnknownPort;
-      Status = EFI_NOT_READY;
-     break;
-  }
-
-out:
-  DEBUG ((USB_FUIO_DEBUG_INFO, "DetectPort - Exit\n"));
-  return EFI_SUCCESS;
+  return EFI_UNSUPPORTED;
 }
 
 
diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbFuncIo.h b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbFuncIo.h
index 6bfd17fa69..3a95b931c2 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbFuncIo.h
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbFuncIo.h
@@ -11,10 +11,8 @@
 #include <Uefi.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/DevicePathLib.h>
-#include <Library/DriverLib.h>
 #include <Library/PcdLib.h>
 #include <Protocol/EfiUsbFnIo.h>
-#include <Library/PmicLib.h>
 #include <Library/UsbDeviceLib.h>
 #include <Library/PrintLib.h>
 #include "UsbIoNode.h"
diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbIoNode.h b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbIoNode.h
index 850653f9d6..0b416ec7a7 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbIoNode.h
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbIoNode.h
@@ -11,7 +11,6 @@
 #include <Uefi.h>
 #include <Library/BaseMemoryLib.h>
 #include <Library/DevicePathLib.h>
-#include <Library/DriverLib.h>
 
 #define  USB_DEBUG_MEM_NODE_INFO  EFI_D_INIT
 #define  USB_DEBUG_MEM_NODE_ERROR EFI_D_ERROR
-- 
2.27.0.windows.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [edk2-platforms PATCH 4/5] Silicon/Synopsys/DesignWare: Support build against DesignWare.dsc
       [not found] <20200717100203.724-1-vinxue@outlook.com>
  2020-07-17 10:02 ` [edk2-platforms PATCH 2/5] Silicon/Synopsys/DesignWare: Replace BSD License with BSD+Patent License Vin Xue
  2020-07-17 10:02 ` [edk2-platforms PATCH 3/5] Silicon/Synopsys/DesignWare: Remove platform specific init code Vin Xue
@ 2020-07-17 10:02 ` Vin Xue
  2020-07-17 10:02 ` [edk2-platforms PATCH 5/5] Silicon/Synopsys/DesignWare: Basic support for USB SuperSpeedPlus Vin Xue
  3 siblings, 0 replies; 4+ messages in thread
From: Vin Xue @ 2020-07-17 10:02 UTC (permalink / raw)
  To: devel; +Cc: Vin Xue, Ard Biesheuvel, Leif Lindholm

Support GCC IA32/X64 build.

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Signed-off-by: Vin Xue <vinxue@outlook.com>
---
 Silicon/Synopsys/DesignWare/DesignWare.dec      |  9 ++++++++-
 Silicon/Synopsys/DesignWare/DesignWare.dsc      | 17 +++++++++++------
 .../Drivers/UsbDeviceDxe/UsbDeviceDxe.inf       |  1 +
 .../DesignWare/Drivers/UsbDeviceDxe/UsbFuncIo.c |  3 +--
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/Silicon/Synopsys/DesignWare/DesignWare.dec b/Silicon/Synopsys/DesignWare/DesignWare.dec
index f7ec792754..6063f64664 100755
--- a/Silicon/Synopsys/DesignWare/DesignWare.dec
+++ b/Silicon/Synopsys/DesignWare/DesignWare.dec
@@ -7,6 +7,9 @@
   PACKAGE_GUID                   = 3b5936d8-c72d-412d-b4d9-3bf0dea73598
   PACKAGE_VERSION                = 0.1
 
+[Includes]
+  Include
+
 ################################################################################
 #
 # Include Section - list of Include Paths that are provided by this package.
@@ -18,9 +21,13 @@
 ################################################################################
 
 [Guids.common]
-  gDesignWareTokenSpaceGuid = { 0x89cb1241, 0xd283, 0x4543, { 0x88, 0x9c, 0x6b, 0x62, 0x36, 0x1a, 0x95, 0x7a } }
+  gDesignWareTokenSpaceGuid           = { 0x89cb1241, 0xd283, 0x4543, { 0x88, 0x9c, 0x6b, 0x62, 0x36, 0x1a, 0x95, 0x7a } }
   gDwEmacNetNonDiscoverableDeviceGuid = { 0x401950CD, 0xF9CD, 0x4A65, { 0xAD, 0x8E, 0x84, 0x9F, 0x3B, 0xAF, 0x23, 0x04 } }
 
+[Protocols]
+  gEfiUsbFnIoProtocolGuid             = { 0x32d2963a, 0xfe5d, 0x4f30, { 0xb6, 0x33, 0x6e, 0x5d, 0xc5, 0x58, 0x03, 0xcc } }
+  gEfiUsbDeviceModeProtocolGuid       = { 0xC9923F7E, 0x1746, 0x4802, { 0x86, 0x2e, 0x01, 0x1c, 0x2c, 0x2d, 0x9d, 0x86 } }
+
 [PcdsFixedAtBuild.common]
   #
   # Permit the use of obsolete drivers in this package
diff --git a/Silicon/Synopsys/DesignWare/DesignWare.dsc b/Silicon/Synopsys/DesignWare/DesignWare.dsc
index 098bba3f7d..37f13a1562 100755
--- a/Silicon/Synopsys/DesignWare/DesignWare.dsc
+++ b/Silicon/Synopsys/DesignWare/DesignWare.dsc
@@ -11,13 +11,11 @@
   PLATFORM_GUID                  = 09b27b59-7195-4220-b81c-c1871c74d006
   PLATFORM_VERSION               = 0.1
   OUTPUT_DIRECTORY               = Build/Synopsys
-  SUPPORTED_ARCHITECTURES        = AARCH64|ARM
+  SUPPORTED_ARCHITECTURES        = IA32|X64|ARM|AARCH64
   BUILD_TARGETS                  = DEBUG|RELEASE|NOOPT
   SKUID_IDENTIFIER               = DEFAULT
 
 [LibraryClasses]
-  ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.inf
-  ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
   BaseLib|MdePkg/Library/BaseLib/BaseLib.inf
   BaseMemoryLib|MdePkg/Library/BaseMemoryLib/BaseMemoryLib.inf
   CacheMaintenanceLib|MdePkg/Library/BaseCacheMaintenanceLib/BaseCacheMaintenanceLib.inf
@@ -28,16 +26,23 @@
   IoLib|MdePkg/Library/BaseIoLibIntrinsic/BaseIoLibIntrinsic.inf
   MemoryAllocationLib|MdePkg/Library/UefiMemoryAllocationLib/UefiMemoryAllocationLib.inf
   NetLib|NetworkPkg/Library/DxeNetLib/DxeNetLib.inf
-  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
   NULL|MdePkg/Library/BaseStackCheckLib/BaseStackCheckLib.inf
   PcdLib|MdePkg/Library/BasePcdLibNull/BasePcdLibNull.inf
   PrintLib|MdePkg/Library/BasePrintLib/BasePrintLib.inf
-  TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf
   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf
   UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf
   UefiLib|MdePkg/Library/UefiLib/UefiLib.inf
   UefiRuntimeServicesTableLib|MdePkg/Library/UefiRuntimeServicesTableLib/UefiRuntimeServicesTableLib.inf
 
-[Components]
+[LibraryClasses.ARM, LibraryClasses.AARCH64]
+  ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.inf
+  ArmLib|ArmPkg/Library/ArmLib/ArmBaseLib.inf
+  NULL|ArmPkg/Library/CompilerIntrinsicsLib/CompilerIntrinsicsLib.inf
+  TimerLib|ArmPkg/Library/ArmArchTimerLib/ArmArchTimerLib.inf
+
+[Components.ARM, Components.AARCH64]
   Silicon/Synopsys/DesignWare/Drivers/DwEmacSnpDxe/DwEmacSnpDxe.inf
   Silicon/Synopsys/DesignWare/Drivers/DwEmmcDxe/DwEmmcDxe.inf
+
+[Components.IA32, Components.X64]
+  Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.inf
diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.inf b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.inf
index a5fbe2336a..fc064b85c1 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.inf
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbDeviceDxe.inf
@@ -33,6 +33,7 @@
 
 [Packages]
   MdePkg/MdePkg.dec
+  Silicon/Synopsys/DesignWare/DesignWare.dec
 
 [LibraryClasses]
   BaseMemoryLib
diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbFuncIo.c b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbFuncIo.c
index d4eea39e6d..be325665f3 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbFuncIo.c
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/UsbFuncIo.c
@@ -24,7 +24,7 @@ static CHAR16 mUsbFnDxeSerialNumber[] = L"INT123456";
 // replaced with device-specific unique values.
 //
 static GUID mSmBiosUniqueGuid = {
-        0x5e24fe9c, 0xc8d0, 0x45bd, 0xa7, 0x9f, 0x54, 0xea, 0x5f, 0xbd, 0x3d, 0x97
+        0x5e24fe9c, 0xc8d0, 0x45bd, { 0xa7, 0x9f, 0x54, 0xea, 0x5f, 0xbd, 0x3d, 0x97}
     };
 
 EFI_USBFN_IO_PROTOCOL         mUsbFunIoProtocol = {
@@ -413,7 +413,6 @@ GetMaxTransferSize (
   @retval EFI_BUFFER_TOO_SMALL  A parameter is invalid.
 
 **/
-STATIC
 EFI_STATUS
 EFIAPI
 GetDeviceSerialNumber (
-- 
2.27.0.windows.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread
* [edk2-platforms PATCH 5/5] Silicon/Synopsys/DesignWare: Basic support for USB SuperSpeedPlus
       [not found] <20200717100203.724-1-vinxue@outlook.com>
                   ` (2 preceding siblings ...)
  2020-07-17 10:02 ` [edk2-platforms PATCH 4/5] Silicon/Synopsys/DesignWare: Support build against DesignWare.dsc Vin Xue
@ 2020-07-17 10:02 ` Vin Xue
  3 siblings, 0 replies; 4+ messages in thread
From: Vin Xue @ 2020-07-17 10:02 UTC (permalink / raw)
  To: devel; +Cc: Vin Xue, Ard Biesheuvel, Leif Lindholm

Add basic support for USB 3.1 SuperSpeedPlus.

Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Signed-off-by: Vin Xue <vinxue@outlook.com>
---
 Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciCommon.h | 3 ++-
 Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciDWC.c    | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciCommon.h b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciCommon.h
index 4606d1625e..4f694aaeab 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciCommon.h
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciCommon.h
@@ -25,7 +25,8 @@ typedef enum {
   USB_SPEED_HIGH  = 0,
   USB_SPEED_FULL,
   USB_SPEED_LOW,
-  USB_SPEED_SUPER = 4
+  USB_SPEED_SUPER = 4,
+  USB_SPEED_SUPER_PLUS
 } USB_SPEED;
 
 typedef enum {
diff --git a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciDWC.c b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciDWC.c
index 03791b039d..5f7c36b701 100644
--- a/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciDWC.c
+++ b/Silicon/Synopsys/DesignWare/Drivers/UsbDeviceDxe/XdciDWC.c
@@ -93,6 +93,7 @@ DwcXdciCoreGetCtrlMps (
       *mps = DWC_XDCI_LS_CTRL_EP_MPS;
       break;
     case USB_SPEED_SUPER:
+    case USB_SPEED_SUPER_PLUS:
       *mps = DWC_XDCI_SS_CTRL_EP_MPS;
       break;
     default:
@@ -851,7 +852,7 @@ DwcXdciProcessDeviceResetDone (
   //
   // Put the other PHY into suspend
   //
-  if (CoreHandle->ActualSpeed == USB_SPEED_SUPER) {
+  if (CoreHandle->ActualSpeed >= USB_SPEED_SUPER) {
     //
     // Put HS PHY to suspend
     //
-- 
2.27.0.windows.1


^ permalink raw reply related	[flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-07-17 10:03 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <20200717100203.724-1-vinxue@outlook.com>
2020-07-17 10:02 ` [edk2-platforms PATCH 2/5] Silicon/Synopsys/DesignWare: Replace BSD License with BSD+Patent License Vin Xue
2020-07-17 10:02 ` [edk2-platforms PATCH 3/5] Silicon/Synopsys/DesignWare: Remove platform specific init code Vin Xue
2020-07-17 10:02 ` [edk2-platforms PATCH 4/5] Silicon/Synopsys/DesignWare: Support build against DesignWare.dsc Vin Xue
2020-07-17 10:02 ` [edk2-platforms PATCH 5/5] Silicon/Synopsys/DesignWare: Basic support for USB SuperSpeedPlus Vin Xue

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox