Revision ab37a7a890c1176144a4c66ff3d51ef2c20ed486 authored by Stefan Wahren on 10 July 2021, 11:04:55 UTC, committed by Arnd Bergmann on 16 July 2021, 21:02:53 UTC
The usage of usb-nop-xceiv PHY on Raspberry Pi boards with BCM283x has been a "regression source" a lot of times. The last case is breakage of USB mass storage boot has been commit e590474768f1 ("driver core: Set fw_devlink=on by default") for multi_v7_defconfig. As long as NOP_USB_XCEIV is configured as module, the dwc2 USB driver defer probing endlessly and prevent booting from USB mass storage device. So make the driver built-in as in bcm2835_defconfig and arm64/defconfig. Fixes: e590474768f1 ("driver core: Set fw_devlink=on by default") Reported-by: Ojaswin Mujoo <ojaswin98@gmail.com> Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> Link: https://lore.kernel.org/r/1625915095-23077-1-git-send-email-stefan.wahren@i2se.com' Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1 parent 042f2e1
devres.c
// SPDX-License-Identifier: GPL-2.0-or-later
/*
* This file contains all networking devres helpers.
*/
#include <linux/device.h>
#include <linux/etherdevice.h>
#include <linux/netdevice.h>
struct net_device_devres {
struct net_device *ndev;
};
static void devm_free_netdev(struct device *dev, void *this)
{
struct net_device_devres *res = this;
free_netdev(res->ndev);
}
struct net_device *devm_alloc_etherdev_mqs(struct device *dev, int sizeof_priv,
unsigned int txqs, unsigned int rxqs)
{
struct net_device_devres *dr;
dr = devres_alloc(devm_free_netdev, sizeof(*dr), GFP_KERNEL);
if (!dr)
return NULL;
dr->ndev = alloc_etherdev_mqs(sizeof_priv, txqs, rxqs);
if (!dr->ndev) {
devres_free(dr);
return NULL;
}
devres_add(dev, dr);
return dr->ndev;
}
EXPORT_SYMBOL(devm_alloc_etherdev_mqs);
static void devm_unregister_netdev(struct device *dev, void *this)
{
struct net_device_devres *res = this;
unregister_netdev(res->ndev);
}
static int netdev_devres_match(struct device *dev, void *this, void *match_data)
{
struct net_device_devres *res = this;
struct net_device *ndev = match_data;
return ndev == res->ndev;
}
/**
* devm_register_netdev - resource managed variant of register_netdev()
* @dev: managing device for this netdev - usually the parent device
* @ndev: device to register
*
* This is a devres variant of register_netdev() for which the unregister
* function will be called automatically when the managing device is
* detached. Note: the net_device used must also be resource managed by
* the same struct device.
*/
int devm_register_netdev(struct device *dev, struct net_device *ndev)
{
struct net_device_devres *dr;
int ret;
/* struct net_device must itself be managed. For now a managed netdev
* can only be allocated by devm_alloc_etherdev_mqs() so the check is
* straightforward.
*/
if (WARN_ON(!devres_find(dev, devm_free_netdev,
netdev_devres_match, ndev)))
return -EINVAL;
dr = devres_alloc(devm_unregister_netdev, sizeof(*dr), GFP_KERNEL);
if (!dr)
return -ENOMEM;
ret = register_netdev(ndev);
if (ret) {
devres_free(dr);
return ret;
}
dr->ndev = ndev;
devres_add(ndev->dev.parent, dr);
return 0;
}
EXPORT_SYMBOL(devm_register_netdev);
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...