| Message ID | 20210616190759.2832033-6-mw@semihalf.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | ACPI MDIO support for Marvell controllers | expand |
| Context | Check | Description |
|---|---|---|
| netdev/cover_letter | success | Link |
| netdev/fixes_present | success | Link |
| netdev/patch_count | success | Link |
| netdev/tree_selection | success | Clearly marked for net-next |
| netdev/subject_prefix | success | Link |
| netdev/cc_maintainers | success | CCed 4 of 4 maintainers |
| netdev/source_inline | success | Was 0 now: 0 |
| netdev/verify_signedoff | success | Link |
| netdev/module_param | success | Was 0 now: 0 |
| netdev/build_32bit | success | Errors and warnings before: 0 this patch: 0 |
| netdev/kdoc | success | Errors and warnings before: 0 this patch: 0 |
| netdev/verify_fixes | success | Link |
| netdev/checkpatch | success | total: 0 errors, 0 warnings, 0 checks, 46 lines checked |
| netdev/build_allmodconfig_warn | success | Errors and warnings before: 0 this patch: 0 |
| netdev/header_inline | success | Link |
On Wed, Jun 16, 2021 at 09:07:57PM +0200, Marcin Wojtas wrote: > This patch introducing ACPI support for the mvmdio driver by adding > acpi_match_table with two entries: > > * "MRVL0100" for the SMI operation > * "MRVL0101" for the XSMI mode > > Also clk enabling is skipped, because the tables do not contain > such data and clock maintenance relies on the firmware. This last part seems to be no longer true. Andrew
śr., 16 cze 2021 o 21:51 Andrew Lunn <andrew@lunn.ch> napisał(a): > > On Wed, Jun 16, 2021 at 09:07:57PM +0200, Marcin Wojtas wrote: > > This patch introducing ACPI support for the mvmdio driver by adding > > acpi_match_table with two entries: > > > > * "MRVL0100" for the SMI operation > > * "MRVL0101" for the XSMI mode > > > > Also clk enabling is skipped, because the tables do not contain > > such data and clock maintenance relies on the firmware. > > This last part seems to be no longer true. > Well, it is still relies on firmware (no clocks are passed via ACPI), but skipping this enablement is hidden in the internals of devm_clk_bulk_get_optional() and clk_bulk_prepare_enable(). Best regards, Marcin
On Thu, Jun 17, 2021 at 12:37:06AM +0200, Marcin Wojtas wrote: > śr., 16 cze 2021 o 21:51 Andrew Lunn <andrew@lunn.ch> napisał(a): > > > > On Wed, Jun 16, 2021 at 09:07:57PM +0200, Marcin Wojtas wrote: > > > This patch introducing ACPI support for the mvmdio driver by adding > > > acpi_match_table with two entries: > > > > > > * "MRVL0100" for the SMI operation > > > * "MRVL0101" for the XSMI mode > > > > > > Also clk enabling is skipped, because the tables do not contain > > > such data and clock maintenance relies on the firmware. > > > > This last part seems to be no longer true. > > > > Well, it is still relies on firmware (no clocks are passed via ACPI), > but skipping this enablement is hidden in the internals of > devm_clk_bulk_get_optional() and clk_bulk_prepare_enable(). A quick grep in driver/clk does not reveal any ACPI code. Nor did i spot any generic clock code in drivers/acpi. So even if you did add clocks to the tables, i don't see how they would be used. Andrew
diff --git a/drivers/net/ethernet/marvell/mvmdio.c b/drivers/net/ethernet/marvell/mvmdio.c index ce3ddc867898..4fe6428b8119 100644 --- a/drivers/net/ethernet/marvell/mvmdio.c +++ b/drivers/net/ethernet/marvell/mvmdio.c @@ -17,8 +17,10 @@ * warranty of any kind, whether express or implied. */ +#include <linux/acpi.h> #include <linux/clk.h> #include <linux/delay.h> +#include <linux/fwnode_mdio.h> #include <linux/interrupt.h> #include <linux/io.h> #include <linux/kernel.h> @@ -283,7 +285,7 @@ static int orion_mdio_probe(struct platform_device *pdev) struct orion_mdio_dev *dev; int ret; - type = (enum orion_mdio_bus_type)of_device_get_match_data(&pdev->dev); + type = (enum orion_mdio_bus_type)device_get_match_data(&pdev->dev); r = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!r) { @@ -358,7 +360,7 @@ static int orion_mdio_probe(struct platform_device *pdev) goto out_mdio; } - ret = of_mdiobus_register(bus, pdev->dev.of_node); + ret = fwnode_mdiobus_register(bus, pdev->dev.fwnode); if (ret < 0) { dev_err(&pdev->dev, "Cannot register MDIO bus (%d)\n", ret); goto out_mdio; @@ -396,12 +398,20 @@ static const struct of_device_id orion_mdio_match[] = { }; MODULE_DEVICE_TABLE(of, orion_mdio_match); +static const struct acpi_device_id orion_mdio_acpi_match[] = { + { "MRVL0100", BUS_TYPE_SMI }, + { "MRVL0101", BUS_TYPE_XSMI }, + { }, +}; +MODULE_DEVICE_TABLE(acpi, orion_mdio_acpi_match); + static struct platform_driver orion_mdio_driver = { .probe = orion_mdio_probe, .remove = orion_mdio_remove, .driver = { .name = "orion-mdio", .of_match_table = orion_mdio_match, + .acpi_match_table = ACPI_PTR(orion_mdio_acpi_match), }, };
This patch introducing ACPI support for the mvmdio driver by adding acpi_match_table with two entries: * "MRVL0100" for the SMI operation * "MRVL0101" for the XSMI mode Also clk enabling is skipped, because the tables do not contain such data and clock maintenance relies on the firmware. Signed-off-by: Marcin Wojtas <mw@semihalf.com> --- drivers/net/ethernet/marvell/mvmdio.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)