c99f0f7e68
Before262f2b782e("net: fman: Map the base address once"), the physical address of the MAC was exposed to userspace in two places: via sysfs and via SIOCGIFMAP. While this is not best practice, it is an external ABI which is in use by userspace software. The aforementioned commit inadvertently modified these addresses and made them virtual. This constitutes and ABI break. Additionally, it leaks the kernel's memory layout to userspace. Partially revert that commit, reintroducing the resource back into struct mac_device, while keeping the intended changes (the rework of the address mapping). Fixes:262f2b782e("net: fman: Map the base address once") Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Sean Anderson <sean.anderson@seco.com> Acked-by: Madalin Bucur <madalin.bucur@oss.nxp.com> Signed-off-by: David S. Miller <davem@davemloft.net>
140 lines
3.1 KiB
C
140 lines
3.1 KiB
C
// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-or-later
|
|
/*
|
|
* Copyright 2008 - 2016 Freescale Semiconductor Inc.
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/module.h>
|
|
#include <linux/io.h>
|
|
#include <linux/of_net.h>
|
|
#include "dpaa_eth.h"
|
|
#include "mac.h"
|
|
|
|
static ssize_t dpaa_eth_show_addr(struct device *dev,
|
|
struct device_attribute *attr, char *buf)
|
|
{
|
|
struct dpaa_priv *priv = netdev_priv(to_net_dev(dev));
|
|
struct mac_device *mac_dev = priv->mac_dev;
|
|
|
|
if (mac_dev)
|
|
return sprintf(buf, "%llx",
|
|
(unsigned long long)mac_dev->res->start);
|
|
else
|
|
return sprintf(buf, "none");
|
|
}
|
|
|
|
static ssize_t dpaa_eth_show_fqids(struct device *dev,
|
|
struct device_attribute *attr, char *buf)
|
|
{
|
|
struct dpaa_priv *priv = netdev_priv(to_net_dev(dev));
|
|
struct dpaa_fq *prev = NULL;
|
|
char *prevstr = NULL;
|
|
struct dpaa_fq *tmp;
|
|
struct dpaa_fq *fq;
|
|
u32 first_fqid = 0;
|
|
u32 last_fqid = 0;
|
|
ssize_t bytes = 0;
|
|
char *str;
|
|
int i = 0;
|
|
|
|
list_for_each_entry_safe(fq, tmp, &priv->dpaa_fq_list, list) {
|
|
switch (fq->fq_type) {
|
|
case FQ_TYPE_RX_DEFAULT:
|
|
str = "Rx default";
|
|
break;
|
|
case FQ_TYPE_RX_ERROR:
|
|
str = "Rx error";
|
|
break;
|
|
case FQ_TYPE_RX_PCD:
|
|
str = "Rx PCD";
|
|
break;
|
|
case FQ_TYPE_TX_CONFIRM:
|
|
str = "Tx default confirmation";
|
|
break;
|
|
case FQ_TYPE_TX_CONF_MQ:
|
|
str = "Tx confirmation (mq)";
|
|
break;
|
|
case FQ_TYPE_TX_ERROR:
|
|
str = "Tx error";
|
|
break;
|
|
case FQ_TYPE_TX:
|
|
str = "Tx";
|
|
break;
|
|
default:
|
|
str = "Unknown";
|
|
}
|
|
|
|
if (prev && (abs(fq->fqid - prev->fqid) != 1 ||
|
|
str != prevstr)) {
|
|
if (last_fqid == first_fqid)
|
|
bytes += sprintf(buf + bytes,
|
|
"%s: %d\n", prevstr, prev->fqid);
|
|
else
|
|
bytes += sprintf(buf + bytes,
|
|
"%s: %d - %d\n", prevstr,
|
|
first_fqid, last_fqid);
|
|
}
|
|
|
|
if (prev && abs(fq->fqid - prev->fqid) == 1 &&
|
|
str == prevstr) {
|
|
last_fqid = fq->fqid;
|
|
} else {
|
|
first_fqid = fq->fqid;
|
|
last_fqid = fq->fqid;
|
|
}
|
|
|
|
prev = fq;
|
|
prevstr = str;
|
|
i++;
|
|
}
|
|
|
|
if (prev) {
|
|
if (last_fqid == first_fqid)
|
|
bytes += sprintf(buf + bytes, "%s: %d\n", prevstr,
|
|
prev->fqid);
|
|
else
|
|
bytes += sprintf(buf + bytes, "%s: %d - %d\n", prevstr,
|
|
first_fqid, last_fqid);
|
|
}
|
|
|
|
return bytes;
|
|
}
|
|
|
|
static ssize_t dpaa_eth_show_bpids(struct device *dev,
|
|
struct device_attribute *attr, char *buf)
|
|
{
|
|
struct dpaa_priv *priv = netdev_priv(to_net_dev(dev));
|
|
ssize_t bytes = 0;
|
|
|
|
bytes += snprintf(buf + bytes, PAGE_SIZE - bytes, "%u\n",
|
|
priv->dpaa_bp->bpid);
|
|
|
|
return bytes;
|
|
}
|
|
|
|
static struct device_attribute dpaa_eth_attrs[] = {
|
|
__ATTR(device_addr, 0444, dpaa_eth_show_addr, NULL),
|
|
__ATTR(fqids, 0444, dpaa_eth_show_fqids, NULL),
|
|
__ATTR(bpids, 0444, dpaa_eth_show_bpids, NULL),
|
|
};
|
|
|
|
void dpaa_eth_sysfs_init(struct device *dev)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(dpaa_eth_attrs); i++)
|
|
if (device_create_file(dev, &dpaa_eth_attrs[i])) {
|
|
dev_err(dev, "Error creating sysfs file\n");
|
|
while (i > 0)
|
|
device_remove_file(dev, &dpaa_eth_attrs[--i]);
|
|
return;
|
|
}
|
|
}
|
|
|
|
void dpaa_eth_sysfs_remove(struct device *dev)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(dpaa_eth_attrs); i++)
|
|
device_remove_file(dev, &dpaa_eth_attrs[i]);
|
|
}
|