* [PATCH net-next 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle @ 2019-05-05 22:05 Ruslan Babayev 2019-05-05 22:05 ` Ruslan Babayev ` (3 more replies) 0 siblings, 4 replies; 14+ messages in thread From: Ruslan Babayev @ 2019-05-05 22:05 UTC (permalink / raw) To: linux, andrew, f.fainelli, hkallweit1, mika.westerberg, wsa Cc: davem, netdev, linux-kernel, linux-i2c, linux-acpi, xe-linux-external 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] 14+ messages in thread
* [PATCH net-next 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle 2019-05-05 22:05 [PATCH net-next 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle Ruslan Babayev @ 2019-05-05 22:05 ` Ruslan Babayev 2019-05-07 0:35 ` [PATCH RFC v2 net-next] Enable SFP support on ACPI Ruslan Babayev ` (2 subsequent siblings) 3 siblings, 0 replies; 14+ messages in thread From: Ruslan Babayev @ 2019-05-05 22:05 UTC (permalink / raw) To: linux, andrew, f.fainelli, hkallweit1, mika.westerberg, wsa Cc: davem, netdev, linux-kernel, linux-i2c, linux-acpi, xe-linux-external 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] 14+ messages in thread
* [PATCH RFC v2 net-next] Enable SFP support on ACPI 2019-05-05 22:05 [PATCH net-next 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle Ruslan Babayev 2019-05-05 22:05 ` Ruslan Babayev @ 2019-05-07 0:35 ` Ruslan Babayev 2019-05-07 0:35 ` Ruslan Babayev 2019-05-07 0:35 ` [PATCH RFC v2 net-next 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle Ruslan Babayev 2019-05-07 0:35 ` [PATCH RFC v2 net-next 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems Ruslan Babayev 3 siblings, 1 reply; 14+ messages in thread From: Ruslan Babayev @ 2019-05-07 0:35 UTC (permalink / raw) To: linux, andrew, f.fainelli, hkallweit1, mika.westerberg, wsa, Andrew Morton Cc: davem, netdev, linux-kernel, linux-i2c, linux-acpi Change V2: - Added more ACPI device details in the commit message. ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH RFC v2 net-next] Enable SFP support on ACPI 2019-05-07 0:35 ` [PATCH RFC v2 net-next] Enable SFP support on ACPI Ruslan Babayev @ 2019-05-07 0:35 ` Ruslan Babayev 0 siblings, 0 replies; 14+ messages in thread From: Ruslan Babayev @ 2019-05-07 0:35 UTC (permalink / raw) To: linux, andrew, f.fainelli, hkallweit1, mika.westerberg, wsa, Andrew Morton Cc: davem, netdev, linux-kernel, linux-i2c, linux-acpi Change V2: - Added more ACPI device details in the commit message. ^ permalink raw reply [flat|nested] 14+ messages in thread
* [PATCH RFC v2 net-next 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle 2019-05-05 22:05 [PATCH net-next 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle Ruslan Babayev 2019-05-05 22:05 ` Ruslan Babayev 2019-05-07 0:35 ` [PATCH RFC v2 net-next] Enable SFP support on ACPI Ruslan Babayev @ 2019-05-07 0:35 ` Ruslan Babayev 2019-05-07 0:35 ` Ruslan Babayev 2019-05-07 0:35 ` [PATCH RFC v2 net-next 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems Ruslan Babayev 3 siblings, 1 reply; 14+ messages in thread From: Ruslan Babayev @ 2019-05-07 0:35 UTC (permalink / raw) To: linux, andrew, f.fainelli, hkallweit1, mika.westerberg, wsa Cc: davem, netdev, linux-kernel, linux-i2c, linux-acpi, xe-linux-external 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] 14+ messages in thread
* [PATCH RFC v2 net-next 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle 2019-05-07 0:35 ` [PATCH RFC v2 net-next 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle Ruslan Babayev @ 2019-05-07 0:35 ` Ruslan Babayev 0 siblings, 0 replies; 14+ messages in thread From: Ruslan Babayev @ 2019-05-07 0:35 UTC (permalink / raw) To: linux, andrew, f.fainelli, hkallweit1, mika.westerberg, wsa Cc: davem, netdev, linux-kernel, linux-i2c, linux-acpi, xe-linux-external 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] 14+ messages in thread
* [PATCH RFC v2 net-next 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems 2019-05-05 22:05 [PATCH net-next 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle Ruslan Babayev ` (2 preceding siblings ...) 2019-05-07 0:35 ` [PATCH RFC v2 net-next 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle Ruslan Babayev @ 2019-05-07 0:35 ` Ruslan Babayev 2019-05-07 0:35 ` Ruslan Babayev 2019-05-07 2:38 ` Andrew Lunn 3 siblings, 2 replies; 14+ messages in thread From: Ruslan Babayev @ 2019-05-07 0:35 UTC (permalink / raw) To: linux, andrew, f.fainelli, hkallweit1, mika.westerberg, wsa Cc: davem, netdev, linux-kernel, linux-i2c, linux-acpi, xe-linux-external 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] 14+ messages in thread
* [PATCH RFC v2 net-next 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems 2019-05-07 0:35 ` [PATCH RFC v2 net-next 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems Ruslan Babayev @ 2019-05-07 0:35 ` Ruslan Babayev 2019-05-07 2:38 ` Andrew Lunn 1 sibling, 0 replies; 14+ messages in thread From: Ruslan Babayev @ 2019-05-07 0:35 UTC (permalink / raw) To: linux, andrew, f.fainelli, hkallweit1, mika.westerberg, wsa Cc: davem, netdev, linux-kernel, linux-i2c, linux-acpi, xe-linux-external 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] 14+ messages in thread
* Re: [PATCH RFC v2 net-next 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems 2019-05-07 0:35 ` [PATCH RFC v2 net-next 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems Ruslan Babayev 2019-05-07 0:35 ` Ruslan Babayev @ 2019-05-07 2:38 ` Andrew Lunn 2019-05-07 2:38 ` Andrew Lunn 2019-05-07 3:15 ` Ruslan Babayev (fib) 1 sibling, 2 replies; 14+ messages in thread From: Andrew Lunn @ 2019-05-07 2:38 UTC (permalink / raw) To: 20190505220524.37266-2-ruslan Cc: linux, f.fainelli, hkallweit1, mika.westerberg, wsa, davem, netdev, linux-kernel, linux-i2c, linux-acpi, xe-linux-external On Mon, May 06, 2019 at 05:35:57PM -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} }, > }, As i said before, i know ~0 about ACPI. Does devm_gpiod_get() just work for ACPI? Thanks Andrew ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH RFC v2 net-next 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems 2019-05-07 2:38 ` Andrew Lunn @ 2019-05-07 2:38 ` Andrew Lunn 2019-05-07 3:15 ` Ruslan Babayev (fib) 1 sibling, 0 replies; 14+ messages in thread From: Andrew Lunn @ 2019-05-07 2:38 UTC (permalink / raw) To: 20190505220524.37266-2-ruslan Cc: linux, f.fainelli, hkallweit1, mika.westerberg, wsa, davem, netdev, linux-kernel, linux-i2c, linux-acpi, xe-linux-external On Mon, May 06, 2019 at 05:35:57PM -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} }, > }, As i said before, i know ~0 about ACPI. Does devm_gpiod_get() just work for ACPI? Thanks Andrew ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH RFC v2 net-next 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems 2019-05-07 2:38 ` Andrew Lunn 2019-05-07 2:38 ` Andrew Lunn @ 2019-05-07 3:15 ` Ruslan Babayev (fib) 2019-05-07 3:15 ` Ruslan Babayev (fib) 2019-05-22 19:29 ` Ruslan Babayev (fib) 1 sibling, 2 replies; 14+ messages in thread From: Ruslan Babayev (fib) @ 2019-05-07 3:15 UTC (permalink / raw) To: Andrew Lunn, 20190505220524.37266-2-ruslan Cc: linux, f.fainelli, hkallweit1, mika.westerberg, wsa, davem, netdev, linux-kernel, linux-i2c, linux-acpi, xe-linux-external(mailer list) > As i said before, i know ~0 about ACPI. Does devm_gpiod_get() just > work for ACPI? > Thanks > Andrew It does. Regards, Ruslan ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH RFC v2 net-next 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems 2019-05-07 3:15 ` Ruslan Babayev (fib) @ 2019-05-07 3:15 ` Ruslan Babayev (fib) 2019-05-22 19:29 ` Ruslan Babayev (fib) 1 sibling, 0 replies; 14+ messages in thread From: Ruslan Babayev (fib) @ 2019-05-07 3:15 UTC (permalink / raw) To: Andrew Lunn, 20190505220524.37266-2-ruslan Cc: linux, f.fainelli, hkallweit1, mika.westerberg, wsa, davem, netdev, linux-kernel, linux-i2c, linux-acpi, xe-linux-external(mailer list) > As i said before, i know ~0 about ACPI. Does devm_gpiod_get() just > work for ACPI? > Thanks > Andrew It does. Regards, Ruslan ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH RFC v2 net-next 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems 2019-05-07 3:15 ` Ruslan Babayev (fib) 2019-05-07 3:15 ` Ruslan Babayev (fib) @ 2019-05-22 19:29 ` Ruslan Babayev (fib) 2019-05-24 20:23 ` Andrew Lunn 1 sibling, 1 reply; 14+ messages in thread From: Ruslan Babayev (fib) @ 2019-05-22 19:29 UTC (permalink / raw) To: Andrew Lunn, 20190505220524.37266-2-ruslan Cc: linux, f.fainelli, hkallweit1, mika.westerberg, wsa, davem, netdev, linux-kernel, linux-i2c, linux-acpi, xe-linux-external(mailer list) Hi Andrew, Just wanted to follow up on the patch. Does it look good? Do you have any other feedback, concerns with this patch? Thanks, Ruslan ________________________________________ From: Ruslan Babayev (fib) Sent: Monday, May 6, 2019 8:15 PM To: Andrew Lunn; 20190505220524.37266-2-ruslan@babayev.com Cc: linux@armlinux.org.uk; f.fainelli@gmail.com; hkallweit1@gmail.com; mika.westerberg@linux.intel.com; wsa@the-dreams.de; davem@davemloft.net; netdev@vger.kernel.org; linux-kernel@vger.kernel.org; linux-i2c@vger.kernel.org; linux-acpi@vger.kernel.org; xe-linux-external(mailer list) Subject: Re: [PATCH RFC v2 net-next 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems > As i said before, i know ~0 about ACPI. Does devm_gpiod_get() just > work for ACPI? > Thanks > Andrew It does. Regards, Ruslan ^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH RFC v2 net-next 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems 2019-05-22 19:29 ` Ruslan Babayev (fib) @ 2019-05-24 20:23 ` Andrew Lunn 0 siblings, 0 replies; 14+ messages in thread From: Andrew Lunn @ 2019-05-24 20:23 UTC (permalink / raw) To: Ruslan Babayev (fib) Cc: 20190505220524.37266-2-ruslan, linux, f.fainelli, hkallweit1, mika.westerberg, wsa, davem, netdev, linux-kernel, linux-i2c, linux-acpi, xe-linux-external(mailer list) On Wed, May 22, 2019 at 07:29:06PM +0000, Ruslan Babayev (fib) wrote: > Hi Andrew, > > Just wanted to follow up on the patch. Does it look good? Do you have any other feedback, concerns with this patch? Hi Ruslan From what i remember, it is O.K. I will review it again when you repost it. Andrew ^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2019-05-24 20:23 UTC | newest] Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-05-05 22:05 [PATCH net-next 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle Ruslan Babayev 2019-05-05 22:05 ` Ruslan Babayev 2019-05-07 0:35 ` [PATCH RFC v2 net-next] Enable SFP support on ACPI Ruslan Babayev 2019-05-07 0:35 ` Ruslan Babayev 2019-05-07 0:35 ` [PATCH RFC v2 net-next 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle Ruslan Babayev 2019-05-07 0:35 ` Ruslan Babayev 2019-05-07 0:35 ` [PATCH RFC v2 net-next 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems Ruslan Babayev 2019-05-07 0:35 ` Ruslan Babayev 2019-05-07 2:38 ` Andrew Lunn 2019-05-07 2:38 ` Andrew Lunn 2019-05-07 3:15 ` Ruslan Babayev (fib) 2019-05-07 3:15 ` Ruslan Babayev (fib) 2019-05-22 19:29 ` Ruslan Babayev (fib) 2019-05-24 20:23 ` Andrew Lunn
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).