svn commit: r358201 - stable/12/sys/dev/ntb/ntb_hw

[Alexander Motin]

Author: mav
Date: Fri Feb 21 04:29:50 2020
New Revision: 358201
URL: https://svnweb.freebsd.org/changeset/base/358201

Log:
  MFC r357920: Add support for Hygon NTB PCI device in ntb_hw_amd driver.

Modified:
  stable/12/sys/dev/ntb/ntb_hw/ntb_hw_amd.c
  stable/12/sys/dev/ntb/ntb_hw/ntb_hw_amd.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/dev/ntb/ntb_hw/ntb_hw_amd.c
==============================================================================
--- stable/12/sys/dev/ntb/ntb_hw/ntb_hw_amd.c	Fri Feb 21 04:29:07 2020	(r358200)
+++ stable/12/sys/dev/ntb/ntb_hw/ntb_hw_amd.c	Fri Feb 21 04:29:50 2020	(r358201)
@@ -101,6 +101,16 @@ static const struct amd_ntb_hw_info amd_ntb_hw_info_li
 	  .msix_vector_count = 24,
 	  .quirks = 0,
 	  .desc = "AMD Non-Transparent Bridge"},
+
+	{ .vendor_id = NTB_HW_HYGON_VENDOR_ID,
+	  .device_id = NTB_HW_HYGON_DEVICE_ID1,
+	  .mw_count = 3,
+	  .bar_start_idx = 1,
+	  .spad_count = 16,
+	  .db_count = 16,
+	  .msix_vector_count = 24,
+	  .quirks = QUIRK_MW0_32BIT,
+	  .desc = "Hygon Non-Transparent Bridge"},
 };
 
 static const struct pci_device_table amd_ntb_devs[] = {
@@ -109,7 +119,10 @@ static const struct pci_device_table amd_ntb_devs[] = 
 	  PCI_DESCR("AMD Non-Transparent Bridge") },
 	{ PCI_DEV(NTB_HW_AMD_VENDOR_ID, NTB_HW_AMD_DEVICE_ID2),
 	  .driver_data = (uintptr_t)&amd_ntb_hw_info_list[1],
-	  PCI_DESCR("AMD Non-Transparent Bridge") }
+	  PCI_DESCR("AMD Non-Transparent Bridge") },
+	{ PCI_DEV(NTB_HW_HYGON_VENDOR_ID, NTB_HW_HYGON_DEVICE_ID1),
+	  .driver_data = (uintptr_t)&amd_ntb_hw_info_list[0],
+	  PCI_DESCR("Hygon Non-Transparent Bridge") }
 };
 
 static unsigned g_amd_ntb_hw_debug_level;

Modified: stable/12/sys/dev/ntb/ntb_hw/ntb_hw_amd.h
==============================================================================
--- stable/12/sys/dev/ntb/ntb_hw/ntb_hw_amd.h	Fri Feb 21 04:29:07 2020	(r358200)
+++ stable/12/sys/dev/ntb/ntb_hw/ntb_hw_amd.h	Fri Feb 21 04:29:50 2020	(r358201)
@@ -51,6 +51,9 @@
 #define	NTB_HW_AMD_DEVICE_ID1	0x145B
 #define	NTB_HW_AMD_DEVICE_ID2	0x148B
 
+#define	NTB_HW_HYGON_VENDOR_ID	0x19D4
+#define	NTB_HW_HYGON_DEVICE_ID1	0x145B
+
 #define	NTB_DEF_PEER_CNT	1
 #define	NTB_DEF_PEER_IDX	0