platform/x86: asus-nb-wmi: Revert "Do not load on Asus T100TA and T200TA"
Subsystems (5)
Sasha Levin
maintainerPATCH 1/6 platform/x86: asus-nb-wmi: Revert "Do not load on Asus T100TA and T200TA"
From: Hans de Goede <[email protected]>
[ Upstream commit aab9e7896ec98b2a6b4eeeed71cc666776bb8def ]
The WMI INIT method on for some reason turns on the camera LED on these 2-in-1s, without the WMI interface allowing further control over the LED.
To fix this commit b5f7311d3a2e ("platform/x86: asus-nb-wmi: Do not load on Asus T100TA and T200TA") added a blacklist with these 2 models on it since the WMI driver did not add any extra functionality to these models.
Recently I've been working on making more 2-in-1 models report their tablet-mode (SW_TABLET_MODE) to userspace; and I've found that these 2 Asus models report this through WMI. This commit reverts the adding of the blacklist, so that the Asus WMI driver can be used on these models to report their tablet-mode.
Note, not calling INIT is also not an option, because then we will not receive events when the tablet-mode changes. So the LED issue will need to be fixed somewhere else entirely.
--- drivers/platform/x86/asus-nb-wmi.c | 24 ------------------------ 1 file changed, 24 deletions(-)
drivers/platform/x86/asus-nb-wmi.c +0 -24
@@ -561,33 +561,9 @@ static struct asus_wmi_driver asus_nb_wmi_driver = { .detect_quirks = asus_nb_wmi_quirks, }; -static const struct dmi_system_id asus_nb_wmi_blacklist[]__initconst = { - { -/* -* asus-nb-wm adds no functionality. The T100TA has a detachable -* USB kbd, so no hotkeys and it has no WMI rfkill; and loading -* asus-nb-wm causes the camera LED to turn and _stay_ on. -*/ - .matches = { -DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ), -DMI_EXACT_MATCH (DMI_PRODUCT_NAME ,"T100TA" ), - }, - }, - { -/* The Asus T200TA has the same issue as the T100TA */ - .matches = { -DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"ASUSTeK COMPUTER INC." ), -DMI_EXACT_MATCH (DMI_PRODUCT_NAME ,"T200TA" ), - }, - }, - {}/* Terminating entry */ -};static int __init asus_nb_wmi_init (void ) { -if (dmi_check_system (asus_nb_wmi_blacklist)) -return -ENODEV ; -return asus_wmi_register_driver (&asus_nb_wmi_driver); }
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 2/6 net/fsl: quieten expected MDIO access failures
From: Jamie Iles <[email protected]>
[ Upstream commit 1ec8e74855588cecb2620b28b877c08f45765374 ]
MDIO reads can happen during PHY probing, and printing an error with dev_err can result in a large number of error messages during device probe. On a platform with a serial console this can result in excessively long boot times in a way that looks like an infinite loop when multiple busses are present. Since 0f183fd151c (net/fsl: enable extended scanning in xgmac_mdio) we perform more scanning so there are potentially more failures.
Reduce the logging level to dev_dbg which is consistent with the Freescale enetc driver.
--- drivers/net/ethernet/freescale/xgmac_mdio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/freescale/xgmac_mdio.c +1 -1
@@ -229,7 +229,7 @@ static int xgmac_mdio_read(struct mii_bus *bus, int phy_id, int regnum)/* Return all Fs if nothing was there */ if ((xgmac_read32 (®s->mdio_stat, endian) &MDIO_STAT_RD_ER ) && !priv->has_a011043) { -dev_err (&bus->dev, +dev_dbg (&bus->dev,"Error while reading PHY%d reg at %d.%hhu\n" , phy_id, dev_addr, regnum);return 0xffff ;
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 3/6 via-rhine: Fix for the hardware having a reset failure after resume
In reply to Sasha LevinFrom: Kevin Brace <[email protected]>
[ Upstream commit d120c9a81e32c43cba8017dec873b6a414898716 ]
In rhine_resume() and rhine_suspend(), the code calls netif_running() to see if the network interface is down or not. If it is down (i.e., netif_running() returning false), they will skip any housekeeping work within the function relating to the hardware. This becomes a problem when the hardware resumes from a standby since it is counting on rhine_resume() to map its MMIO and power up rest of the hardware. Not getting its MMIO remapped and rest of the hardware powered up lead to a soft reset failure and hardware disappearance. The solution is to map its MMIO and power up rest of the hardware inside rhine_open() before soft reset is to be performed. This solution was verified on ASUS P5V800-VM mainboard's integrated Rhine-II Ethernet MAC inside VIA Technologies VT8251 South Bridge.
--- drivers/net/ethernet/via/via-rhine.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/via/via-rhine.c +2 -0
@@ -1711,6 +1711,8 @@ static int rhine_open(struct net_device *dev) goto out_free_ring;alloc_tbufs (dev); +enable_mmio (rp->pioaddr, rp->quirks); +rhine_power_init (dev);rhine_chip_reset (dev);rhine_task_enable (rp);init_registers (dev);
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 4/6 via-rhine: VTunknown1 device is really VT8251 South Bridge
In reply to Sasha LevinFrom: Kevin Brace <[email protected]>
[ Upstream commit aa15190cf2cf25ec7e6c6d7373ae3ca563d48601 ]
The VIA Technologies VT8251 South Bridge's integrated Rhine-II Ethernet MAC comes has a PCI revision value of 0x7c. This was verified on ASUS P5V800-VM mainboard.
--- drivers/net/ethernet/via/via-rhine.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/via/via-rhine.c +1 -1
@@ -243,7 +243,7 @@ enum rhine_revs {VT8233 =0x60 ,/* Integrated MAC */ VT8235 =0x74 ,/* Integrated MAC */ VT8237 =0x78 ,/* Integrated MAC */ - VTunknown1 =0x7C , +VT8251 =0x7C ,/* Integrated MAC */ VT6105 =0x80 ,VT6105_B0 =0x83 , VT6105L = 0x8A,
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 5/6 net: usb: pegasus: Proper error handing when setting pegasus' MAC address
In reply to Sasha LevinFrom: Petko Manolov <[email protected]>
[ Upstream commit f30e25a9d1b25ac8d40071c4dc2679ad0fcdc55a ]
v2:
If reading the MAC address from eeprom fail don't throw an error, use randomly generated MAC instead. Either way the adapter will soldier on and the return type of set_ethernet_addr() can be reverted to void.
v1:
Fix a bug in set_ethernet_addr() which does not take into account possible errors (or partial reads) returned by its helpers. This can potentially lead to writing random data into device's MAC address registers.
--- drivers/net/usb/pegasus.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-)
drivers/net/usb/pegasus.c +27 -8
@@ -362,28 +362,47 @@ fail: }#endif /* PEGASUS_WRITE_EEPROM */ -static inline void get_node_id (pegasus_t *pegasus,__u8 *id) +static inline int get_node_id (pegasus_t *pegasus,u8 *id) { -int i; -__u16 w16; +int i, ret; +u16 w16;for (i =0 ; i <3 ; i++) { -read_eprom_word (pegasus, i, &w16); + ret =read_eprom_word (pegasus, i, &w16); +if (ret <0 ) +return ret; ((__le16 *) id)[i] =cpu_to_le16 (w16); } + +return 0 ; }static void set_ethernet_addr (pegasus_t *pegasus) { -__u8 node_id[6 ]; +int ret; +u8 node_id[6 ];if (pegasus->features &PEGASUS_II ) { -get_registers (pegasus,0x10 ,sizeof (node_id), node_id); + ret =get_registers (pegasus,0x10 ,sizeof (node_id), node_id); +if (ret <0 ) + goto err; }else { -get_node_id (pegasus, node_id); -set_registers (pegasus, EthID,sizeof (node_id), node_id); + ret =get_node_id (pegasus, node_id); +if (ret <0 ) + goto err; + ret =set_registers (pegasus, EthID,sizeof (node_id), node_id); +if (ret <0 ) + goto err; } +memcpy (pegasus->net->dev_addr, node_id,sizeof (node_id)); + +return ; +err: +eth_hw_addr_random (pegasus->net); +dev_info (&pegasus->intf->dev,"software assigned MAC address.\n" ); + +return ; }static inline int reset_mac (pegasus_t *pegasus)
Signature · 1 line
2.25.1
Sasha Levin
maintainerPATCH 6/6 net: usb: rtl8150: set random MAC address when set_ethernet_addr() fails
In reply to Sasha LevinFrom: Anant Thazhemadam <[email protected]>
[ Upstream commit f45a4248ea4cc13ed50618ff066849f9587226b2 ]
When get_registers() fails in set_ethernet_addr(),the uninitialized value of node_id gets copied over as the address.
So, check the return value of get_registers().
If get_registers() executed successfully (i.e., it returns sizeof(node_id)), copy over the MAC address using ether_addr_copy() (instead of using memcpy()).
Else, if get_registers() failed instead, a randomly generated MAC address is set as the MAC address instead.
--- drivers/net/usb/rtl8150.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
drivers/net/usb/rtl8150.c +12 -4
@@ -277,12 +277,20 @@ static int write_mii_word(rtl8150_t * dev, u8 phy, __u8 indx, u16 reg)return 1 ; } -static inline void set_ethernet_addr (rtl8150_t * dev) +static void set_ethernet_addr (rtl8150_t *dev) { -u8 node_id[6 ]; +u8 node_id[ETH_ALEN ]; +int ret; + + ret =get_registers (dev,IDR ,sizeof (node_id), node_id); -get_registers (dev,IDR ,sizeof (node_id), node_id); -memcpy (dev->netdev->dev_addr, node_id,sizeof (node_id)); +if (ret ==sizeof (node_id)) { +ether_addr_copy (dev->netdev->dev_addr, node_id); + }else { +eth_hw_addr_random (dev->netdev); +netdev_notice (dev->netdev,"Assigned a random MAC address: %pM\n" , + dev->netdev->dev_addr); + } }static int rtl8150_set_mac_address (struct net_device *netdev,void *p)
Signature · 1 line
2.25.1