* [PATCH] r8152: Add support for MAC address pass through on RTL8153-BND
@ 2018-12-11 14:16 Mario Limonciello
2018-12-14 13:04 ` Perry Yuan
2018-12-14 22:38 ` [PATCH] " David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Mario Limonciello @ 2018-12-11 14:16 UTC (permalink / raw)
To: David Miller; +Cc: LKML, Netdev, Linux USB, anthony.wong, Mario Limonciello
All previous docks and dongles that have supported this feature use
the RTL8153-AD chip.
RTL8153-BND is a new chip that will be used in upcoming Dell type-C docks.
It should be added to the whitelist of devices to activate MAC address
pass through.
Per confirming with Realtek all devices containing RTL8153-BND should
activate MAC pass through and there won't use pass through bit on efuse
like in RTL8153-AD.
Signed-off-by: Mario Limonciello <mario.limonciello@dell.com>
---
drivers/net/usb/r8152.c | 33 ++++++++++++++++++++++-----------
1 file changed, 22 insertions(+), 11 deletions(-)
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index f1b5201..60dd1ec 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -129,6 +129,7 @@
#define USB_UPS_CTRL 0xd800
#define USB_POWER_CUT 0xd80a
#define USB_MISC_0 0xd81a
+#define USB_MISC_1 0xd81f
#define USB_AFE_CTRL2 0xd824
#define USB_UPS_CFG 0xd842
#define USB_UPS_FLAGS 0xd848
@@ -555,6 +556,7 @@ enum spd_duplex {
/* MAC PASSTHRU */
#define AD_MASK 0xfee0
+#define BND_MASK 0x0004
#define EFUSE 0xcfdb
#define PASS_THRU_MASK 0x1
@@ -1150,7 +1152,7 @@ static int rtl8152_set_mac_address(struct net_device *netdev, void *p)
return ret;
}
-/* Devices containing RTL8153-AD can support a persistent
+/* Devices containing proper chips can support a persistent
* host system provided MAC address.
* Examples of this are Dell TB15 and Dell WD15 docks
*/
@@ -1165,13 +1167,23 @@ static int vendor_mac_passthru_addr_read(struct r8152 *tp, struct sockaddr *sa)
/* test for -AD variant of RTL8153 */
ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_MISC_0);
- if ((ocp_data & AD_MASK) != 0x1000)
- return -ENODEV;
-
- /* test for MAC address pass-through bit */
- ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, EFUSE);
- if ((ocp_data & PASS_THRU_MASK) != 1)
- return -ENODEV;
+ if ((ocp_data & AD_MASK) == 0x1000) {
+ /* test for MAC address pass-through bit */
+ ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, EFUSE);
+ if ((ocp_data & PASS_THRU_MASK) != 1) {
+ netif_dbg(tp, probe, tp->netdev,
+ "No efuse for RTL8153-AD MAC pass through\n");
+ return -ENODEV;
+ }
+ } else {
+ /* test for RTL8153-BND */
+ ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_MISC_1);
+ if ((ocp_data & BND_MASK) == 0) {
+ netif_dbg(tp, probe, tp->netdev,
+ "Invalid variant for MAC pass through\n");
+ return -ENODEV;
+ }
+ }
/* returns _AUXMAC_#AABBCCDDEEFF# */
status = acpi_evaluate_object(NULL, "\\_SB.AMAC", NULL, &buffer);
@@ -1217,9 +1229,8 @@ static int set_ethernet_addr(struct r8152 *tp)
if (tp->version == RTL_VER_01) {
ret = pla_ocp_read(tp, PLA_IDR, 8, sa.sa_data);
} else {
- /* if this is not an RTL8153-AD, no eFuse mac pass thru set,
- * or system doesn't provide valid _SB.AMAC this will be
- * be expected to non-zero
+ /* if device doesn't support MAC pass through this will
+ * be expected to be non-zero
*/
ret = vendor_mac_passthru_addr_read(tp, &sa);
if (ret < 0)
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: r8152: Add support for MAC address pass through on RTL8153-BND
2018-12-11 14:16 [PATCH] r8152: Add support for MAC address pass through on RTL8153-BND Mario Limonciello
@ 2018-12-14 13:04 ` Perry Yuan
2018-12-14 22:38 ` [PATCH] " David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Perry Yuan @ 2018-12-14 13:04 UTC (permalink / raw)
To: Mario Limonciello, David Miller; +Cc: LKML, Netdev, Linux USB, anthony.wong
On 12/11/18 10:16 PM, Mario Limonciello wrote:
> All previous docks and dongles that have supported this feature use
> the RTL8153-AD chip.
>
> RTL8153-BND is a new chip that will be used in upcoming Dell type-C docks.
> It should be added to the whitelist of devices to activate MAC address
> pass through.
>
> Per confirming with Realtek all devices containing RTL8153-BND should
> activate MAC pass through and there won't use pass through bit on efuse
> like in RTL8153-AD.
>
> Signed-off-by: Mario Limonciello <mario.limonciello@dell.com>
> ---
> drivers/net/usb/r8152.c | 33 ++++++++++++++++++++++-----------
> 1 file changed, 22 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
> index f1b5201..60dd1ec 100644
> --- a/drivers/net/usb/r8152.c
> +++ b/drivers/net/usb/r8152.c
> @@ -129,6 +129,7 @@
> #define USB_UPS_CTRL 0xd800
> #define USB_POWER_CUT 0xd80a
> #define USB_MISC_0 0xd81a
> +#define USB_MISC_1 0xd81f
> #define USB_AFE_CTRL2 0xd824
> #define USB_UPS_CFG 0xd842
> #define USB_UPS_FLAGS 0xd848
> @@ -555,6 +556,7 @@ enum spd_duplex {
>
> /* MAC PASSTHRU */
> #define AD_MASK 0xfee0
> +#define BND_MASK 0x0004
> #define EFUSE 0xcfdb
> #define PASS_THRU_MASK 0x1
>
> @@ -1150,7 +1152,7 @@ static int rtl8152_set_mac_address(struct net_device *netdev, void *p)
> return ret;
> }
>
> -/* Devices containing RTL8153-AD can support a persistent
> +/* Devices containing proper chips can support a persistent
> * host system provided MAC address.
> * Examples of this are Dell TB15 and Dell WD15 docks
> */
> @@ -1165,13 +1167,23 @@ static int vendor_mac_passthru_addr_read(struct r8152 *tp, struct sockaddr *sa)
>
> /* test for -AD variant of RTL8153 */
> ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_MISC_0);
> - if ((ocp_data & AD_MASK) != 0x1000)
> - return -ENODEV;
> -
> - /* test for MAC address pass-through bit */
> - ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, EFUSE);
> - if ((ocp_data & PASS_THRU_MASK) != 1)
> - return -ENODEV;
> + if ((ocp_data & AD_MASK) == 0x1000) {
> + /* test for MAC address pass-through bit */
> + ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, EFUSE);
> + if ((ocp_data & PASS_THRU_MASK) != 1) {
> + netif_dbg(tp, probe, tp->netdev,
> + "No efuse for RTL8153-AD MAC pass through\n");
> + return -ENODEV;
> + }
> + } else {
> + /* test for RTL8153-BND */
> + ocp_data = ocp_read_byte(tp, MCU_TYPE_USB, USB_MISC_1);
> + if ((ocp_data & BND_MASK) == 0) {
> + netif_dbg(tp, probe, tp->netdev,
> + "Invalid variant for MAC pass through\n");
> + return -ENODEV;
> + }
> + }
>
> /* returns _AUXMAC_#AABBCCDDEEFF# */
> status = acpi_evaluate_object(NULL, "\\_SB.AMAC", NULL, &buffer);
> @@ -1217,9 +1229,8 @@ static int set_ethernet_addr(struct r8152 *tp)
> if (tp->version == RTL_VER_01) {
> ret = pla_ocp_read(tp, PLA_IDR, 8, sa.sa_data);
> } else {
> - /* if this is not an RTL8153-AD, no eFuse mac pass thru set,
> - * or system doesn't provide valid _SB.AMAC this will be
> - * be expected to non-zero
> + /* if device doesn't support MAC pass through this will
> + * be expected to be non-zero
> */
> ret = vendor_mac_passthru_addr_read(tp, &sa);
> if (ret < 0)
Tested-by : Perry Yuan <pyuan@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] r8152: Add support for MAC address pass through on RTL8153-BND
2018-12-11 14:16 [PATCH] r8152: Add support for MAC address pass through on RTL8153-BND Mario Limonciello
2018-12-14 13:04 ` Perry Yuan
@ 2018-12-14 22:38 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2018-12-14 22:38 UTC (permalink / raw)
To: mario.limonciello; +Cc: linux-kernel, netdev, linux-usb, anthony.wong
From: Mario Limonciello <mario.limonciello@dell.com>
Date: Tue, 11 Dec 2018 08:16:14 -0600
> All previous docks and dongles that have supported this feature use
> the RTL8153-AD chip.
>
> RTL8153-BND is a new chip that will be used in upcoming Dell type-C docks.
> It should be added to the whitelist of devices to activate MAC address
> pass through.
>
> Per confirming with Realtek all devices containing RTL8153-BND should
> activate MAC pass through and there won't use pass through bit on efuse
> like in RTL8153-AD.
>
> Signed-off-by: Mario Limonciello <mario.limonciello@dell.com>
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-12-14 22:38 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-11 14:16 [PATCH] r8152: Add support for MAC address pass through on RTL8153-BND Mario Limonciello
2018-12-14 13:04 ` Perry Yuan
2018-12-14 22:38 ` [PATCH] " David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).