Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1699592 > unrolled thread
| Started by | Egil Hjelmeland <privat@egil-hjelmeland.no> |
|---|---|
| First post | 2017-07-30 20:10 +0200 |
| Last post | 2017-07-31 10:00 +0200 |
| Articles | 4 — 3 participants |
Back to article view | Back to linux.kernel
[PATCH v2 net-next 0/4] net: dsa: lan9303: Fix MDIO issues. Egil Hjelmeland <privat@egil-hjelmeland.no> - 2017-07-30 20:10 +0200
[PATCH v2 net-next 4/4] net: dsa: lan9303: MDIO access phy registers directly Egil Hjelmeland <privat@egil-hjelmeland.no> - 2017-07-30 20:10 +0200
Re: [PATCH v2 net-next 0/4] net: dsa: lan9303: Fix MDIO issues. David Miller <davem@davemloft.net> - 2017-07-31 04:30 +0200
Re: [PATCH v2 net-next 0/4] net: dsa: lan9303: Fix MDIO issues. Juergen Borleis <jbe@pengutronix.de> - 2017-07-31 10:00 +0200
| From | Egil Hjelmeland <privat@egil-hjelmeland.no> |
|---|---|
| Date | 2017-07-30 20:10 +0200 |
| Subject | [PATCH v2 net-next 0/4] net: dsa: lan9303: Fix MDIO issues. |
| Message-ID | <u90Fr-3qN-5@gated-at.bofh.it> |
This series fix the MDIO interface for the lan9303 DSA driver. Bugs found after testing on actual HW. This series is extracted from the first patch of my first large series. Significant changes from that version are: - use mdiobus_write_nested, mdiobus_read_nested. - EXPORT lan9303_indirect_phy_ops Unfortunately I do not have access to i2c based system for testing. Changes from first version: - Change EXPORT_SYMBOL to EXPORT_SYMBOL_GPL Egil Hjelmeland (4): net: dsa: lan9303: Fix lan9303_detect_phy_setup() for MDIO net: dsa: lan9303: Multiply by 4 to get MDIO register net: dsa: lan9303: Renamed indirect phy access functions net: dsa: lan9303: MDIO access phy registers directly drivers/net/dsa/lan9303-core.c | 43 +++++++++++++++++++++++++++--------------- drivers/net/dsa/lan9303.h | 11 +++++++++++ drivers/net/dsa/lan9303_i2c.c | 2 ++ drivers/net/dsa/lan9303_mdio.c | 23 ++++++++++++++++++++++ 4 files changed, 64 insertions(+), 15 deletions(-) -- 2.11.0
[toc] | [next] | [standalone]
| From | Egil Hjelmeland <privat@egil-hjelmeland.no> |
|---|---|
| Date | 2017-07-30 20:10 +0200 |
| Subject | [PATCH v2 net-next 4/4] net: dsa: lan9303: MDIO access phy registers directly |
| Message-ID | <u90P8-3Kw-11@gated-at.bofh.it> |
| In reply to | #1699592 |
Indirect access (PMI) to phy register only work in I2C mode. In
MDIO mode phy registers must be accessed directly. Introduced
struct lan9303_phy_ops to handle the two modes.
Signed-off-by: Egil Hjelmeland <privat@egil-hjelmeland.no>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
---
drivers/net/dsa/lan9303-core.c | 20 +++++++++++++-------
drivers/net/dsa/lan9303.h | 11 +++++++++++
drivers/net/dsa/lan9303_i2c.c | 2 ++
drivers/net/dsa/lan9303_mdio.c | 21 +++++++++++++++++++++
4 files changed, 47 insertions(+), 7 deletions(-)
diff --git a/drivers/net/dsa/lan9303-core.c b/drivers/net/dsa/lan9303-core.c
index 9427c3b0ced2..8e430d1ee297 100644
--- a/drivers/net/dsa/lan9303-core.c
+++ b/drivers/net/dsa/lan9303-core.c
@@ -334,6 +334,12 @@ static int lan9303_indirect_phy_write(struct lan9303 *chip, int addr,
return ret;
}
+const struct lan9303_phy_ops lan9303_indirect_phy_ops = {
+ .phy_read = lan9303_indirect_phy_read,
+ .phy_write = lan9303_indirect_phy_write,
+};
+EXPORT_SYMBOL_GPL(lan9303_indirect_phy_ops);
+
static int lan9303_switch_wait_for_completion(struct lan9303 *chip)
{
int ret, i;
@@ -435,7 +441,7 @@ static int lan9303_detect_phy_setup(struct lan9303 *chip)
* 0x0000, which means 'phy_addr_sel_strap' is 1 and the IDs are 1-2-3.
* 0xffff is returned on MDIO read with no response.
*/
- reg = lan9303_indirect_phy_read(chip, 3, MII_LAN911X_SPECIAL_MODES);
+ reg = chip->ops->phy_read(chip, 3, MII_LAN911X_SPECIAL_MODES);
if (reg < 0) {
dev_err(chip->dev, "Failed to detect phy config: %d\n", reg);
return reg;
@@ -726,7 +732,7 @@ static int lan9303_phy_read(struct dsa_switch *ds, int phy, int regnum)
if (phy > phy_base + 2)
return -ENODEV;
- return lan9303_indirect_phy_read(chip, phy, regnum);
+ return chip->ops->phy_read(chip, phy, regnum);
}
static int lan9303_phy_write(struct dsa_switch *ds, int phy, int regnum,
@@ -740,7 +746,7 @@ static int lan9303_phy_write(struct dsa_switch *ds, int phy, int regnum,
if (phy > phy_base + 2)
return -ENODEV;
- return lan9303_indirect_phy_write(chip, phy, regnum, val);
+ return chip->ops->phy_write(chip, phy, regnum, val);
}
static int lan9303_port_enable(struct dsa_switch *ds, int port,
@@ -773,13 +779,13 @@ static void lan9303_port_disable(struct dsa_switch *ds, int port,
switch (port) {
case 1:
lan9303_disable_packet_processing(chip, LAN9303_PORT_1_OFFSET);
- lan9303_indirect_phy_write(chip, chip->phy_addr_sel_strap + 1,
- MII_BMCR, BMCR_PDOWN);
+ lan9303_phy_write(ds, chip->phy_addr_sel_strap + 1,
+ MII_BMCR, BMCR_PDOWN);
break;
case 2:
lan9303_disable_packet_processing(chip, LAN9303_PORT_2_OFFSET);
- lan9303_indirect_phy_write(chip, chip->phy_addr_sel_strap + 2,
- MII_BMCR, BMCR_PDOWN);
+ lan9303_phy_write(ds, chip->phy_addr_sel_strap + 2,
+ MII_BMCR, BMCR_PDOWN);
break;
default:
dev_dbg(chip->dev,
diff --git a/drivers/net/dsa/lan9303.h b/drivers/net/dsa/lan9303.h
index d1512dad2d90..4d8be555ff4d 100644
--- a/drivers/net/dsa/lan9303.h
+++ b/drivers/net/dsa/lan9303.h
@@ -2,6 +2,15 @@
#include <linux/device.h>
#include <net/dsa.h>
+struct lan9303;
+
+struct lan9303_phy_ops {
+ /* PHY 1 and 2 access*/
+ int (*phy_read)(struct lan9303 *chip, int port, int regnum);
+ int (*phy_write)(struct lan9303 *chip, int port,
+ int regnum, u16 val);
+};
+
struct lan9303 {
struct device *dev;
struct regmap *regmap;
@@ -11,9 +20,11 @@ struct lan9303 {
bool phy_addr_sel_strap;
struct dsa_switch *ds;
struct mutex indirect_mutex; /* protect indexed register access */
+ const struct lan9303_phy_ops *ops;
};
extern const struct regmap_access_table lan9303_register_set;
+extern const struct lan9303_phy_ops lan9303_indirect_phy_ops;
int lan9303_probe(struct lan9303 *chip, struct device_node *np);
int lan9303_remove(struct lan9303 *chip);
diff --git a/drivers/net/dsa/lan9303_i2c.c b/drivers/net/dsa/lan9303_i2c.c
index ab3ce0da5071..24ec20f7f444 100644
--- a/drivers/net/dsa/lan9303_i2c.c
+++ b/drivers/net/dsa/lan9303_i2c.c
@@ -63,6 +63,8 @@ static int lan9303_i2c_probe(struct i2c_client *client,
i2c_set_clientdata(client, sw_dev);
sw_dev->chip.dev = &client->dev;
+ sw_dev->chip.ops = &lan9303_indirect_phy_ops;
+
ret = lan9303_probe(&sw_dev->chip, client->dev.of_node);
if (ret != 0)
return ret;
diff --git a/drivers/net/dsa/lan9303_mdio.c b/drivers/net/dsa/lan9303_mdio.c
index 2db7970fc88c..fc16668a487f 100644
--- a/drivers/net/dsa/lan9303_mdio.c
+++ b/drivers/net/dsa/lan9303_mdio.c
@@ -67,6 +67,25 @@ static int lan9303_mdio_read(void *ctx, uint32_t reg, uint32_t *val)
return 0;
}
+int lan9303_mdio_phy_write(struct lan9303 *chip, int phy, int reg, u16 val)
+{
+ struct lan9303_mdio *sw_dev = dev_get_drvdata(chip->dev);
+
+ return mdiobus_write_nested(sw_dev->device->bus, phy, reg, val);
+}
+
+int lan9303_mdio_phy_read(struct lan9303 *chip, int phy, int reg)
+{
+ struct lan9303_mdio *sw_dev = dev_get_drvdata(chip->dev);
+
+ return mdiobus_read_nested(sw_dev->device->bus, phy, reg);
+}
+
+static const struct lan9303_phy_ops lan9303_mdio_phy_ops = {
+ .phy_read = lan9303_mdio_phy_read,
+ .phy_write = lan9303_mdio_phy_write,
+};
+
static const struct regmap_config lan9303_mdio_regmap_config = {
.reg_bits = 8,
.val_bits = 32,
@@ -108,6 +127,8 @@ static int lan9303_mdio_probe(struct mdio_device *mdiodev)
dev_set_drvdata(&mdiodev->dev, sw_dev);
sw_dev->chip.dev = &mdiodev->dev;
+ sw_dev->chip.ops = &lan9303_mdio_phy_ops;
+
ret = lan9303_probe(&sw_dev->chip, mdiodev->dev.of_node);
if (ret != 0)
return ret;
--
2.11.0
[toc] | [prev] | [next] | [standalone]
| From | David Miller <davem@davemloft.net> |
|---|---|
| Date | 2017-07-31 04:30 +0200 |
| Message-ID | <u98CZ-gA-7@gated-at.bofh.it> |
| In reply to | #1699592 |
From: Egil Hjelmeland <privat@egil-hjelmeland.no> Date: Sun, 30 Jul 2017 19:58:52 +0200 > This series fix the MDIO interface for the lan9303 DSA driver. > Bugs found after testing on actual HW. > > This series is extracted from the first patch of my first large > series. Significant changes from that version are: > - use mdiobus_write_nested, mdiobus_read_nested. > - EXPORT lan9303_indirect_phy_ops > > Unfortunately I do not have access to i2c based system for > testing. > > Changes from first version: > - Change EXPORT_SYMBOL to EXPORT_SYMBOL_GPL Series applied, thanks.
[toc] | [prev] | [next] | [standalone]
| From | Juergen Borleis <jbe@pengutronix.de> |
|---|---|
| Date | 2017-07-31 10:00 +0200 |
| Message-ID | <u9dMl-3vs-9@gated-at.bofh.it> |
| In reply to | #1699592 |
Hi Egil, On Sunday 30 July 2017 19:58:52 Egil Hjelmeland wrote: > This series fix the MDIO interface for the lan9303 DSA driver. > Bugs found after testing on actual HW. > > This series is extracted from the first patch of my first large > series. Significant changes from that version are: > - use mdiobus_write_nested, mdiobus_read_nested. > - EXPORT lan9303_indirect_phy_ops > > Unfortunately I do not have access to i2c based system for > testing. A little bit late - the series is already applied... I have just tested it on my LAN9303 connected via I2C and my setup still works. Tested-by: Juergen Borleis <jbe@pengutronix.de> Cheers Juergen -- Pengutronix e.K. | Juergen Borleis | Industrial Linux Solutions | http://www.pengutronix.de/ |
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web