* [PATCH RESEND 1/5] net: mdio-gpio: fix device-tree binding documentation
2014-05-08 8:09 ` [PATCH RESEND 0/5] net: cpsw and mdio-gpio fixes for v3.15-final Johan Hovold
@ 2014-05-08 8:09 ` Johan Hovold
2014-05-08 8:09 ` [PATCH RESEND 2/5] net: mdio-gpio: warn about missing bus alias id Johan Hovold
` (4 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Johan Hovold @ 2014-05-08 8:09 UTC (permalink / raw)
To: David S. Miller, Florian Fainelli
Cc: devicetree, linux-kernel, netdev, Mugunthan V N, Johan Hovold
Fix aliases syntax in device-tree binding example to avoid
copy-paste errors (the alias would be dropped silently).
Signed-off-by: Johan Hovold <jhovold@gmail.com>
---
Documentation/devicetree/bindings/net/mdio-gpio.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/net/mdio-gpio.txt b/Documentation/devicetree/bindings/net/mdio-gpio.txt
index c79bab025369..8dbcf8295c6c 100644
--- a/Documentation/devicetree/bindings/net/mdio-gpio.txt
+++ b/Documentation/devicetree/bindings/net/mdio-gpio.txt
@@ -14,7 +14,7 @@ node.
Example:
aliases {
- mdio-gpio0 = <&mdio0>;
+ mdio-gpio0 = &mdio0;
};
mdio0: mdio {
--
1.8.3.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH RESEND 2/5] net: mdio-gpio: warn about missing bus alias id
2014-05-08 8:09 ` [PATCH RESEND 0/5] net: cpsw and mdio-gpio fixes for v3.15-final Johan Hovold
2014-05-08 8:09 ` [PATCH RESEND 1/5] net: mdio-gpio: fix device-tree binding documentation Johan Hovold
@ 2014-05-08 8:09 ` Johan Hovold
2014-05-08 8:09 ` [PATCH RESEND 3/5] Revert "net: eth: cpsw: Correctly attach to GPIO bitbang MDIO driver" Johan Hovold
` (3 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Johan Hovold @ 2014-05-08 8:09 UTC (permalink / raw)
To: David S. Miller, Florian Fainelli
Cc: devicetree, linux-kernel, netdev, Mugunthan V N, Johan Hovold
Use a sane default bus id (rather than -ENODEV) and print a warning when
the bus alias id is missing.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
---
drivers/net/phy/mdio-gpio.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/net/phy/mdio-gpio.c b/drivers/net/phy/mdio-gpio.c
index 9c4defdec67b..5f1a2250018f 100644
--- a/drivers/net/phy/mdio-gpio.c
+++ b/drivers/net/phy/mdio-gpio.c
@@ -215,6 +215,10 @@ static int mdio_gpio_probe(struct platform_device *pdev)
if (pdev->dev.of_node) {
pdata = mdio_gpio_of_get_data(pdev);
bus_id = of_alias_get_id(pdev->dev.of_node, "mdio-gpio");
+ if (bus_id < 0) {
+ dev_warn(&pdev->dev, "failed to get alias id\n");
+ bus_id = 0;
+ }
} else {
pdata = dev_get_platdata(&pdev->dev);
bus_id = pdev->id;
--
1.8.3.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH RESEND 3/5] Revert "net: eth: cpsw: Correctly attach to GPIO bitbang MDIO driver"
2014-05-08 8:09 ` [PATCH RESEND 0/5] net: cpsw and mdio-gpio fixes for v3.15-final Johan Hovold
2014-05-08 8:09 ` [PATCH RESEND 1/5] net: mdio-gpio: fix device-tree binding documentation Johan Hovold
2014-05-08 8:09 ` [PATCH RESEND 2/5] net: mdio-gpio: warn about missing bus alias id Johan Hovold
@ 2014-05-08 8:09 ` Johan Hovold
2014-05-08 8:09 ` Johan Hovold
` (2 subsequent siblings)
5 siblings, 0 replies; 13+ messages in thread
From: Johan Hovold @ 2014-05-08 8:09 UTC (permalink / raw)
To: David S. Miller, Florian Fainelli
Cc: devicetree, linux-kernel, netdev, Mugunthan V N, Johan Hovold,
Stefan Roese, stable
This reverts commit f8d56d8f892be43a2404356073e16401eb5a42e6.
Fix potential null-pointer dereference at probe if the mdio-gpio device
has not been successfully probed yet.
The offending commit is plain wrong for a number of reasons. First of
all it accesses internal driver data of an unrelated device. Neither
does it check that the data is non-null (which it is in case the device
has not been probed yet).
Furthermore, the decision on whether to treat any driver data according
to the mdio-gpio driver's internals is made based on the node name. But
the name is not compared against "mdio" which is the normal name for the
node, but rather against "gpio" which the node does not have to be named
(and shouldn't be according to the binding documentation). [ If this
hack is to be kept out-of-tree it should at least be matching against
the compatible property. ]
Cc: Stefan Roese <sr@denx.de>
Cc: stable <stable@vger.kernel.org> # v3.14
Signed-off-by: Johan Hovold <jhovold@gmail.com>
---
drivers/net/ethernet/ti/cpsw.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 36aa109416c4..18d83d8d7f74 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -1871,18 +1871,8 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
mdio_node = of_find_node_by_phandle(be32_to_cpup(parp));
phyid = be32_to_cpup(parp+1);
mdio = of_find_device_by_node(mdio_node);
-
- if (strncmp(mdio->name, "gpio", 4) == 0) {
- /* GPIO bitbang MDIO driver attached */
- struct mii_bus *bus = dev_get_drvdata(&mdio->dev);
-
- snprintf(slave_data->phy_id, sizeof(slave_data->phy_id),
- PHY_ID_FMT, bus->id, phyid);
- } else {
- /* davinci MDIO driver attached */
- snprintf(slave_data->phy_id, sizeof(slave_data->phy_id),
- PHY_ID_FMT, mdio->name, phyid);
- }
+ snprintf(slave_data->phy_id, sizeof(slave_data->phy_id),
+ PHY_ID_FMT, mdio->name, phyid);
mac_addr = of_get_mac_address(slave_node);
if (mac_addr)
--
1.8.3.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH RESEND 4/5] net: cpsw: fix null dereference at probe
@ 2014-05-08 8:09 ` Johan Hovold
0 siblings, 0 replies; 13+ messages in thread
From: Johan Hovold @ 2014-05-08 8:09 UTC (permalink / raw)
To: David S. Miller, Florian Fainelli
Cc: devicetree, linux-kernel, netdev, Mugunthan V N, Johan Hovold, stable
Fix null-pointer dereference at probe when the mdio platform device is
missing (e.g. when it has been disabled in DT).
Cc: stable <stable@vger.kernel.org> # v3.8
Signed-off-by: Johan Hovold <jhovold@gmail.com>
---
drivers/net/ethernet/ti/cpsw.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 18d83d8d7f74..db9360cd861c 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -1871,6 +1871,10 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
mdio_node = of_find_node_by_phandle(be32_to_cpup(parp));
phyid = be32_to_cpup(parp+1);
mdio = of_find_device_by_node(mdio_node);
+ if (!mdio) {
+ pr_err("Missing mdio platform device\n");
+ return -EINVAL;
+ }
snprintf(slave_data->phy_id, sizeof(slave_data->phy_id),
PHY_ID_FMT, mdio->name, phyid);
--
1.8.3.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH RESEND 4/5] net: cpsw: fix null dereference at probe
@ 2014-05-08 8:09 ` Johan Hovold
0 siblings, 0 replies; 13+ messages in thread
From: Johan Hovold @ 2014-05-08 8:09 UTC (permalink / raw)
To: David S. Miller, Florian Fainelli
Cc: devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA,
netdev-u79uwXL29TY76Z2rM5mHXA, Mugunthan V N, Johan Hovold,
stable
Fix null-pointer dereference at probe when the mdio platform device is
missing (e.g. when it has been disabled in DT).
Cc: stable <stable-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> # v3.8
Signed-off-by: Johan Hovold <jhovold-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
---
drivers/net/ethernet/ti/cpsw.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index 18d83d8d7f74..db9360cd861c 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -1871,6 +1871,10 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
mdio_node = of_find_node_by_phandle(be32_to_cpup(parp));
phyid = be32_to_cpup(parp+1);
mdio = of_find_device_by_node(mdio_node);
+ if (!mdio) {
+ pr_err("Missing mdio platform device\n");
+ return -EINVAL;
+ }
snprintf(slave_data->phy_id, sizeof(slave_data->phy_id),
PHY_ID_FMT, mdio->name, phyid);
--
1.8.3.2
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH RESEND 5/5] net: cpsw: add missing of_node_put
2014-05-08 8:09 ` [PATCH RESEND 0/5] net: cpsw and mdio-gpio fixes for v3.15-final Johan Hovold
` (3 preceding siblings ...)
2014-05-08 8:09 ` Johan Hovold
@ 2014-05-08 8:09 ` Johan Hovold
2014-05-09 19:51 ` [PATCH RESEND 0/5] net: cpsw and mdio-gpio fixes for v3.15-final David Miller
5 siblings, 0 replies; 13+ messages in thread
From: Johan Hovold @ 2014-05-08 8:09 UTC (permalink / raw)
To: David S. Miller, Florian Fainelli
Cc: devicetree, linux-kernel, netdev, Mugunthan V N, Johan Hovold
Add missing of_node_put to avoid kref leak.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
---
drivers/net/ethernet/ti/cpsw.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c
index db9360cd861c..c331b7ebc812 100644
--- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c
@@ -1871,6 +1871,7 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data,
mdio_node = of_find_node_by_phandle(be32_to_cpup(parp));
phyid = be32_to_cpup(parp+1);
mdio = of_find_device_by_node(mdio_node);
+ of_node_put(mdio_node);
if (!mdio) {
pr_err("Missing mdio platform device\n");
return -EINVAL;
--
1.8.3.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH RESEND 0/5] net: cpsw and mdio-gpio fixes for v3.15-final
2014-05-08 8:09 ` [PATCH RESEND 0/5] net: cpsw and mdio-gpio fixes for v3.15-final Johan Hovold
` (4 preceding siblings ...)
2014-05-08 8:09 ` [PATCH RESEND 5/5] net: cpsw: add missing of_node_put Johan Hovold
@ 2014-05-09 19:51 ` David Miller
5 siblings, 0 replies; 13+ messages in thread
From: David Miller @ 2014-05-09 19:51 UTC (permalink / raw)
To: jhovold; +Cc: f.fainelli, devicetree, linux-kernel, netdev, mugunthanvnm
From: Johan Hovold <jhovold@gmail.com>
Date: Thu, 8 May 2014 10:09:19 +0200
> These patches against v3.15-rc4 fix a few issues in the cpsw and
> mdio-gpio drivers.
>
> Resend with proper stable CC (git send-email still fails to parse the
> #-part of the tag unless address is enclosed in <> it seems).
>
> Sorry about the noise.
Series applied, thanks.
^ permalink raw reply [flat|nested] 13+ messages in thread