Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 1033f1f7ef3e0227eff68f236dc15d127ac550ff

Authored by Denis Kirjanov
Committed by Greg Kroah-Hartman
1 parent 11f05c7715
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

Staging: slicoss: Remove explicit arch dependencies 

Remove explicit arch dependencies

Signed-off-by: Denis Kirjanov <dkirjanov@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Showing 2 changed files with 24 additions and 26 deletions Side-by-side Diff

drivers/staging/slicoss/slic.h
Diff comments   View file @ 1033f1f
... ... @@ -515,14 +515,16 @@
515 515 (largestat) += ((newstat) - (oldstat)); \
516 516 }
517 517  
518   -#if defined(CONFIG_X86_64) || defined(CONFIG_IA64)
  518 +#if BITS_PER_LONG == 64
519 519 #define SLIC_GET_ADDR_LOW(_addr) (u32)((u64)(_addr) & \
520 520 0x00000000FFFFFFFF)
521 521 #define SLIC_GET_ADDR_HIGH(_addr) (u32)(((u64)(_addr) >> 32) & \
522 522 0x00000000FFFFFFFF)
523   -#else
524   -#define SLIC_GET_ADDR_LOW(_addr) (u32)_addr
  523 +#elif BITS_PER_LONG == 32
  524 +#define SLIC_GET_ADDR_LOW(_addr) (u32)(_addr)
525 525 #define SLIC_GET_ADDR_HIGH(_addr) (u32)0
  526 +#else
  527 +#error BITS_PER_LONG must be 32 or 64
526 528 #endif
527 529  
528 530 #define FLUSH true
drivers/staging/slicoss/slicoss.c
Diff comments   View file @ 1033f1f
... ... @@ -1099,19 +1099,17 @@
1099 1099 struct slic_shmem *pshmem;
1100 1100  
1101 1101 pshmem = (struct slic_shmem *)adapter->phys_shmem;
1102   -#if defined(CONFIG_X86_64)
  1102 +#if BITS_PER_LONG == 64
1103 1103 slic_upr_queue_request(adapter,
1104 1104 SLIC_UPR_RLSR,
1105 1105 SLIC_GET_ADDR_LOW(&pshmem->linkstatus),
1106 1106 SLIC_GET_ADDR_HIGH(&pshmem->linkstatus),
1107 1107 0, 0);
1108   -#elif defined(CONFIG_X86)
  1108 +#else
1109 1109 slic_upr_queue_request(adapter,
1110 1110 SLIC_UPR_RLSR,
1111 1111 (u32) &pshmem->linkstatus,
1112 1112 SLIC_GET_ADDR_HIGH(pshmem), 0, 0);
1113   -#else
1114   - Stop Compilation;
1115 1113 #endif
1116 1114 return;
1117 1115 }
... ... @@ -1327,7 +1325,7 @@
1327 1325 s_util.s = 0;
1328 1326  
1329 1327 w = (u16 *)m;
1330   -#ifdef CONFIG_X86_64
  1328 +#if BITS_PER_LONG == 64
1331 1329 w_int = (u32) ((ulong) w & 0x00000000FFFFFFFF);
1332 1330 #else
1333 1331 w_int = (u32) (w);
1334 1332  
... ... @@ -1439,12 +1437,16 @@
1439 1437 slic_rspqueue_free(adapter);
1440 1438 return -ENOMEM;
1441 1439 }
  1440 + /* FIXME:
  1441 + * do we really need this assertions (4K PAGE_SIZE aligned addr)? */
  1442 +#if 0
1442 1443 #ifndef CONFIG_X86_64
1443 1444 ASSERT(((u32) rspq->vaddr[i] & 0xFFFFF000) ==
1444 1445 (u32) rspq->vaddr[i]);
1445 1446 ASSERT(((u32) rspq->paddr[i] & 0xFFFFF000) ==
1446 1447 (u32) rspq->paddr[i]);
1447 1448 #endif
  1449 +#endif
1448 1450 memset(rspq->vaddr[i], 0, PAGE_SIZE);
1449 1451  
1450 1452 if (paddrh == 0) {
1451 1453  
... ... @@ -1473,13 +1475,13 @@
1473 1475 return NULL;
1474 1476  
1475 1477 buf = rspq->rspbuf;
1476   -#ifndef CONFIG_X86_64
  1478 +#if BITS_PER_LONG == 32
1477 1479 ASSERT((buf->status & 0xFFFFFFE0) == 0);
1478 1480 #endif
1479 1481 ASSERT(buf->hosthandle);
1480 1482 if (++rspq->offset < SLIC_RSPQ_BUFSINPAGE) {
1481 1483 rspq->rspbuf++;
1482   -#ifndef CONFIG_X86_64
  1484 +#if BITS_PER_LONG == 32
1483 1485 ASSERT(((u32) rspq->rspbuf & 0xFFFFFFE0) ==
1484 1486 (u32) rspq->rspbuf);
1485 1487 #endif
1486 1488  
... ... @@ -1492,12 +1494,12 @@
1492 1494 rspq->offset = 0;
1493 1495 rspq->rspbuf = (struct slic_rspbuf *)
1494 1496 rspq->vaddr[rspq->pageindex];
1495   -#ifndef CONFIG_X86_64
  1497 +#if BITS_PER_LONG == 32
1496 1498 ASSERT(((u32) rspq->rspbuf & 0xFFFFF000) ==
1497 1499 (u32) rspq->rspbuf);
1498 1500 #endif
1499 1501 }
1500   -#ifndef CONFIG_X86_64
  1502 +#if BITS_PER_LONG == 32
1501 1503 ASSERT(((u32) buf & 0xFFFFFFE0) == (u32) buf);
1502 1504 #endif
1503 1505 return buf;
... ... @@ -1538,7 +1540,7 @@
1538 1540 &cmdqmem->dma_pages[cmdqmem->pagecnt]);
1539 1541 if (!pageaddr)
1540 1542 return NULL;
1541   -#ifndef CONFIG_X86_64
  1543 +#if BITS_PER_LONG == 32
1542 1544 ASSERT(((u32) pageaddr & 0xFFFFF000) == (u32) pageaddr);
1543 1545 #endif
1544 1546 cmdqmem->pages[cmdqmem->pagecnt] = pageaddr;
... ... @@ -1650,7 +1652,7 @@
1650 1652 adapter->slic_handle_ix = 1;
1651 1653 for (i = 0; i < SLIC_CMDQ_INITPAGES; i++) {
1652 1654 pageaddr = slic_cmdqmem_addpage(adapter);
1653   -#ifndef CONFIG_X86_64
  1655 +#if BITS_PER_LONG == 32
1654 1656 ASSERT(((u32) pageaddr & 0xFFFFF000) == (u32) pageaddr);
1655 1657 #endif
1656 1658 if (!pageaddr) {
1657 1659  
1658 1660  
... ... @@ -2447,18 +2449,16 @@
2447 2449  
2448 2450 pshmem = (struct slic_shmem *)adapter->phys_shmem;
2449 2451  
2450   -#if defined(CONFIG_X86_64)
  2452 +#if BITS_PER_LONG == 64
2451 2453 status = slic_upr_request(adapter,
2452 2454 SLIC_UPR_RLSR,
2453 2455 SLIC_GET_ADDR_LOW(&pshmem->linkstatus),
2454 2456 SLIC_GET_ADDR_HIGH(&pshmem->linkstatus),
2455 2457 0, 0);
2456   -#elif defined(CONFIG_X86)
  2458 +#else
2457 2459 status = slic_upr_request(adapter, SLIC_UPR_RLSR,
2458 2460 (u32) &pshmem->linkstatus, /* no 4GB wrap guaranteed */
2459 2461 0, 0, 0);
2460   -#else
2461   - Stop compilation;
2462 2462 #endif
2463 2463 ASSERT(status == 0);
2464 2464 }
2465 2465  
2466 2466  
... ... @@ -2575,14 +2575,12 @@
2575 2575 ihcmd->u.slic_buffers.bufs[0].paddrl = SLIC_GET_ADDR_LOW(phys_addr);
2576 2576 ihcmd->u.slic_buffers.bufs[0].paddrh = SLIC_GET_ADDR_HIGH(phys_addr);
2577 2577 ihcmd->u.slic_buffers.bufs[0].length = skb->len;
2578   -#if defined(CONFIG_X86_64)
  2578 +#if BITS_PER_LONG == 64
2579 2579 hcmd->cmdsize = (u32) ((((u64)&ihcmd->u.slic_buffers.bufs[1] -
2580 2580 (u64) hcmd) + 31) >> 5);
2581   -#elif defined(CONFIG_X86)
  2581 +#else
2582 2582 hcmd->cmdsize = ((((u32) &ihcmd->u.slic_buffers.bufs[1] -
2583 2583 (u32) hcmd) + 31) >> 5);
2584   -#else
2585   - Stop Compilation;
2586 2584 #endif
2587 2585 }
2588 2586  
2589 2587  
2590 2588  
... ... @@ -3078,16 +3076,14 @@
3078 3076 spin_lock_irqsave(&adapter->bit64reglock.lock,
3079 3077 adapter->bit64reglock.flags);
3080 3078  
3081   -#if defined(CONFIG_X86_64)
  3079 +#if BITS_PER_LONG == 64
3082 3080 slic_reg32_write(&slic_regs->slic_addr_upper,
3083 3081 SLIC_GET_ADDR_HIGH(&pshmem->isr), DONT_FLUSH);
3084 3082 slic_reg32_write(&slic_regs->slic_isp,
3085 3083 SLIC_GET_ADDR_LOW(&pshmem->isr), FLUSH);
3086   -#elif defined(CONFIG_X86)
  3084 +#else
3087 3085 slic_reg32_write(&slic_regs->slic_addr_upper, 0, DONT_FLUSH);
3088 3086 slic_reg32_write(&slic_regs->slic_isp, (u32)&pshmem->isr, FLUSH);
3089   -#else
3090   - Stop Compilations
3091 3087 #endif
3092 3088 spin_unlock_irqrestore(&adapter->bit64reglock.lock,
3093 3089 adapter->bit64reglock.flags);