staging: brcm80211: removed unused MIPS specific SDRAM swap window

Certain Mips based, big endian Broadcom products contain a memory window
for endianness swap purposes. However, this is too system specific for
this driver as there are more big endian platforms to support. Thus, this
'window' functionality is not to be used and can be removed.

The swap window would be a performance improvement and could be provided
with a dedicated mapping function in the platform specific code.

Tested on BCM63281.

Reviewed-by: Henry Ptasinski <henryp@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Tested-by: Jonas Gorski <jonas.gorski@gmail.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/brcm80211/brcmsmac/aiutils.h b/drivers/staging/brcm80211/brcmsmac/aiutils.h
index 7ea42aff9bd67fddcce03157599759101bb6c02c..375c06f7c0250a48afd4e86f1f2556da1063a7f0 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/aiutils.h
+++ b/drivers/staging/brcm80211/brcmsmac/aiutils.h
@@ -30,8 +30,6 @@
 #define SI_PCI_MEM_SZ          (64 * 1024 * 1024)
 /* Host Mode sb2pcitranslation1 (64 MB) */
 #define SI_PCI_CFG             0x0c000000
-/* Byteswapped Physical SDRAM */
-#define        SI_SDRAM_SWAPPED        0x10000000
 /* Region 2 for sdram (512 MB) */
 #define SI_SDRAM_R2            0x80000000
 

diff --git a/drivers/staging/brcm80211/brcmsmac/dma.c b/drivers/staging/brcm80211/brcmsmac/dma.c
index bda36c70509392a4b6ce8a8c4ab4d3952105f92d..2ef416a9558efc6489dcb68bd770b71dda97252f 100644 (file)
--- a/drivers/staging/brcm80211/brcmsmac/dma.c
+++ b/drivers/staging/brcm80211/brcmsmac/dma.c
@@ -442,9 +442,6 @@ struct dma_pub *dma_attach(char *name, struct si_pub *sih,
        di->ddoffsethigh = SI_PCIE_DMA_H32;
        di->dataoffsetlow = di->ddoffsetlow;
        di->dataoffsethigh = di->ddoffsethigh;
-#if defined(__mips__) && defined(IL_BIGENDIAN)
-       di->dataoffsetlow = di->dataoffsetlow + SI_SDRAM_SWAPPED;
-#endif                         /* defined(__mips__) && defined(IL_BIGENDIAN) */
        /* WAR64450 : DMACtl.Addr ext fields are not supported in SDIOD core. */
        if ((ai_coreid(sih) == SDIOD_CORE_ID)
            && ((ai_corerev(sih) > 0) && (ai_corerev(sih) <= 2)))
@@ -570,12 +567,7 @@ dma64_dd_upd(struct dma_info *di, struct dma64desc *ddring,
        u32 ctrl2 = bufcount & D64_CTRL2_BC_MASK;
 
        /* PCI bus with big(>1G) physical address, use address extension */
-#if defined(__mips__) && defined(IL_BIGENDIAN)
-       if ((di->dataoffsetlow == SI_SDRAM_SWAPPED)
-           || !(pa & PCI32ADDR_HIGH)) {
-#else
        if ((di->dataoffsetlow == 0) || !(pa & PCI32ADDR_HIGH)) {
-#endif                         /* defined(__mips__) && defined(IL_BIGENDIAN) */
                ddring[outidx].addrlow = cpu_to_le32(pa + di->dataoffsetlow);
                ddring[outidx].addrhigh = cpu_to_le32(di->dataoffsethigh);
                ddring[outidx].ctrl1 = cpu_to_le32(*flags);