From 769994cbf6cf1f136e00f8371c704a38c2e27e63 Mon Sep 17 00:00:00 2001
From: Alan Huang <alan-huang@quanta.corp-partner.google.com>
Date: Wed, 10 Nov 2021 10:59:13 +0800
Subject: [PATCH] drivers/net/r8168: Add support for Realtek RT8125

The Realtek RT8168 and RT8125 have a similar programming interface,
therefore add the PCI device ID for the RT8125 into driver for support.

BUG=b:193750191
TEST=emerge-brask coreboot chromeos-bootimage. Test on brask whose NIC
     is RT8125. Check if the default MAC is written into the NIC.

Signed-off-by: Alan Huang <alan-huang@quanta.corp-partner.google.com>
Change-Id: Iaa4c41f94fd6e5fd6393abbb30bfc22a149f5d71
Reviewed-on: https://review.coreboot.org/c/coreboot/+/59086
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Zhuohao Lee <zhuohao@google.com>
Reviewed-by: Tim Wawrzynczak <twawrzynczak@chromium.org>
---
 src/drivers/net/r8168.c      | 11 +++++++++--
 src/include/device/pci_ids.h |  2 ++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/drivers/net/r8168.c b/src/drivers/net/r8168.c
index 18e2aff7c5..5606859489 100644
--- a/src/drivers/net/r8168.c
+++ b/src/drivers/net/r8168.c
@@ -17,6 +17,7 @@
 #include <device/pci.h>
 #include <device/pci_ops.h>
 #include <device/pci_def.h>
+#include <device/pci_ids.h>
 #include <delay.h>
 #include <fmap.h>
 #include <types.h>
@@ -360,10 +361,16 @@ static struct device_operations r8168_ops  = {
 #endif
 };
 
+static const unsigned short pci_device_ids[] = {
+	PCI_DEVICE_ID_REALTEK_8168,
+	PCI_DEVICE_ID_REALTEK_8125,
+	0
+};
+
 static const struct pci_driver r8168_driver __pci_driver = {
 	.ops    = &r8168_ops,
-	.vendor = 0x10ec,
-	.device = 0x8168,
+	.vendor = PCI_VENDOR_ID_REALTEK,
+	.devices = pci_device_ids,
 };
 
 struct chip_operations drivers_net_ops = {
diff --git a/src/include/device/pci_ids.h b/src/include/device/pci_ids.h
index db51905598..b6cb7d8f32 100644
--- a/src/include/device/pci_ids.h
+++ b/src/include/device/pci_ids.h
@@ -1281,8 +1281,10 @@
 #define PCI_VENDOR_ID_REALTEK		0x10ec
 #define PCI_DEVICE_ID_REALTEK_5261	0x5261
 #define PCI_DEVICE_ID_REALTEK_8029	0x8029
+#define PCI_DEVICE_ID_REALTEK_8125      0x8125
 #define PCI_DEVICE_ID_REALTEK_8129	0x8129
 #define PCI_DEVICE_ID_REALTEK_8139	0x8139
+#define PCI_DEVICE_ID_REALTEK_8168      0x8168
 
 #define PCI_VENDOR_ID_TYAN              0x10f1
 #define PCI_VENDOR_ID_XILINX		0x10ee