* [PATCH] net: phy: sfp: enable i2c-bus detection on ACPI based systems
@ 2019-05-05 19:34 Ruslan Babayev
2019-05-05 19:51 ` Heiner Kallweit
` (4 more replies)
0 siblings, 5 replies; 13+ messages in thread
From: Ruslan Babayev @ 2019-05-05 19:34 UTC (permalink / raw)
To: Wolfram Sang, Mika Westerberg, Russell King, Andrew Lunn,
Florian Fainelli, Heiner Kallweit
Cc: xe-linux-external, David S. Miller, linux-i2c, linux-acpi,
linux-kernel, netdev
Signed-off-by: Ruslan Babayev <ruslan@babayev.com>
Cc: xe-linux-external@cisco.com
---
drivers/i2c/i2c-core-acpi.c | 3 ++-
drivers/net/phy/sfp.c | 33 +++++++++++++++++++++++++--------
include/linux/i2c.h | 6 ++++++
3 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
index 272800692088..964687534754 100644
--- a/drivers/i2c/i2c-core-acpi.c
+++ b/drivers/i2c/i2c-core-acpi.c
@@ -337,7 +337,7 @@ static int i2c_acpi_find_match_device(struct device *dev, void *data)
return ACPI_COMPANION(dev) == data;
}
-static struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle)
+struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle)
{
struct device *dev;
@@ -345,6 +345,7 @@ static struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle)
i2c_acpi_find_match_adapter);
return dev ? i2c_verify_adapter(dev) : NULL;
}
+EXPORT_SYMBOL_GPL(i2c_acpi_find_adapter_by_handle);
static struct i2c_client *i2c_acpi_find_client_by_adev(struct acpi_device *adev)
{
diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
index d4635c2178d1..7a6c8df8899b 100644
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -9,6 +9,7 @@
#include <linux/module.h>
#include <linux/mutex.h>
#include <linux/of.h>
+#include <linux/acpi.h>
#include <linux/phy.h>
#include <linux/platform_device.h>
#include <linux/rtnetlink.h>
@@ -1783,6 +1784,7 @@ static int sfp_probe(struct platform_device *pdev)
{
const struct sff_data *sff;
struct sfp *sfp;
+ struct i2c_adapter *i2c = NULL;
bool poll = false;
int irq, err, i;
@@ -1801,7 +1803,6 @@ static int sfp_probe(struct platform_device *pdev)
if (pdev->dev.of_node) {
struct device_node *node = pdev->dev.of_node;
const struct of_device_id *id;
- struct i2c_adapter *i2c;
struct device_node *np;
id = of_match_node(sfp_of_match, node);
@@ -1818,14 +1819,30 @@ static int sfp_probe(struct platform_device *pdev)
i2c = of_find_i2c_adapter_by_node(np);
of_node_put(np);
- if (!i2c)
- return -EPROBE_DEFER;
-
- err = sfp_i2c_configure(sfp, i2c);
- if (err < 0) {
- i2c_put_adapter(i2c);
- return err;
+ } else if (ACPI_COMPANION(&pdev->dev)) {
+ struct acpi_device *adev = ACPI_COMPANION(&pdev->dev);
+ struct fwnode_handle *fw = acpi_fwnode_handle(adev);
+ struct fwnode_reference_args args;
+ struct acpi_handle *acpi_handle;
+ int ret;
+
+ ret = acpi_node_get_property_reference(fw, "i2c-bus", 0, &args);
+ if (ACPI_FAILURE(ret) || !is_acpi_device_node(args.fwnode)) {
+ dev_err(&pdev->dev, "missing 'i2c-bus' property\n");
+ return -ENODEV;
}
+
+ acpi_handle = ACPI_HANDLE_FWNODE(args.fwnode);
+ i2c = i2c_acpi_find_adapter_by_handle(acpi_handle);
+ }
+
+ if (!i2c)
+ return -EPROBE_DEFER;
+
+ err = sfp_i2c_configure(sfp, i2c);
+ if (err < 0) {
+ i2c_put_adapter(i2c);
+ return err;
}
for (i = 0; i < GPIO_MAX; i++)
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 383510b4f083..24859a26f167 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -33,6 +33,7 @@
#include <linux/rtmutex.h>
#include <linux/irqdomain.h> /* for Host Notify IRQ */
#include <linux/of.h> /* for struct device_node */
+#include <linux/acpi.h> /* for acpi_handle */
#include <linux/swab.h> /* for swab16 */
#include <uapi/linux/i2c.h>
@@ -977,6 +978,7 @@ bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares,
u32 i2c_acpi_find_bus_speed(struct device *dev);
struct i2c_client *i2c_acpi_new_device(struct device *dev, int index,
struct i2c_board_info *info);
+struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle);
#else
static inline bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares,
struct acpi_resource_i2c_serialbus **i2c)
@@ -992,6 +994,10 @@ static inline struct i2c_client *i2c_acpi_new_device(struct device *dev,
{
return NULL;
}
+struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle)
+{
+ return NULL;
+}
#endif /* CONFIG_ACPI */
#endif /* _LINUX_I2C_H */
--
2.17.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH] net: phy: sfp: enable i2c-bus detection on ACPI based systems
2019-05-05 19:34 [PATCH] net: phy: sfp: enable i2c-bus detection on ACPI based systems Ruslan Babayev
@ 2019-05-05 19:51 ` Heiner Kallweit
2019-05-05 20:51 ` [PATCH 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle Ruslan Babayev
` (3 subsequent siblings)
4 siblings, 0 replies; 13+ messages in thread
From: Heiner Kallweit @ 2019-05-05 19:51 UTC (permalink / raw)
To: Ruslan Babayev, Wolfram Sang, Mika Westerberg, Russell King,
Andrew Lunn, Florian Fainelli
Cc: xe-linux-external, David S. Miller, linux-i2c, linux-acpi,
linux-kernel, netdev
On 05.05.2019 21:34, Ruslan Babayev wrote:
> Signed-off-by: Ruslan Babayev <ruslan@babayev.com>
> Cc: xe-linux-external@cisco.com
> ---
> drivers/i2c/i2c-core-acpi.c | 3 ++-
> drivers/net/phy/sfp.c | 33 +++++++++++++++++++++++++--------
> include/linux/i2c.h | 6 ++++++
> 3 files changed, 33 insertions(+), 9 deletions(-)
>
Regarding the formal part:
- It should be [PATCH net-next]
- Commit description is missing (scripts/checkpatch.pl should have complained)
And maybe it would be better to split exporting i2c_acpi_find_adapter_by_handle
and extending sfp.c to two patches. If Wolfram acks the i2c patch, then I think
the series could go through the netdev tree. Eventually up to David.
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle
2019-05-05 19:34 [PATCH] net: phy: sfp: enable i2c-bus detection on ACPI based systems Ruslan Babayev
2019-05-05 19:51 ` Heiner Kallweit
@ 2019-05-05 20:51 ` Ruslan Babayev
2019-05-05 20:51 ` [PATCH 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems Ruslan Babayev
` (2 subsequent siblings)
4 siblings, 0 replies; 13+ messages in thread
From: Ruslan Babayev @ 2019-05-05 20:51 UTC (permalink / raw)
To: Mika Westerberg, Wolfram Sang
Cc: xe-linux-external, linux-i2c, linux-acpi, linux-kernel
This allows drivers to lookup i2c adapters on ACPI based systems similar to
of_get_i2c_adapter_by_node() with DT based systems.
Signed-off-by: Ruslan Babayev <ruslan@babayev.com>
Cc: xe-linux-external@cisco.com
---
drivers/i2c/i2c-core-acpi.c | 3 ++-
include/linux/i2c.h | 6 ++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
index 272800692088..964687534754 100644
--- a/drivers/i2c/i2c-core-acpi.c
+++ b/drivers/i2c/i2c-core-acpi.c
@@ -337,7 +337,7 @@ static int i2c_acpi_find_match_device(struct device *dev, void *data)
return ACPI_COMPANION(dev) == data;
}
-static struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle)
+struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle)
{
struct device *dev;
@@ -345,6 +345,7 @@ static struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle)
i2c_acpi_find_match_adapter);
return dev ? i2c_verify_adapter(dev) : NULL;
}
+EXPORT_SYMBOL_GPL(i2c_acpi_find_adapter_by_handle);
static struct i2c_client *i2c_acpi_find_client_by_adev(struct acpi_device *adev)
{
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 383510b4f083..24859a26f167 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -33,6 +33,7 @@
#include <linux/rtmutex.h>
#include <linux/irqdomain.h> /* for Host Notify IRQ */
#include <linux/of.h> /* for struct device_node */
+#include <linux/acpi.h> /* for acpi_handle */
#include <linux/swab.h> /* for swab16 */
#include <uapi/linux/i2c.h>
@@ -977,6 +978,7 @@ bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares,
u32 i2c_acpi_find_bus_speed(struct device *dev);
struct i2c_client *i2c_acpi_new_device(struct device *dev, int index,
struct i2c_board_info *info);
+struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle);
#else
static inline bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares,
struct acpi_resource_i2c_serialbus **i2c)
@@ -992,6 +994,10 @@ static inline struct i2c_client *i2c_acpi_new_device(struct device *dev,
{
return NULL;
}
+struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle)
+{
+ return NULL;
+}
#endif /* CONFIG_ACPI */
#endif /* _LINUX_I2C_H */
--
2.17.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems
2019-05-05 19:34 [PATCH] net: phy: sfp: enable i2c-bus detection on ACPI based systems Ruslan Babayev
2019-05-05 19:51 ` Heiner Kallweit
2019-05-05 20:51 ` [PATCH 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle Ruslan Babayev
@ 2019-05-05 20:51 ` Ruslan Babayev
2019-05-05 21:03 ` Heiner Kallweit
2019-05-25 0:53 ` [PATCH net-next v2 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle Ruslan Babayev
2019-05-25 0:53 ` [PATCH net-next v2 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems Ruslan Babayev
4 siblings, 1 reply; 13+ messages in thread
From: Ruslan Babayev @ 2019-05-05 20:51 UTC (permalink / raw)
To: Russell King, Andrew Lunn, Florian Fainelli, Heiner Kallweit
Cc: xe-linux-external, David S. Miller, netdev, linux-kernel
Lookup I2C adapter using the "i2c-bus" device property on ACPI based
systems similar to how it's done with DT.
An example DSD describing an SFP on an ACPI based system:
Device (SFP0)
{
Name (_HID, "PRP0001")
Name (_DSD, Package ()
{
ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
Package () {
Package () { "compatible", "sff,sfp" },
Package () { "i2c-bus", \_SB.PCI0.RP01.I2C.MUX.CH0 },
},
})
}
Signed-off-by: Ruslan Babayev <ruslan@babayev.com>
Cc: xe-linux-external@cisco.com
---
drivers/net/phy/sfp.c | 33 +++++++++++++++++++++++++--------
1 file changed, 25 insertions(+), 8 deletions(-)
diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
index d4635c2178d1..7a6c8df8899b 100644
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -9,6 +9,7 @@
#include <linux/module.h>
#include <linux/mutex.h>
#include <linux/of.h>
+#include <linux/acpi.h>
#include <linux/phy.h>
#include <linux/platform_device.h>
#include <linux/rtnetlink.h>
@@ -1783,6 +1784,7 @@ static int sfp_probe(struct platform_device *pdev)
{
const struct sff_data *sff;
struct sfp *sfp;
+ struct i2c_adapter *i2c = NULL;
bool poll = false;
int irq, err, i;
@@ -1801,7 +1803,6 @@ static int sfp_probe(struct platform_device *pdev)
if (pdev->dev.of_node) {
struct device_node *node = pdev->dev.of_node;
const struct of_device_id *id;
- struct i2c_adapter *i2c;
struct device_node *np;
id = of_match_node(sfp_of_match, node);
@@ -1818,14 +1819,30 @@ static int sfp_probe(struct platform_device *pdev)
i2c = of_find_i2c_adapter_by_node(np);
of_node_put(np);
- if (!i2c)
- return -EPROBE_DEFER;
-
- err = sfp_i2c_configure(sfp, i2c);
- if (err < 0) {
- i2c_put_adapter(i2c);
- return err;
+ } else if (ACPI_COMPANION(&pdev->dev)) {
+ struct acpi_device *adev = ACPI_COMPANION(&pdev->dev);
+ struct fwnode_handle *fw = acpi_fwnode_handle(adev);
+ struct fwnode_reference_args args;
+ struct acpi_handle *acpi_handle;
+ int ret;
+
+ ret = acpi_node_get_property_reference(fw, "i2c-bus", 0, &args);
+ if (ACPI_FAILURE(ret) || !is_acpi_device_node(args.fwnode)) {
+ dev_err(&pdev->dev, "missing 'i2c-bus' property\n");
+ return -ENODEV;
}
+
+ acpi_handle = ACPI_HANDLE_FWNODE(args.fwnode);
+ i2c = i2c_acpi_find_adapter_by_handle(acpi_handle);
+ }
+
+ if (!i2c)
+ return -EPROBE_DEFER;
+
+ err = sfp_i2c_configure(sfp, i2c);
+ if (err < 0) {
+ i2c_put_adapter(i2c);
+ return err;
}
for (i = 0; i < GPIO_MAX; i++)
--
2.17.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems
2019-05-05 20:51 ` [PATCH 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems Ruslan Babayev
@ 2019-05-05 21:03 ` Heiner Kallweit
0 siblings, 0 replies; 13+ messages in thread
From: Heiner Kallweit @ 2019-05-05 21:03 UTC (permalink / raw)
To: Ruslan Babayev, Russell King, Andrew Lunn, Florian Fainelli
Cc: xe-linux-external, David S. Miller, netdev, linux-kernel
On 05.05.2019 22:51, Ruslan Babayev wrote:
> Lookup I2C adapter using the "i2c-bus" device property on ACPI based
> systems similar to how it's done with DT.
>
> An example DSD describing an SFP on an ACPI based system:
>
> Device (SFP0)
> {
> Name (_HID, "PRP0001")
> Name (_DSD, Package ()
> {
> ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
> Package () {
> Package () { "compatible", "sff,sfp" },
> Package () { "i2c-bus", \_SB.PCI0.RP01.I2C.MUX.CH0 },
> },
> })
> }
>
> Signed-off-by: Ruslan Babayev <ruslan@babayev.com>
> Cc: xe-linux-external@cisco.com
> ---
> drivers/net/phy/sfp.c | 33 +++++++++++++++++++++++++--------
> 1 file changed, 25 insertions(+), 8 deletions(-)
>
If we have a patch series touching more than one sub-system a typical
approach is:
- Send series to all persons / lists being responsible for the affected
subsystems
- Maintainers will agree through which tree the series will go
- Maintainers of the other subsystems will ACK their respective patches
of the series
I just received patch 2/2. The complete series (cover letter + two patches)
should have gone to i2c and phylib maintainers + lists.
As an additional hint regarding the commit message:
I suppose you added this code to support a specific device. Wouldn't hurt
if you mention which device it is.
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH net-next v2 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle
2019-05-05 19:34 [PATCH] net: phy: sfp: enable i2c-bus detection on ACPI based systems Ruslan Babayev
` (2 preceding siblings ...)
2019-05-05 20:51 ` [PATCH 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems Ruslan Babayev
@ 2019-05-25 0:53 ` Ruslan Babayev
2019-05-27 8:39 ` Mika Westerberg
2019-05-27 18:47 ` Wolfram Sang
2019-05-25 0:53 ` [PATCH net-next v2 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems Ruslan Babayev
4 siblings, 2 replies; 13+ messages in thread
From: Ruslan Babayev @ 2019-05-25 0:53 UTC (permalink / raw)
To: Mika Westerberg, Wolfram Sang
Cc: xe-linux-external, linux-i2c, linux-acpi, linux-kernel
This allows drivers to lookup i2c adapters on ACPI based systems similar to
of_get_i2c_adapter_by_node() with DT based systems.
Signed-off-by: Ruslan Babayev <ruslan@babayev.com>
Cc: xe-linux-external@cisco.com
---
drivers/i2c/i2c-core-acpi.c | 3 ++-
include/linux/i2c.h | 6 ++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/i2c/i2c-core-acpi.c b/drivers/i2c/i2c-core-acpi.c
index 272800692088..964687534754 100644
--- a/drivers/i2c/i2c-core-acpi.c
+++ b/drivers/i2c/i2c-core-acpi.c
@@ -337,7 +337,7 @@ static int i2c_acpi_find_match_device(struct device *dev, void *data)
return ACPI_COMPANION(dev) == data;
}
-static struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle)
+struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle)
{
struct device *dev;
@@ -345,6 +345,7 @@ static struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle)
i2c_acpi_find_match_adapter);
return dev ? i2c_verify_adapter(dev) : NULL;
}
+EXPORT_SYMBOL_GPL(i2c_acpi_find_adapter_by_handle);
static struct i2c_client *i2c_acpi_find_client_by_adev(struct acpi_device *adev)
{
diff --git a/include/linux/i2c.h b/include/linux/i2c.h
index 1308126fc384..78f7d39ea5bc 100644
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
@@ -21,6 +21,7 @@
#include <linux/rtmutex.h>
#include <linux/irqdomain.h> /* for Host Notify IRQ */
#include <linux/of.h> /* for struct device_node */
+#include <linux/acpi.h> /* for acpi_handle */
#include <linux/swab.h> /* for swab16 */
#include <uapi/linux/i2c.h>
@@ -981,6 +982,7 @@ bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares,
u32 i2c_acpi_find_bus_speed(struct device *dev);
struct i2c_client *i2c_acpi_new_device(struct device *dev, int index,
struct i2c_board_info *info);
+struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle);
#else
static inline bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares,
struct acpi_resource_i2c_serialbus **i2c)
@@ -996,6 +998,10 @@ static inline struct i2c_client *i2c_acpi_new_device(struct device *dev,
{
return NULL;
}
+struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle)
+{
+ return NULL;
+}
#endif /* CONFIG_ACPI */
#endif /* _LINUX_I2C_H */
--
2.17.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [PATCH net-next v2 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems
2019-05-05 19:34 [PATCH] net: phy: sfp: enable i2c-bus detection on ACPI based systems Ruslan Babayev
` (3 preceding siblings ...)
2019-05-25 0:53 ` [PATCH net-next v2 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle Ruslan Babayev
@ 2019-05-25 0:53 ` Ruslan Babayev
2019-05-25 1:04 ` Andrew Lunn
2019-05-27 5:14 ` David Miller
4 siblings, 2 replies; 13+ messages in thread
From: Ruslan Babayev @ 2019-05-25 0:53 UTC (permalink / raw)
To: Russell King, Andrew Lunn, Florian Fainelli, Heiner Kallweit
Cc: xe-linux-external, David S. Miller, netdev, linux-kernel
Lookup I2C adapter using the "i2c-bus" device property on ACPI based
systems similar to how it's done with DT.
An example DSD describing an SFP on an ACPI based system:
Device (SFP0)
{
Name (_HID, "PRP0001")
Name (_CRS, ResourceTemplate()
{
GpioIo(Exclusive, PullDefault, 0, 0, IoRestrictionNone,
"\\_SB.PCI0.RP01.GPIO", 0, ResourceConsumer)
{ 0, 1, 2, 3, 4 }
})
Name (_DSD, Package ()
{
ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
Package () {
Package () { "compatible", "sff,sfp" },
Package () { "i2c-bus", \_SB.PCI0.RP01.I2C.MUX.CH0 },
Package () { "maximum-power-milliwatt", 1000 },
Package () { "tx-disable-gpios", Package () { ^SFP0, 0, 0, 1} },
Package () { "reset-gpio", Package () { ^SFP0, 0, 1, 1} },
Package () { "mod-def0-gpios", Package () { ^SFP0, 0, 2, 1} },
Package () { "tx-fault-gpios", Package () { ^SFP0, 0, 3, 0} },
Package () { "los-gpios", Package () { ^SFP0, 0, 4, 1} },
},
})
}
Device (PHY0)
{
Name (_HID, "PRP0001")
Name (_DSD, Package ()
{
ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
Package () {
Package () { "compatible", "ethernet-phy-ieee802.3-c45" },
Package () { "sfp", \_SB.PCI0.RP01.SFP0 },
Package () { "managed", "in-band-status" },
Package () { "phy-mode", "sgmii" },
},
})
}
Signed-off-by: Ruslan Babayev <ruslan@babayev.com>
Cc: xe-linux-external@cisco.com
---
drivers/net/phy/sfp.c | 33 +++++++++++++++++++++++++--------
1 file changed, 25 insertions(+), 8 deletions(-)
diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
index d4635c2178d1..7a6c8df8899b 100644
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -9,6 +9,7 @@
#include <linux/module.h>
#include <linux/mutex.h>
#include <linux/of.h>
+#include <linux/acpi.h>
#include <linux/phy.h>
#include <linux/platform_device.h>
#include <linux/rtnetlink.h>
@@ -1783,6 +1784,7 @@ static int sfp_probe(struct platform_device *pdev)
{
const struct sff_data *sff;
struct sfp *sfp;
+ struct i2c_adapter *i2c = NULL;
bool poll = false;
int irq, err, i;
@@ -1801,7 +1803,6 @@ static int sfp_probe(struct platform_device *pdev)
if (pdev->dev.of_node) {
struct device_node *node = pdev->dev.of_node;
const struct of_device_id *id;
- struct i2c_adapter *i2c;
struct device_node *np;
id = of_match_node(sfp_of_match, node);
@@ -1818,14 +1819,30 @@ static int sfp_probe(struct platform_device *pdev)
i2c = of_find_i2c_adapter_by_node(np);
of_node_put(np);
- if (!i2c)
- return -EPROBE_DEFER;
-
- err = sfp_i2c_configure(sfp, i2c);
- if (err < 0) {
- i2c_put_adapter(i2c);
- return err;
+ } else if (ACPI_COMPANION(&pdev->dev)) {
+ struct acpi_device *adev = ACPI_COMPANION(&pdev->dev);
+ struct fwnode_handle *fw = acpi_fwnode_handle(adev);
+ struct fwnode_reference_args args;
+ struct acpi_handle *acpi_handle;
+ int ret;
+
+ ret = acpi_node_get_property_reference(fw, "i2c-bus", 0, &args);
+ if (ACPI_FAILURE(ret) || !is_acpi_device_node(args.fwnode)) {
+ dev_err(&pdev->dev, "missing 'i2c-bus' property\n");
+ return -ENODEV;
}
+
+ acpi_handle = ACPI_HANDLE_FWNODE(args.fwnode);
+ i2c = i2c_acpi_find_adapter_by_handle(acpi_handle);
+ }
+
+ if (!i2c)
+ return -EPROBE_DEFER;
+
+ err = sfp_i2c_configure(sfp, i2c);
+ if (err < 0) {
+ i2c_put_adapter(i2c);
+ return err;
}
for (i = 0; i < GPIO_MAX; i++)
--
2.17.1
^ permalink raw reply related [flat|nested] 13+ messages in thread
* Re: [PATCH net-next v2 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems
2019-05-25 0:53 ` [PATCH net-next v2 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems Ruslan Babayev
@ 2019-05-25 1:04 ` Andrew Lunn
2019-05-27 5:14 ` David Miller
1 sibling, 0 replies; 13+ messages in thread
From: Andrew Lunn @ 2019-05-25 1:04 UTC (permalink / raw)
To: Ruslan Babayev
Cc: Russell King, Florian Fainelli, Heiner Kallweit,
xe-linux-external, David S. Miller, netdev, linux-kernel
On Fri, May 24, 2019 at 05:53:02PM -0700, Ruslan Babayev wrote:
> Lookup I2C adapter using the "i2c-bus" device property on ACPI based
> systems similar to how it's done with DT.
>
> An example DSD describing an SFP on an ACPI based system:
>
> Device (SFP0)
> {
> Name (_HID, "PRP0001")
> Name (_CRS, ResourceTemplate()
> {
> GpioIo(Exclusive, PullDefault, 0, 0, IoRestrictionNone,
> "\\_SB.PCI0.RP01.GPIO", 0, ResourceConsumer)
> { 0, 1, 2, 3, 4 }
> })
> Name (_DSD, Package ()
> {
> ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
> Package () {
> Package () { "compatible", "sff,sfp" },
> Package () { "i2c-bus", \_SB.PCI0.RP01.I2C.MUX.CH0 },
> Package () { "maximum-power-milliwatt", 1000 },
> Package () { "tx-disable-gpios", Package () { ^SFP0, 0, 0, 1} },
> Package () { "reset-gpio", Package () { ^SFP0, 0, 1, 1} },
> Package () { "mod-def0-gpios", Package () { ^SFP0, 0, 2, 1} },
> Package () { "tx-fault-gpios", Package () { ^SFP0, 0, 3, 0} },
> Package () { "los-gpios", Package () { ^SFP0, 0, 4, 1} },
> },
> })
> }
>
> Device (PHY0)
> {
> Name (_HID, "PRP0001")
> Name (_DSD, Package ()
> {
> ToUUID ("daffd814-6eba-4d8c-8a91-bc9bbf4aa301"),
> Package () {
> Package () { "compatible", "ethernet-phy-ieee802.3-c45" },
> Package () { "sfp", \_SB.PCI0.RP01.SFP0 },
> Package () { "managed", "in-band-status" },
> Package () { "phy-mode", "sgmii" },
> },
> })
> }
>
> Signed-off-by: Ruslan Babayev <ruslan@babayev.com>
> Cc: xe-linux-external@cisco.com
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Andrew
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH net-next v2 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems
2019-05-25 0:53 ` [PATCH net-next v2 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems Ruslan Babayev
2019-05-25 1:04 ` Andrew Lunn
@ 2019-05-27 5:14 ` David Miller
1 sibling, 0 replies; 13+ messages in thread
From: David Miller @ 2019-05-27 5:14 UTC (permalink / raw)
To: ruslan
Cc: linux, andrew, f.fainelli, hkallweit1, xe-linux-external, netdev,
linux-kernel
From: Ruslan Babayev <ruslan@babayev.com>
Date: Fri, 24 May 2019 17:53:02 -0700
> Lookup I2C adapter using the "i2c-bus" device property on ACPI based
> systems similar to how it's done with DT.
>
> An example DSD describing an SFP on an ACPI based system:
I don't see patch #1.
Please repost with both patches and your cover letter CC:'d to netdev.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH net-next v2 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle
2019-05-25 0:53 ` [PATCH net-next v2 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle Ruslan Babayev
@ 2019-05-27 8:39 ` Mika Westerberg
2019-05-28 2:26 ` Ruslan Babayev
2019-05-27 18:47 ` Wolfram Sang
1 sibling, 1 reply; 13+ messages in thread
From: Mika Westerberg @ 2019-05-27 8:39 UTC (permalink / raw)
To: Ruslan Babayev
Cc: Wolfram Sang, xe-linux-external, linux-i2c, linux-acpi, linux-kernel
On Fri, May 24, 2019 at 05:53:01PM -0700, Ruslan Babayev wrote:
> +struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle);
> #else
> static inline bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares,
> struct acpi_resource_i2c_serialbus **i2c)
> @@ -996,6 +998,10 @@ static inline struct i2c_client *i2c_acpi_new_device(struct device *dev,
> {
> return NULL;
> }
> +struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle)
This should be static inline, I think.
> +{
> + return NULL;
> +}
> #endif /* CONFIG_ACPI */
>
> #endif /* _LINUX_I2C_H */
> --
> 2.17.1
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH net-next v2 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle
2019-05-25 0:53 ` [PATCH net-next v2 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle Ruslan Babayev
2019-05-27 8:39 ` Mika Westerberg
@ 2019-05-27 18:47 ` Wolfram Sang
2019-05-28 2:03 ` Ruslan Babayev
1 sibling, 1 reply; 13+ messages in thread
From: Wolfram Sang @ 2019-05-27 18:47 UTC (permalink / raw)
To: Ruslan Babayev
Cc: Mika Westerberg, xe-linux-external, linux-i2c, linux-acpi, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1703 bytes --]
On Fri, May 24, 2019 at 05:53:01PM -0700, Ruslan Babayev wrote:
> This allows drivers to lookup i2c adapters on ACPI based systems similar to
> of_get_i2c_adapter_by_node() with DT based systems.
>
> Signed-off-by: Ruslan Babayev <ruslan@babayev.com>
> Cc: xe-linux-external@cisco.com
Please have a look how your patches look in my inbox:
May 05 Ruslan Babayev ( 129) [PATCH] net: phy: sfp: enable i2c-bus detection on ACPI based systems
May 05 Ruslan Babayev ( 65) ├─>[PATCH 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle
May 24 Ruslan Babayev ( 65) └─>[PATCH net-next v2 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle
May 05 Ruslan Babayev ( 65) [PATCH net-next 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle
May 06 Ruslan Babayev ( 3) ├─>[PATCH RFC v2 net-next] Enable SFP support on ACPI
May 06 Ruslan Babayev ( 65) ├─>[PATCH RFC v2 net-next 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle
May 06 Ruslan Babayev ( 120) └─>[PATCH RFC v2 net-next 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems
May 07 Ruslan Babayev ( 154) └─&─>
May 07 Ruslan Babayev ( 10) └─>
May 22 Ruslan Babayev ( 29) └─>
May 05 Ruslan Babayev ( 93) [PATCH net-next 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems
May 06 Ruslan Babayev ( 25) ├─&─>
May 06 Ruslan Babayev ( 99) └─&─>
This is highly confusing, and super hard to find out which patches belong
together. v2 2/2 seems even missing. Please resend this as a new series without
any in-reply-to, and a fresh cover-letter, so I know which one to apply to my
tree.
Thanks,
Wolfram
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH net-next v2 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle
2019-05-27 18:47 ` Wolfram Sang
@ 2019-05-28 2:03 ` Ruslan Babayev
0 siblings, 0 replies; 13+ messages in thread
From: Ruslan Babayev @ 2019-05-28 2:03 UTC (permalink / raw)
To: Wolfram Sang
Cc: Ruslan Babayev, Mika Westerberg, xe-linux-external, linux-i2c,
linux-acpi, linux-kernel
Wolfram Sang writes:
> On Fri, May 24, 2019 at 05:53:01PM -0700, Ruslan Babayev wrote:
>> This allows drivers to lookup i2c adapters on ACPI based systems similar to
>> of_get_i2c_adapter_by_node() with DT based systems.
>>
>> Signed-off-by: Ruslan Babayev <ruslan@babayev.com>
>> Cc: xe-linux-external@cisco.com
>
> Please have a look how your patches look in my inbox:
>
> May 05 Ruslan Babayev ( 129) [PATCH] net: phy: sfp: enable i2c-bus detection on ACPI based systems
> May 05 Ruslan Babayev ( 65) ├─>[PATCH 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle
> May 24 Ruslan Babayev ( 65) └─>[PATCH net-next v2 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle
> May 05 Ruslan Babayev ( 65) [PATCH net-next 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle
> May 06 Ruslan Babayev ( 3) ├─>[PATCH RFC v2 net-next] Enable SFP support on ACPI
> May 06 Ruslan Babayev ( 65) ├─>[PATCH RFC v2 net-next 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle
> May 06 Ruslan Babayev ( 120) └─>[PATCH RFC v2 net-next 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems
> May 07 Ruslan Babayev ( 154) └─&─>
> May 07 Ruslan Babayev ( 10) └─>
> May 22 Ruslan Babayev ( 29) └─>
> May 05 Ruslan Babayev ( 93) [PATCH net-next 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems
> May 06 Ruslan Babayev ( 25) ├─&─>
> May 06 Ruslan Babayev ( 99) └─&─>
>
> This is highly confusing, and super hard to find out which patches belong
> together. v2 2/2 seems even missing. Please resend this as a new series without
> any in-reply-to, and a fresh cover-letter, so I know which one to apply to my
> tree.
>
> Thanks,
>
> Wolfram
Will do, sorry about that.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH net-next v2 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle
2019-05-27 8:39 ` Mika Westerberg
@ 2019-05-28 2:26 ` Ruslan Babayev
0 siblings, 0 replies; 13+ messages in thread
From: Ruslan Babayev @ 2019-05-28 2:26 UTC (permalink / raw)
To: Mika Westerberg
Cc: Ruslan Babayev, Wolfram Sang, xe-linux-external, linux-i2c,
linux-acpi, linux-kernel
Mika Westerberg writes:
> On Fri, May 24, 2019 at 05:53:01PM -0700, Ruslan Babayev wrote:
>> +struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle);
>> #else
>> static inline bool i2c_acpi_get_i2c_resource(struct acpi_resource *ares,
>> struct acpi_resource_i2c_serialbus **i2c)
>> @@ -996,6 +998,10 @@ static inline struct i2c_client *i2c_acpi_new_device(struct device *dev,
>> {
>> return NULL;
>> }
>> +struct i2c_adapter *i2c_acpi_find_adapter_by_handle(acpi_handle handle)
>
> This should be static inline, I think.
>
>> +{
>> + return NULL;
>> +}
>> #endif /* CONFIG_ACPI */
>>
>> #endif /* _LINUX_I2C_H */
>> --
>> 2.17.1
Thanks Mika, will make the change and repost the patches.
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2019-05-28 2:26 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-05 19:34 [PATCH] net: phy: sfp: enable i2c-bus detection on ACPI based systems Ruslan Babayev
2019-05-05 19:51 ` Heiner Kallweit
2019-05-05 20:51 ` [PATCH 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle Ruslan Babayev
2019-05-05 20:51 ` [PATCH 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems Ruslan Babayev
2019-05-05 21:03 ` Heiner Kallweit
2019-05-25 0:53 ` [PATCH net-next v2 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle Ruslan Babayev
2019-05-27 8:39 ` Mika Westerberg
2019-05-28 2:26 ` Ruslan Babayev
2019-05-27 18:47 ` Wolfram Sang
2019-05-28 2:03 ` Ruslan Babayev
2019-05-25 0:53 ` [PATCH net-next v2 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems Ruslan Babayev
2019-05-25 1:04 ` Andrew Lunn
2019-05-27 5:14 ` David Miller
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.