From: Andrew Lunn <andrew@lunn.ch>
To: Marek Vasut <marex@denx.de>
Cc: netdev@vger.kernel.org, "David S . Miller" <davem@davemloft.net>,
Nisar Sayed <Nisar.Sayed@microchip.com>,
Woojung Huh <Woojung.Huh@microchip.com>,
Florian Fainelli <f.fainelli@gmail.com>,
linux-usb@vger.kernel.org
Subject: [10/19] usbnet: smsc95xx: Replace smsc95xx_mdio_read() with phy_read()
Date: Thu, 3 Jan 2019 14:39:12 +0100 [thread overview]
Message-ID: <20190103133912.GC21849@lunn.ch> (raw)
> static int get_mdix_status(struct net_device *net)
> {
> struct usbnet *dev = netdev_priv(net);
> + struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
> u32 val;
> int buf;
>
> - buf = smsc95xx_mdio_read(dev->net, dev->mii.phy_id, SPECIAL_CTRL_STS);
> + buf = phy_read(pdata->phydev, SPECIAL_CTRL_STS);
> if (buf & SPECIAL_CTRL_STS_OVRRD_AMDIX_) {
> if (buf & SPECIAL_CTRL_STS_AMDIX_ENABLE_)
> return ETH_TP_MDI_AUTO;
> @@ -793,7 +794,7 @@ static void set_mdix_status(struct net_device *net, __u8 mdix_ctrl)
> (pdata->chip_id == ID_REV_CHIP_ID_89530_) ||
> (pdata->chip_id == ID_REV_CHIP_ID_9730_)) {
> /* Extend Manual AutoMDIX timer for 9500A/9500Ai */
> - buf = smsc95xx_mdio_read(dev->net, dev->mii.phy_id,
> + buf = phy_read(pdata->phydev,
> PHY_EDPD_CONFIG);
> buf |= PHY_EDPD_CONFIG_EXT_CROSSOVER_;
> smsc95xx_mdio_write(dev->net, dev->mii.phy_id,
> @@ -801,7 +802,7 @@ static void set_mdix_status(struct net_device *net, __u8 mdix_ctrl)
> }
>
> if (mdix_ctrl == ETH_TP_MDI) {
> - buf = smsc95xx_mdio_read(dev->net, dev->mii.phy_id,
> + buf = phy_read(pdata->phydev,
> SPECIAL_CTRL_STS);
> buf |= SPECIAL_CTRL_STS_OVRRD_AMDIX_;
> buf &= ~(SPECIAL_CTRL_STS_AMDIX_ENABLE_ |
> @@ -809,7 +810,7 @@ static void set_mdix_status(struct net_device *net, __u8 mdix_ctrl)
> smsc95xx_mdio_write(dev->net, dev->mii.phy_id,
> SPECIAL_CTRL_STS, buf);
> } else if (mdix_ctrl == ETH_TP_MDI_X) {
> - buf = smsc95xx_mdio_read(dev->net, dev->mii.phy_id,
> + buf = phy_read(pdata->phydev,
> SPECIAL_CTRL_STS);
> buf |= SPECIAL_CTRL_STS_OVRRD_AMDIX_;
> buf &= ~(SPECIAL_CTRL_STS_AMDIX_ENABLE_ |
> @@ -818,7 +819,7 @@ static void set_mdix_status(struct net_device *net, __u8 mdix_ctrl)
> smsc95xx_mdio_write(dev->net, dev->mii.phy_id,
> SPECIAL_CTRL_STS, buf);
> } else if (mdix_ctrl == ETH_TP_MDI_AUTO) {
> - buf = smsc95xx_mdio_read(dev->net, dev->mii.phy_id,
> + buf = phy_read(pdata->phydev,
> SPECIAL_CTRL_STS);
> buf &= ~SPECIAL_CTRL_STS_OVRRD_AMDIX_;
> buf &= ~(SPECIAL_CTRL_STS_AMDIX_ENABLE_ |
> @@ -968,6 +969,7 @@ static void smsc95xx_adjust_link(struct net_device *netdev)
All this crossover code should be moved into the PHY driver.
Andrew
WARNING: multiple messages have this Message-ID (diff)
From: Andrew Lunn <andrew@lunn.ch>
To: Marek Vasut <marex@denx.de>
Cc: netdev@vger.kernel.org, "David S . Miller" <davem@davemloft.net>,
Nisar Sayed <Nisar.Sayed@microchip.com>,
Woojung Huh <Woojung.Huh@microchip.com>,
Florian Fainelli <f.fainelli@gmail.com>,
linux-usb@vger.kernel.org
Subject: Re: [PATCH 10/19] usbnet: smsc95xx: Replace smsc95xx_mdio_read() with phy_read()
Date: Thu, 3 Jan 2019 14:39:12 +0100 [thread overview]
Message-ID: <20190103133912.GC21849@lunn.ch> (raw)
In-Reply-To: <20190103011040.25974-11-marex@denx.de>
> static int get_mdix_status(struct net_device *net)
> {
> struct usbnet *dev = netdev_priv(net);
> + struct smsc95xx_priv *pdata = (struct smsc95xx_priv *)(dev->data[0]);
> u32 val;
> int buf;
>
> - buf = smsc95xx_mdio_read(dev->net, dev->mii.phy_id, SPECIAL_CTRL_STS);
> + buf = phy_read(pdata->phydev, SPECIAL_CTRL_STS);
> if (buf & SPECIAL_CTRL_STS_OVRRD_AMDIX_) {
> if (buf & SPECIAL_CTRL_STS_AMDIX_ENABLE_)
> return ETH_TP_MDI_AUTO;
> @@ -793,7 +794,7 @@ static void set_mdix_status(struct net_device *net, __u8 mdix_ctrl)
> (pdata->chip_id == ID_REV_CHIP_ID_89530_) ||
> (pdata->chip_id == ID_REV_CHIP_ID_9730_)) {
> /* Extend Manual AutoMDIX timer for 9500A/9500Ai */
> - buf = smsc95xx_mdio_read(dev->net, dev->mii.phy_id,
> + buf = phy_read(pdata->phydev,
> PHY_EDPD_CONFIG);
> buf |= PHY_EDPD_CONFIG_EXT_CROSSOVER_;
> smsc95xx_mdio_write(dev->net, dev->mii.phy_id,
> @@ -801,7 +802,7 @@ static void set_mdix_status(struct net_device *net, __u8 mdix_ctrl)
> }
>
> if (mdix_ctrl == ETH_TP_MDI) {
> - buf = smsc95xx_mdio_read(dev->net, dev->mii.phy_id,
> + buf = phy_read(pdata->phydev,
> SPECIAL_CTRL_STS);
> buf |= SPECIAL_CTRL_STS_OVRRD_AMDIX_;
> buf &= ~(SPECIAL_CTRL_STS_AMDIX_ENABLE_ |
> @@ -809,7 +810,7 @@ static void set_mdix_status(struct net_device *net, __u8 mdix_ctrl)
> smsc95xx_mdio_write(dev->net, dev->mii.phy_id,
> SPECIAL_CTRL_STS, buf);
> } else if (mdix_ctrl == ETH_TP_MDI_X) {
> - buf = smsc95xx_mdio_read(dev->net, dev->mii.phy_id,
> + buf = phy_read(pdata->phydev,
> SPECIAL_CTRL_STS);
> buf |= SPECIAL_CTRL_STS_OVRRD_AMDIX_;
> buf &= ~(SPECIAL_CTRL_STS_AMDIX_ENABLE_ |
> @@ -818,7 +819,7 @@ static void set_mdix_status(struct net_device *net, __u8 mdix_ctrl)
> smsc95xx_mdio_write(dev->net, dev->mii.phy_id,
> SPECIAL_CTRL_STS, buf);
> } else if (mdix_ctrl == ETH_TP_MDI_AUTO) {
> - buf = smsc95xx_mdio_read(dev->net, dev->mii.phy_id,
> + buf = phy_read(pdata->phydev,
> SPECIAL_CTRL_STS);
> buf &= ~SPECIAL_CTRL_STS_OVRRD_AMDIX_;
> buf &= ~(SPECIAL_CTRL_STS_AMDIX_ENABLE_ |
> @@ -968,6 +969,7 @@ static void smsc95xx_adjust_link(struct net_device *netdev)
All this crossover code should be moved into the PHY driver.
Andrew
next reply other threads:[~2019-01-03 13:39 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-03 13:39 Andrew Lunn [this message]
2019-01-03 13:39 ` [PATCH 10/19] usbnet: smsc95xx: Replace smsc95xx_mdio_read() with phy_read() Andrew Lunn
-- strict thread matches above, loose matches on Subject: below --
2019-01-07 11:50 [02/19] usbnet: smsc95xx: Stop propagation of in_pm Marek Vasut
2019-01-07 11:50 ` [PATCH 02/19] " Marek Vasut
2019-01-07 11:05 [07/19] usbnet: smsc95xx: Split the reset function Oliver Neukum
2019-01-07 11:05 ` [PATCH 07/19] " Oliver Neukum
2019-01-07 11:02 [02/19] usbnet: smsc95xx: Stop propagation of in_pm Oliver Neukum
2019-01-07 11:02 ` [PATCH 02/19] " Oliver Neukum
2019-01-04 18:02 [10/19] usbnet: smsc95xx: Replace smsc95xx_mdio_read() with phy_read() Heiner Kallweit
2019-01-04 18:02 ` [PATCH 10/19] " Heiner Kallweit
2019-01-04 15:57 [10/19] " Andrew Lunn
2019-01-04 15:57 ` [PATCH 10/19] " Andrew Lunn
2019-01-04 14:58 [10/19] " Marek Vasut
2019-01-04 14:58 ` [PATCH 10/19] " Marek Vasut
2019-01-04 13:24 [10/19] " Andrew Lunn
2019-01-04 13:24 ` [PATCH 10/19] " Andrew Lunn
2019-01-04 2:19 [12/19] usbnet: smsc95xx: Replace ad-hoc PHY functions with generic ones Marek Vasut
2019-01-04 2:19 ` [PATCH 12/19] " Marek Vasut
2019-01-04 2:19 [10/19] usbnet: smsc95xx: Replace smsc95xx_mdio_read() with phy_read() Marek Vasut
2019-01-04 2:19 ` [PATCH 10/19] " Marek Vasut
2019-01-04 2:18 [09/19] usbnet: smsc95xx: Connect to phydev Marek Vasut
2019-01-04 2:18 ` [PATCH 09/19] " Marek Vasut
2019-01-03 13:28 [12/19] usbnet: smsc95xx: Replace ad-hoc PHY functions with generic ones Andrew Lunn
2019-01-03 13:28 ` [PATCH 12/19] " Andrew Lunn
2019-01-03 13:22 [09/19] usbnet: smsc95xx: Connect to phydev Andrew Lunn
2019-01-03 13:22 ` [PATCH 09/19] " Andrew Lunn
2019-01-03 1:10 [19/19] usbnet: smsc95xx: Use phy bit operations Marek Vasut
2019-01-03 1:10 ` [PATCH 19/19] " Marek Vasut
2019-01-03 1:10 [18/19] usbnet: smsc95xx: Remove all of the carrier checking code Marek Vasut
2019-01-03 1:10 ` [PATCH 18/19] " Marek Vasut
2019-01-03 1:10 [17/19] usbnet: smsc95xx: Replace generic_mii_ioctl() Marek Vasut
2019-01-03 1:10 ` [PATCH 17/19] " Marek Vasut
2019-01-03 1:10 [16/19] usbnet: smsc95xx: Replace mii_check_media() Marek Vasut
2019-01-03 1:10 ` [PATCH 16/19] " Marek Vasut
2019-01-03 1:10 [15/19] usbnet: smsc95xx: Replace mii_ethtool_gset() Marek Vasut
2019-01-03 1:10 ` [PATCH 15/19] " Marek Vasut
2019-01-03 1:10 [14/19] usbnet: smsc95xx: Replace mii_nway_restart() Marek Vasut
2019-01-03 1:10 ` [PATCH 14/19] " Marek Vasut
2019-01-03 1:10 [13/19] usbnet: smsc95xx: Replace smsc95xx_link_ok_nopm() Marek Vasut
2019-01-03 1:10 ` [PATCH 13/19] " Marek Vasut
2019-01-03 1:10 [12/19] usbnet: smsc95xx: Replace ad-hoc PHY functions with generic ones Marek Vasut
2019-01-03 1:10 ` [PATCH 12/19] " Marek Vasut
2019-01-03 1:10 [11/19] usbnet: smsc95xx: Replace smsc95xx_mdio_write() with phy_write() Marek Vasut
2019-01-03 1:10 ` [PATCH 11/19] " Marek Vasut
2019-01-03 1:10 [10/19] usbnet: smsc95xx: Replace smsc95xx_mdio_read() with phy_read() Marek Vasut
2019-01-03 1:10 ` [PATCH 10/19] " Marek Vasut
2019-01-03 1:10 [09/19] usbnet: smsc95xx: Connect to phydev Marek Vasut
2019-01-03 1:10 ` [PATCH 09/19] " Marek Vasut
2019-01-03 1:10 [08/19] usbnet: smsc95xx: Register MII bus Marek Vasut
2019-01-03 1:10 ` [PATCH 08/19] " Marek Vasut
2019-01-03 1:10 [07/19] usbnet: smsc95xx: Split the reset function Marek Vasut
2019-01-03 1:10 ` [PATCH 07/19] " Marek Vasut
2019-01-03 1:10 [06/19] usbnet: smsc95xx: Remove __smsc95xx_mdio_{read,write}() Marek Vasut
2019-01-03 1:10 ` [PATCH 06/19] " Marek Vasut
2019-01-03 1:10 [05/19] usbnet: smsc95xx: Remove smsc95xx_{read,write}_nopm() Marek Vasut
2019-01-03 1:10 ` [PATCH 05/19] " Marek Vasut
2019-01-03 1:10 [04/19] usbnet: smsc95xx: Remove __smsc95xx_{read,write}_reg() Marek Vasut
2019-01-03 1:10 ` [PATCH 04/19] " Marek Vasut
2019-01-03 1:10 [03/19] usbnet: smsc95xx: Remove smsc95xx_{read,write}_reg_nopm() Marek Vasut
2019-01-03 1:10 ` [PATCH 03/19] " Marek Vasut
2019-01-03 1:10 [02/19] usbnet: smsc95xx: Stop propagation of in_pm Marek Vasut
2019-01-03 1:10 ` [PATCH 02/19] " Marek Vasut
2019-01-03 1:10 [01/19] usbnet: smsc95xx: Fix memory leak in smsc95xx_bind Marek Vasut
2019-01-03 1:10 ` [PATCH 01/19] " Marek Vasut
2019-01-03 1:10 [PATCH 00/19] usbnet: smsc95xx: Convert to phydev Marek Vasut
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190103133912.GC21849@lunn.ch \
--to=andrew@lunn.ch \
--cc=Nisar.Sayed@microchip.com \
--cc=Woojung.Huh@microchip.com \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=linux-usb@vger.kernel.org \
--cc=marex@denx.de \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.