hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Xtensa updates for v5.20 

- support KCOV
 - enable ARCH_HAS_GCOV_PROFILE_ALL
 - minor ISS network driver cleanups
 -----BEGIN PGP SIGNATURE-----
 
 iQJHBAABCgAxFiEEK2eFS5jlMn3N6xfYUfnMkfg/oEQFAmLsCugTHGpjbXZia2Jj
 QGdtYWlsLmNvbQAKCRBR+cyR+D+gRI9xD/9R+LcQFYoWXKJv57XAopM3q5QsR8hZ
 sQNWnErzf+LpUVCZHlniyQkywf6KpILm6lRHTd4qs/ny8B5rjnbWLD2xx8qSZ9lq
 6YT5HtimCj6qeU7eQPp4OAf9NNC6bkpYOFF0D5eU+smgS1A2PyZnYGMvXWPwUhtM
 R+z4+CIB0XHRWazNC7hrJOAmge0rWQgpiDxRQMYCKTQH1o1MZc5F0k9V/OJtVDRt
 zLiC7fMI6Uijsw9woAU9sfl4zU7FnM0S10gXtL2J/e5DEKovDegHeGrHpXyNBtCG
 9xnCXu285XKRlGDXGtO+EnSgmHmPmaIxW4F5I3uK/fCdfex4NdbuLf+WWuK2eSPM
 KDWLlWq76F9/Fdv4yPQoysUWoEXNjbpsgESITZdatyLZMZtUGE7rM4ysHOxN/VOG
 cDa1jwY9Od7Mg6HfVO1sm+8ZcY4adsMKfyUVp55H5l6Dvd44o50wF5Eblrq0ouuC
 zkBlnFdxn5CxyaMFNgaGJuAcdW5BesQdRLhmjh06uAC9WXOSmq1aGjt9IcKjBH+4
 Uf/8iiVmQtcUanFokcbNlgByIaJ7Mwik13yMY6cVk7I4+3NoI15OWIF54241gtHb
 6glbBkbTOTO3S1l1MasqAUDZjYl2yJxtckoVAREzDmMMlsYqJZ5J8UEmjJNNiqN0
 f52eQXMUFZxjuQ==
 =CLFr
 -----END PGP SIGNATURE-----

Merge tag 'xtensa-20220804' of https://github.com/jcmvbkbc/linux-xtensa

Pull xtensa updates from Max Filippov:

 - support KCOV

 - enable ARCH_HAS_GCOV_PROFILE_ALL

 - minor ISS network driver cleanups

* tag 'xtensa-20220804' of https://github.com/jcmvbkbc/linux-xtensa:
  xtensa: enable ARCH_HAS_GCOV_PROFILE_ALL
  xtensa: enable KCOV support
  xtensa: iss: fix handling error cases in iss_net_configure()
  xtensa: iss/network: provide release() callback
  xtensa: iss/network: drop 'devices' list
This commit is contained in:
Linus Torvalds 2022-08-04 15:35:58 -07:00
parent 995177a4c7 0847d167d0
commit c040862bfb
5 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/features/debug/gcov-profile-all/arch-support.txt
View File

@ -27,5 +27,5 @@
| sparc: | TODO |
| um: | ok |
| x86: | ok |
| xtensa: | TODO |
| xtensa: | ok |
-----------------------

2
Documentation/features/debug/kcov/arch-support.txt
View File

@ -27,5 +27,5 @@
| sparc: | TODO |
| um: | ok |
| x86: | ok |
| xtensa: | TODO |
| xtensa: | ok |
-----------------------

2
arch/xtensa/Kconfig
View File

@ -6,6 +6,8 @@ config XTENSA
select ARCH_HAS_CURRENT_STACK_POINTER
select ARCH_HAS_DEBUG_VM_PGTABLE
select ARCH_HAS_DMA_PREP_COHERENT if MMU
select ARCH_HAS_GCOV_PROFILE_ALL
select ARCH_HAS_KCOV
select ARCH_HAS_SYNC_DMA_FOR_CPU if MMU
select ARCH_HAS_SYNC_DMA_FOR_DEVICE if MMU
select ARCH_HAS_DMA_SET_UNCACHED if MMU

2
arch/xtensa/boot/lib/Makefile
View File

@ -17,6 +17,8 @@ endif
KASAN_SANITIZE := n
KCSAN_SANITIZE := n
KCOV_INSTRUMENT := n
GCOV_PROFILE := n
CFLAGS_REMOVE_inflate.o += -fstack-protector -fstack-protector-strong
CFLAGS_REMOVE_zmem.o += -fstack-protector -fstack-protector-strong

63
arch/xtensa/platforms/iss/network.c
View File

@ -37,10 +37,6 @@
#define ETH_HEADER_OTHER 14
#define ISS_NET_TIMER_VALUE (HZ / 10)
static DEFINE_SPINLOCK(devices_lock);
static LIST_HEAD(devices);
/* ------------------------------------------------------------------------- */
/* We currently only support the TUNTAP transport protocol. */
@ -70,8 +66,6 @@ struct iss_net_ops {
/* This structure contains out private information for the driver. */
struct iss_net_private {
struct list_head device_list;
spinlock_t lock;
struct net_device *dev;
struct platform_device pdev;
@ -472,23 +466,30 @@ static const struct net_device_ops iss_netdev_ops = {
.ndo_set_rx_mode = iss_net_set_multicast_list,
};
static int iss_net_configure(int index, char *init)
static void iss_net_pdev_release(struct device *dev)
{
struct platform_device *pdev = to_platform_device(dev);
struct iss_net_private *lp =
container_of(pdev, struct iss_net_private, pdev);
free_netdev(lp->dev);
}
static void iss_net_configure(int index, char *init)
{
struct net_device *dev;
struct iss_net_private *lp;
int err;
dev = alloc_etherdev(sizeof(*lp));
if (dev == NULL) {
pr_err("eth_configure: failed to allocate device\n");
return 1;
return;
}
/* Initialize private element. */
lp = netdev_priv(dev);
*lp = (struct iss_net_private) {
.device_list = LIST_HEAD_INIT(lp->device_list),
.dev = dev,
.index = index,
};
@ -509,7 +510,7 @@ static int iss_net_configure(int index, char *init)
if (!tuntap_probe(lp, index, init)) {
pr_err("%s: invalid arguments. Skipping device!\n",
dev->name);
goto errout;
goto err_free_netdev;
}
pr_info("Netdevice %d (%pM)\n", index, dev->dev_addr);
@ -517,17 +518,16 @@ static int iss_net_configure(int index, char *init)
/* sysfs register */
if (!driver_registered) {
platform_driver_register(&iss_net_driver);
if (platform_driver_register(&iss_net_driver))
goto err_free_netdev;
driver_registered = 1;
}
spin_lock(&devices_lock);
list_add(&lp->device_list, &devices);
spin_unlock(&devices_lock);
lp->pdev.id = index;
lp->pdev.name = DRIVER_NAME;
platform_device_register(&lp->pdev);
lp->pdev.dev.release = iss_net_pdev_release;
if (platform_device_register(&lp->pdev))
goto err_free_netdev;
SET_NETDEV_DEV(dev, &lp->pdev.dev);
dev->netdev_ops = &iss_netdev_ops;
@ -536,23 +536,20 @@ static int iss_net_configure(int index, char *init)
dev->irq = -1;
rtnl_lock();
err = register_netdevice(dev);
rtnl_unlock();
if (err) {
if (register_netdevice(dev)) {
rtnl_unlock();
pr_err("%s: error registering net device!\n", dev->name);
/* XXX: should we call ->remove() here? */
free_netdev(dev);
return 1;
platform_device_unregister(&lp->pdev);
return;
}
rtnl_unlock();
timer_setup(&lp->tl, iss_net_user_timer_expire, 0);
return 0;
return;
errout:
/* FIXME: unregister; free, etc.. */
return -EIO;
err_free_netdev:
free_netdev(dev);
}
/* ------------------------------------------------------------------------- */
@ -574,7 +571,7 @@ struct iss_net_init {
static int __init iss_net_setup(char *str)
{
struct iss_net_private *device = NULL;
struct iss_net_init *device = NULL;
struct iss_net_init *new;
struct list_head *ele;
char *end;
@ -595,16 +592,12 @@ static int __init iss_net_setup(char *str)
}
str = end;
spin_lock(&devices_lock);
list_for_each(ele, &devices) {
device = list_entry(ele, struct iss_net_private, device_list);
list_for_each(ele, &eth_cmd_line) {
device = list_entry(ele, struct iss_net_init, list);
if (device->index == n)
break;
}
spin_unlock(&devices_lock);
if (device && device->index == n) {
pr_err("Device %u already configured\n", n);
return 1;