Enable SFP on ACPI based systems
Subsystems (8)
v4 cover Enable SFP on ACPI based systems
Changes:
v2:
- more descriptive commit body
v3:
- made 'i2c_acpi_find_adapter_by_handle' static inline
v4:
- don't initialize i2c_adapter to NULL. Instead see below...
- handle the case of neither DT nor ACPI present as invalid.
- alphabetical includes.
- use has_acpi_companion().
- use the same argument name in i2c_acpi_find_adapter_by_handle() in both stubbed and non-stubbed cases.
Ruslan Babayev (2):
i2c: acpi: export i2c_acpi_find_adapter_by_handle
net: phy: sfp: enable i2c-bus detection on ACPI based systems
drivers/i2c/i2c-core-acpi.c | 3 ++- drivers/net/phy/sfp.c | 35 +++++++++++++++++++++++++++-------- include/linux/i2c.h | 6 ++++++ 3 files changed, 35 insertions(+), 9 deletions(-)
Signature · 1 line
2.19.2
PATCH v4 1/2 i2c: acpi: export i2c_acpi_find_adapter_by_handle
This allows drivers to lookup i2c adapters on ACPI based systems similar to of_get_i2c_adapter_by_node() with DT based systems.
--- drivers/i2c/i2c-core-acpi.c | 3 ++- include/linux/i2c.h | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-)
drivers/i2c/i2c-core-acpi.c +2 -1
@@ -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) {
include/linux/i2c.h +6 -0
@@ -14,6 +14,7 @@#ifndef _LINUX_I2C_H#define _LINUX_I2C_H +#include <linux/acpi.h> /* for acpi_handle */ #include <linux/mod_devicetable.h> #include <linux/device.h> /* for struct device */ #include <linux/sched.h> /* for completion */
@@ -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 ; } +static inline struct i2c_adapter *i2c_acpi_find_adapter_by_handle (acpi_handle handle) +{ +return NULL ; +}#endif /* CONFIG_ACPI */ #endif /* _LINUX_I2C_H */
Signature · 1 line
2.19.2
Re: [net-next,v4 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle
Quoted 4 lines · Ruslan Babayev
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 <[email protected]>
Andrew
Re: [net-next,v4 1/2] i2c: acpi: export i2c_acpi_find_adapter_by_handle
In reply to Ruslan BabayevQuoted 5 lines · Ruslan Babayev
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 <[email protected]>
As mentioned elsewhere, applied to for-next, thanks!
PATCH v4 2/2 net: phy: sfp: enable i2c-bus detection on ACPI based systems
In reply to Ruslan BabayevLookup 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" },
},
})
}--- drivers/net/phy/sfp.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-)
drivers/net/phy/sfp.c +27 -8
@@ -1,4 +1,5 @@// SPDX-License-Identifier: GPL-2.0 +#include <linux/acpi.h> #include <linux/ctype.h> #include <linux/delay.h> #include <linux/gpio/consumer.h>
@@ -1782,6 +1783,7 @@ static void sfp_cleanup(void *data)static int sfp_probe (struct platform_device *pdev) {const struct sff_data *sff; +struct i2c_adapter *i2c;struct sfp *sfp;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,32 @@ 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 (has_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); + }else { +return -EINVAL ; + } + +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++)
Signature · 1 line
2.19.2
Re: [net-next,v4 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems
Quoted 45 lines · Ruslan Babayev
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" }, }, }) }
Quoted 2 lines
Signed-off-by Ruslan Babayev <[email protected]>
This looks fine now, thanks.
Quoted 74 lines
--- drivers/net/phy/sfp.c | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-)drivers/net/phy/sfp.c +27
-8@@ -1,4 +1,5 @@// SPDX-License-Identifier: GPL-2.0 +#include <linux/acpi.h> #include <linux/ctype.h> #include <linux/delay.h> #include <linux/gpio/consumer.h> @@ -1782,6 +1783,7 @@ static void sfp_cleanup(void *data)static int sfp_probe (struct platform_device *pdev) {const struct sff_data *sff; +struct i2c_adapter *i2c;struct sfp *sfp;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,32 @@ 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 (has_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); + }else { +return -EINVAL ; + } + +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++)Signature · 1 line
2.19.2
Signature · 3 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up According to speedtest.net: 11.9Mbps down 500kbps up
Re: [net-next,v4 2/2] net: phy: sfp: enable i2c-bus detection on ACPI based systems
In reply to Ruslan BabayevQuoted 45 lines · Ruslan Babayev
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" }, }, }) }
Quoted 2 lines
Signed-off-by Ruslan Babayev <[email protected]>
Andrew
Quoted 13 lines · Ruslan Babayev
Changes:
v2:
- more descriptive commit body
v3:
- made 'i2c_acpi_find_adapter_by_handle' static inline
v4:
- don't initializei2c_adapterto NULL. Instead see below...
- handle the case of neither DT nor ACPI present as invalid.
- alphabetical includes.
- usehas_acpi_companion().
- use the same argument name ini2c_acpi_find_adapter_by_handle()in both stubbed and non-stubbed cases.
Quoted 3 lines
Ruslan Babayev (2):
i2c: acpi: exporti2c_acpi_find_adapter_by_handle
net: phy: sfp: enable i2c-bus detection on ACPI based systems
For the series,
Andrew Lunn
maintainerQuoted 14 lines · Mika Westerberg
Quoted 13 lines · Ruslan Babayev
Changes:
v2:
- more descriptive commit body
v3:
- made 'i2c_acpi_find_adapter_by_handle' static inline
v4:
- don't initializei2c_adapterto NULL. Instead see below...
- handle the case of neither DT nor ACPI present as invalid.
- alphabetical includes.
- usehas_acpi_companion().
- use the same argument name ini2c_acpi_find_adapter_by_handle()in both stubbed and non-stubbed cases.
Quoted 7 lines
Quoted 3 lines
Ruslan Babayev (2):
i2c: acpi: exporti2c_acpi_find_adapter_by_handle
net: phy: sfp: enable i2c-bus detection on ACPI based systemsFor the series,
Reviewed-by Mika Westerberg <[email protected]>
Hi Mika
Are you happy for the i2c patch to be merged via net-next?
Andrew
Quoted 19 lines · Andrew Lunn
Quoted 18 lines · Mika Westerberg
Quoted 16 lines · Ruslan Babayev
Changes:
v2:
- more descriptive commit body
v3:
- made 'i2c_acpi_find_adapter_by_handle' static inline
v4:
- don't initializei2c_adapterto NULL. Instead see below...
- handle the case of neither DT nor ACPI present as invalid.
- alphabetical includes.
- usehas_acpi_companion().
- use the same argument name ini2c_acpi_find_adapter_by_handle()in both stubbed and non-stubbed cases.Ruslan Babayev (2):
i2c: acpi: exporti2c_acpi_find_adapter_by_handle
net: phy: sfp: enable i2c-bus detection on ACPI based systems
Quoted 7 lines
Quoted 3 lines
For the series,
Reviewed-by Mika Westerberg <[email protected]>Hi Mika
Are you happy for the i2c patch to be merged via net-next?
Yes, that's fine my me.
Wolfram do you have any objections?
Quoted 6 lines
Quoted 2 lines
Are you happy for the i2c patch to be merged via net-next?
Yes, that's fine my me.
Wolfram do you have any objections?
That's fine with me, I'd like an immutable branch, though. There are likely other changes to i2c.h coming and that would avoid merge conflicts.
Andrew Lunn
maintainerQuoted 10 lines · Wolfram Sang
Quoted 6 lines
Quoted 2 lines
Are you happy for the i2c patch to be merged via net-next?
Yes, that's fine my me.
Wolfram do you have any objections?
That's fine with me, I'd like an immutable branch, though. There are likely other changes to
i2c.hcoming and that would avoid merge conflicts.
Hi Wolfram
Davids Millers net-next is immutable, but large.
Maybe he can create a smaller immutable branch for you.
Andrew
Quoted 2 lines
Maybe he can create a smaller immutable branch for you.
Yeah, that's what I was basically asking for, but probably should reply to his mail.
David Miller
maintainerFrom: Ruslan Babayev <[email protected]>
Date: Tue, 28 May 2019 16:02:31 -0700
Quoted 4 lines
Changes:
v2:
- more descriptive commit body
v3:
Quoted 8 lines
- made '
i2c_acpi_find_adapter_by_handle' static inline
v4:
- don't initializei2c_adapterto NULL. Instead see below...
- handle the case of neither DT nor ACPI present as invalid.
- alphabetical includes.
- usehas_acpi_companion().
- use the same argument name ini2c_acpi_find_adapter_by_handle()in both stubbed and non-stubbed cases.
Series applied.
Hi David,
Quoted 1 line
Series applied.
Could you make a small immutable branch for me to pull into my I2C tree? I have some changes for i2c.h pending and want to minimize merge conflicts.
David Miller
maintainerFrom: Wolfram Sang <[email protected]>
Date: Fri, 31 May 2019 14:57:52 +0200
Quoted 5 lines
Quoted 1 line
Series applied.
Could you make a small immutable branch for me to pull into my I2C tree? I have some changes for
i2c.hpending and want to minimize merge conflicts.
I already put other changes into net-next and also just merged 'net' into 'net-next' and pushed that out to git.kernel.org, so I don't know how I can still do that for you.
If it's still possible I'm willing to learn just show me what to do :)
Russell King - ARM Linux admin
maintainerQuoted 9 lines · David Miller
From: Wolfram Sang <[email protected]>
Date: Fri, 31 May 2019 14:57:52 +0200Quoted 5 lines
Quoted 1 line
Series applied.
Could you make a small immutable branch for me to pull into my I2C tree? I have some changes for
i2c.hpending and want to minimize merge conflicts.
Quoted 5 lines
I already put other changes into net-next and also just merged 'net' into 'net-next' and pushed that out to git.kernel.org, so I don't know how I can still do that for you.
If it's still possible I'm willing to learn just show me what to do :)
i don't think it's possible - not with the changes having already been merged yesterday, and presumably published shortly thereafter.
The tree contains 231 other changes wrt 5.2-rc2 up to the requested point, which I doubt Wolfram will want.
Signature · 3 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line in suburbia: sync at 12.1Mbps down 622kbps up According to speedtest.net: 11.9Mbps down 500kbps up
Quoted 4 lines
I already put other changes into net-next and also just merged 'net' into 'net-next' and pushed that out to git.kernel.org, so I don't know how I can still do that for you.
Okay, it is just one patch. I will apply it to my tree as well. Should be good enough.