[PATCH 1/1] staging: slicoss: slicoss.c: fix different address space sparse warnings
From: Peng Sun
Date: Mon Sep 12 2016 - 23:23:31 EST
Signed-off-by: Peng Sun <sironhide0null@xxxxxxxxx>
---
drivers/staging/slicoss/slicoss.c | 125 +++++++++++++++++++++++++++-----------
1 file changed, 91 insertions(+), 34 deletions(-)
diff --git a/drivers/staging/slicoss/slicoss.c b/drivers/staging/slicoss/slicoss.c
index 21280a3..6996143 100644
--- a/drivers/staging/slicoss/slicoss.c
+++ b/drivers/staging/slicoss/slicoss.c
@@ -924,8 +924,9 @@ err_unlock_irq:
static void slic_link_upr_complete(struct adapter *adapter, u32 isr)
{
struct slic_shmemory *sm = &adapter->shmem;
- struct slic_shmem_data *sm_data = sm->shmem_data;
- u32 lst = sm_data->lnkstatus;
+ struct slic_shmem_data __iomem *sm_data = sm->shmem_data;
+ u32 lst = ioread32((char __iomem *)sm_data +
+ offsetof(struct slic_shmem_data, lnkstatus));
uint linkup;
unsigned char linkspeed;
unsigned char linkduplex;
@@ -1004,8 +1005,10 @@ static void slic_upr_request_complete(struct adapter *adapter, u32 isr)
switch (upr->upr_request) {
case SLIC_UPR_STATS: {
struct slic_shmemory *sm = &adapter->shmem;
- struct slic_shmem_data *sm_data = sm->shmem_data;
- struct slic_stats *stats = &sm_data->stats;
+ struct slic_shmem_data __iomem *sm_data = sm->shmem_data;
+ struct slic_stats __iomem *stats = (struct slic_stats __iomem *)
+ ((char __iomem *)sm_data +
+ offsetof(struct slic_shmem_data, stats));
struct slic_stats *old = &adapter->inicstats_prev;
struct slicnet_stats *stst = &adapter->slic_stats;
@@ -1015,49 +1018,91 @@ static void slic_upr_request_complete(struct adapter *adapter, u32 isr)
break;
}
- UPDATE_STATS_GB(stst->tcp.xmit_tcp_segs, stats->xmit_tcp_segs,
+ UPDATE_STATS_GB(stst->tcp.xmit_tcp_segs,
+ readq((char __iomem *)stats +
+ offsetof(struct slic_stats,
+ xmit_tcp_segs)),
old->xmit_tcp_segs);
- UPDATE_STATS_GB(stst->tcp.xmit_tcp_bytes, stats->xmit_tcp_bytes,
+ UPDATE_STATS_GB(stst->tcp.xmit_tcp_bytes,
+ readq((char __iomem *)stats +
+ offsetof(struct slic_stats,
+ xmit_tcp_bytes)),
old->xmit_tcp_bytes);
- UPDATE_STATS_GB(stst->tcp.rcv_tcp_segs, stats->rcv_tcp_segs,
+ UPDATE_STATS_GB(stst->tcp.rcv_tcp_segs,
+ readq((char __iomem *)stats +
+ offsetof(struct slic_stats,
+ rcv_tcp_segs)),
old->rcv_tcp_segs);
- UPDATE_STATS_GB(stst->tcp.rcv_tcp_bytes, stats->rcv_tcp_bytes,
+ UPDATE_STATS_GB(stst->tcp.rcv_tcp_bytes,
+ readq((char __iomem *)stats +
+ offsetof(struct slic_stats,
+ rcv_tcp_bytes)),
old->rcv_tcp_bytes);
- UPDATE_STATS_GB(stst->iface.xmt_bytes, stats->xmit_bytes,
+ UPDATE_STATS_GB(stst->iface.xmt_bytes,
+ readq((char __iomem *)stats +
+ offsetof(struct slic_stats,
+ xmit_bytes)),
old->xmit_bytes);
- UPDATE_STATS_GB(stst->iface.xmt_ucast, stats->xmit_unicasts,
+ UPDATE_STATS_GB(stst->iface.xmt_ucast,
+ readq((char __iomem *)stats +
+ offsetof(struct slic_stats,
+ xmit_unicasts)),
old->xmit_unicasts);
- UPDATE_STATS_GB(stst->iface.rcv_bytes, stats->rcv_bytes,
+ UPDATE_STATS_GB(stst->iface.rcv_bytes,
+ readq((char __iomem *)stats +
+ offsetof(struct slic_stats,
+ rcv_bytes)),
old->rcv_bytes);
- UPDATE_STATS_GB(stst->iface.rcv_ucast, stats->rcv_unicasts,
+ UPDATE_STATS_GB(stst->iface.rcv_ucast,
+ readq((char __iomem *)stats +
+ offsetof(struct slic_stats,
+ rcv_unicasts)),
old->rcv_unicasts);
- UPDATE_STATS_GB(stst->iface.xmt_errors, stats->xmit_collisions,
+ UPDATE_STATS_GB(stst->iface.xmt_errors,
+ readq((char __iomem *)stats +
+ offsetof(struct slic_stats,
+ xmit_collisions)),
old->xmit_collisions);
UPDATE_STATS_GB(stst->iface.xmt_errors,
- stats->xmit_excess_collisions,
+ readq((char __iomem *)stats +
+ offsetof(struct slic_stats,
+ xmit_excess_collisions)),
old->xmit_excess_collisions);
- UPDATE_STATS_GB(stst->iface.xmt_errors, stats->xmit_other_error,
+ UPDATE_STATS_GB(stst->iface.xmt_errors,
+ readq((char __iomem *)stats +
+ offsetof(struct slic_stats,
+ xmit_other_error)),
old->xmit_other_error);
- UPDATE_STATS_GB(stst->iface.rcv_errors, stats->rcv_other_error,
+ UPDATE_STATS_GB(stst->iface.rcv_errors,
+ readq((char __iomem *)stats +
+ offsetof(struct slic_stats,
+ rcv_other_error)),
old->rcv_other_error);
- UPDATE_STATS_GB(stst->iface.rcv_discards, stats->rcv_drops,
+ UPDATE_STATS_GB(stst->iface.rcv_discards,
+ readq((char __iomem *)stats +
+ offsetof(struct slic_stats,
+ rcv_drops)),
old->rcv_drops);
- if (stats->rcv_drops > old->rcv_drops)
- adapter->rcv_drops += (stats->rcv_drops -
- old->rcv_drops);
+ if (readq((char __iomem *)stats +
+ offsetof(struct slic_stats,
+ rcv_drops)) > old->rcv_drops)
+ adapter->rcv_drops +=
+ (readq((char __iomem *)stats +
+ offsetof(struct slic_stats,
+ rcv_drops)) - old->rcv_drops);
memcpy_fromio(old, stats, sizeof(*stats));
break;
}
@@ -1682,9 +1727,10 @@ static void slic_init_cleanup(struct adapter *adapter)
if (adapter->shmem.shmem_data) {
struct slic_shmemory *sm = &adapter->shmem;
- struct slic_shmem_data *sm_data = sm->shmem_data;
+ struct slic_shmem_data __iomem *sm_data = sm->shmem_data;
- pci_free_consistent(adapter->pcidev, sizeof(*sm_data), sm_data,
+ pci_free_consistent(adapter->pcidev, sizeof(*sm_data),
+ (void __force *)sm_data,
sm->isr_phaddr);
}
@@ -2071,15 +2117,18 @@ static irqreturn_t slic_interrupt(int irq, void *dev_id)
struct net_device *dev = dev_id;
struct adapter *adapter = netdev_priv(dev);
struct slic_shmemory *sm = &adapter->shmem;
- struct slic_shmem_data *sm_data = sm->shmem_data;
+ struct slic_shmem_data __iomem *sm_data = sm->shmem_data;
u32 isr;
- if (sm_data->isr) {
+ if (ioread32((char __iomem *)sm_data +
+ offsetof(struct slic_shmem_data, isr))) {
slic_write32(adapter, SLIC_REG_ICR, ICR_INT_MASK);
slic_flush_write(adapter);
- isr = sm_data->isr;
- sm_data->isr = 0;
+ isr = ioread32((char __iomem *)sm_data +
+ offsetof(struct slic_shmem_data, isr));
+ iowrite32(0, (char __iomem *)sm_data +
+ offsetof(struct slic_shmem_data, isr));
adapter->num_isrs++;
switch (adapter->card->state) {
case CARD_UP:
@@ -2214,7 +2263,7 @@ static int slic_if_init(struct adapter *adapter, unsigned long *flags)
struct sliccard *card = adapter->card;
struct net_device *dev = adapter->netdev;
struct slic_shmemory *sm = &adapter->shmem;
- struct slic_shmem_data *sm_data = sm->shmem_data;
+ struct slic_shmem_data __iomem *sm_data = sm->shmem_data;
int rc;
/* adapter should be down at this point */
@@ -2298,7 +2347,8 @@ static int slic_if_init(struct adapter *adapter, unsigned long *flags)
/*
* clear any pending events, then enable interrupts
*/
- sm_data->isr = 0;
+ iowrite32(0, (char __iomem *)sm_data +
+ offsetof(struct slic_shmem_data, isr));
slic_write32(adapter, SLIC_REG_ISR, 0);
slic_write32(adapter, SLIC_REG_ICR, ICR_INT_ON);
@@ -2587,7 +2637,7 @@ static void slic_config_pci(struct pci_dev *pcidev)
static int slic_card_init(struct sliccard *card, struct adapter *adapter)
{
struct slic_shmemory *sm = &adapter->shmem;
- struct slic_shmem_data *sm_data = sm->shmem_data;
+ struct slic_shmem_data __iomem *sm_data = sm->shmem_data;
struct slic_eeprom *peeprom;
struct oslic_eeprom *pOeeprom;
dma_addr_t phys_config;
@@ -2650,9 +2700,14 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
}
for (;;) {
- if (sm_data->isr) {
- if (sm_data->isr & ISR_UPC) {
- sm_data->isr = 0;
+ if (ioread32((char __iomem *)sm_data +
+ offsetof(struct slic_shmem_data, isr))) {
+ if (ioread32((char __iomem *)sm_data +
+ offsetof(struct slic_shmem_data,
+ isr)) & ISR_UPC) {
+ iowrite32(0, (char __iomem *)sm_data +
+ offsetof(struct
+ slic_shmem_data, isr));
slic_write64(adapter, SLIC_REG_ISP, 0,
0);
slic_write32(adapter, SLIC_REG_ISR, 0);
@@ -2662,7 +2717,9 @@ static int slic_card_init(struct sliccard *card, struct adapter *adapter)
break;
}
- sm_data->isr = 0;
+ iowrite32(0, (char __iomem *)sm_data +
+ offsetof(struct slic_shmem_data,
+ isr));
slic_write32(adapter, SLIC_REG_ISR, 0);
slic_flush_write(adapter);
} else {
@@ -2867,7 +2924,7 @@ static int slic_init_adapter(struct net_device *netdev,
if (!sm_data)
return -ENOMEM;
- sm->shmem_data = sm_data;
+ sm->shmem_data = (struct slic_shmem_data __force __iomem *)sm_data;
sm->isr_phaddr = phaddr;
sm->lnkstatus_phaddr = phaddr + offsetof(struct slic_shmem_data,
lnkstatus);
--
2.7.4