| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <55C467A0.4020601@linaro.org>
Date: Fri, 07 Aug 2015 10:09:04 +0200
From: Tomasz Nowicki <tomasz.nowicki@...aro.org>
To: David Daney <ddaney.cavm@...il.com>, linux-kernel@...r.kernel.org
CC: netdev@...r.kernel.org, "David S. Miller" <davem@...emloft.net>,
linux-mips@...ux-mips.org, Robert Richter <rrichter@...ium.com>,
Sunil Goutham <sgoutham@...ium.com>,
linux-arm-kernel@...ts.infradead.org, linux-acpi@...r.kernel.org,
David Daney <david.daney@...ium.com>
Subject: Re: [PATCH 2/2] net, thunder, bgx: Add support for ACPI binding.
On 07.08.2015 02:33, David Daney wrote:
> From: David Daney <david.daney@...ium.com>
>
> Find out which PHYs belong to which BGX instance in the ACPI way.
>
> Set the MAC address of the device as provided by ACPI tables. This is
> similar to the implementation for devicetree in
> of_get_mac_address(). The table is searched for the device property
> entries "mac-address", "local-mac-address" and "address" in that
> order. The address is provided in a u64 variable and must contain a
> valid 6 bytes-len mac addr.
>
> Based on code from: Narinder Dhillon <ndhillon@...ium.com>
> Tomasz Nowicki <tomasz.nowicki@...aro.org>
> Robert Richter <rrichter@...ium.com>
>
> Signed-off-by: Tomasz Nowicki <tomasz.nowicki@...aro.org>
> Signed-off-by: Robert Richter <rrichter@...ium.com>
> Signed-off-by: David Daney <david.daney@...ium.com>
> ---
> drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 137 +++++++++++++++++++++-
> 1 file changed, 135 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
> index 615b2af..2056583 100644
> --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
> +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
> @@ -6,6 +6,7 @@
> * as published by the Free Software Foundation.
> */
>
> +#include <linux/acpi.h>
> #include <linux/module.h>
> #include <linux/interrupt.h>
> #include <linux/pci.h>
> @@ -26,7 +27,7 @@
> struct lmac {
> struct bgx *bgx;
> int dmac;
> - unsigned char mac[ETH_ALEN];
> + u8 mac[ETH_ALEN];
> bool link_up;
> int lmacid; /* ID within BGX */
> int lmacid_bd; /* ID on board */
> @@ -835,6 +836,133 @@ static void bgx_get_qlm_mode(struct bgx *bgx)
> }
> }
>
> +#ifdef CONFIG_ACPI
> +
> +static int bgx_match_phy_id(struct device *dev, void *data)
> +{
> + struct phy_device *phydev = to_phy_device(dev);
> + u32 *phy_id = data;
> +
> + if (phydev->addr == *phy_id)
> + return 1;
> +
> + return 0;
> +}
> +
> +static const char * const addr_propnames[] = {
> + "mac-address",
> + "local-mac-address",
> + "address",
> +};
> +
> +static int acpi_get_mac_address(struct acpi_device *adev, u8 *dst)
> +{
> + const union acpi_object *prop;
> + u64 mac_val;
> + u8 mac[ETH_ALEN];
> + int i, j;
> + int ret;
> +
> + for (i = 0; i < ARRAY_SIZE(addr_propnames); i++) {
> + ret = acpi_dev_get_property(adev, addr_propnames[i],
> + ACPI_TYPE_INTEGER, &prop);
> + if (ret)
> + continue;
> +
> + mac_val = prop->integer.value;
> +
> + if (mac_val & (~0ULL << 48))
> + continue; /* more than 6 bytes */
> +
> + for (j = 0; j < ARRAY_SIZE(mac); j++)
> + mac[j] = (u8)(mac_val >> (8 * j));
> + if (!is_valid_ether_addr(mac))
> + continue;
> +
> + memcpy(dst, mac, ETH_ALEN);
> +
> + return 0;
> + }
> +
> + return ret ? ret : -EINVAL;
> +}
> +
> +static acpi_status bgx_acpi_register_phy(acpi_handle handle,
> + u32 lvl, void *context, void **rv)
> +{
> + struct acpi_reference_args args;
> + const union acpi_object *prop;
> + struct bgx *bgx = context;
> + struct acpi_device *adev;
> + struct device *phy_dev;
> + u32 phy_id;
> +
> + if (acpi_bus_get_device(handle, &adev))
> + goto out;
> +
> + SET_NETDEV_DEV(&bgx->lmac[bgx->lmac_count].netdev, &bgx->pdev->dev);
> +
> + acpi_get_mac_address(adev, bgx->lmac[bgx->lmac_count].mac);
> +
> + bgx->lmac[bgx->lmac_count].lmacid = bgx->lmac_count;
> +
> + if (acpi_dev_get_property_reference(adev, "phy-handle", 0, &args))
> + goto out;
> +
> + if (acpi_dev_get_property(args.adev, "phy-channel", ACPI_TYPE_INTEGER, &prop))
> + goto out;
> +
> + phy_id = prop->integer.value;
> +
> + phy_dev = bus_find_device(&mdio_bus_type, NULL, (void *)&phy_id,
> + bgx_match_phy_id);
> + if (!phy_dev)
> + goto out;
> +
> + bgx->lmac[bgx->lmac_count].phydev = to_phy_device(phy_dev);
> +out:
> + bgx->lmac_count++;
> + return AE_OK;
> +}
> +
> +static acpi_status bgx_acpi_match_id(acpi_handle handle, u32 lvl,
> + void *context, void **ret_val)
> +{
> + struct acpi_buffer string = { ACPI_ALLOCATE_BUFFER, NULL };
> + struct bgx *bgx = context;
> + char bgx_sel[5];
> +
> + snprintf(bgx_sel, 5, "BGX%d", bgx->bgx_id);
> + if (ACPI_FAILURE(acpi_get_name(handle, ACPI_SINGLE_NAME, &string))) {
> + pr_warn("Invalid link device\n");
> + return AE_OK;
> + }
> +
> + if (strncmp(string.pointer, bgx_sel, 4))
> + return AE_OK;
> +
> + acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, 1,
> + bgx_acpi_register_phy, NULL, bgx, NULL);
> +
> + kfree(string.pointer);
> + return AE_CTRL_TERMINATE;
> +}
> +
> +static int bgx_init_acpi_phy(struct bgx *bgx)
> +{
> + acpi_get_devices(NULL, bgx_acpi_match_id, bgx, (void **)NULL);
> + return 0;
> +}
> +
> +#else
> +
> +static int bgx_init_acpi_phy(struct bgx *bgx)
> +{
> + return -ENODEV;
> +}
> +
> +#endif /* CONFIG_ACPI */
> +
> #if IS_ENABLED(CONFIG_OF_MDIO)
>
> static int bgx_init_of_phy(struct bgx *bgx)
> @@ -882,7 +1010,12 @@ static int bgx_init_of_phy(struct bgx *bgx)
>
> static int bgx_init_phy(struct bgx *bgx)
> {
> - return bgx_init_of_phy(bgx);
> + int err = bgx_init_of_phy(bgx);
> +
> + if (err != -ENODEV)
> + return err;
> +
> + return bgx_init_acpi_phy(bgx);
> }
>
If kernel can work with DT and ACPI (both compiled in), it should take
only one path instead of probing DT and ACPI sequentially. How about:
@@ -902,10 +925,9 @@ static int bgx_probe(struct pci_dev *pdev, const
struct pci_device_id *ent)
bgx_vnic[bgx->bgx_id] = bgx;
bgx_get_qlm_mode(bgx);
- snprintf(bgx_sel, 5, "bgx%d", bgx->bgx_id);
- np = of_find_node_by_name(NULL, bgx_sel);
- if (np)
- bgx_init_of(bgx, np);
+ err = acpi_disabled ? bgx_init_of_phy(bgx) : bgx_init_acpi_phy(bgx);
+ if (err)
+ goto err_enable;
bgx_init_hw(bgx);
Regards,
Tomasz
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists