Commit 09aa9aab authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Linus Walleij
Browse files

soc: ixp4xx: move cpu detection to linux/soc/ixp4xx/cpu.h 



Generic drivers are unable to use the feature macros from mach/cpu.h
or the feature bits from mach/hardware.h, so move these into a global
header file along with some dummy helpers that list these features as
disabled elsewhere.

Cc: David S. Miller <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: netdev@vger.kernel.org
Cc: Zoltan HERPAI <wigyori@uid0.hu>
Cc: Raylynn Knight <rayknight@me.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent f7821b49

arch/arm/mach-ixp4xx/common.c

+22 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include <linux/cpu.h>

#include <linux/pci.h>

#include <linux/sched_clock.h>

#include <linux/soc/ixp4xx/cpu.h>

#include <linux/irqchip/irq-ixp4xx.h>

#include <linux/platform_data/timer-ixp4xx.h>

#include <linux/dma-map-ops.h>
@@ -43,6 +44,27 @@ 


#include "irqs.h"



u32 ixp4xx_read_feature_bits(void)

{

	u32 val = ~__raw_readl(IXP4XX_EXP_CFG2);



	if (cpu_is_ixp42x_rev_a0())

		return IXP42X_FEATURE_MASK & ~(IXP4XX_FEATURE_RCOMP |

					       IXP4XX_FEATURE_AES);

	if (cpu_is_ixp42x())

		return val & IXP42X_FEATURE_MASK;

	if (cpu_is_ixp43x())

		return val & IXP43X_FEATURE_MASK;

	return val & IXP46X_FEATURE_MASK;

}

EXPORT_SYMBOL(ixp4xx_read_feature_bits);



void ixp4xx_write_feature_bits(u32 value)

{

	__raw_writel(~value, IXP4XX_EXP_CFG2);

}

EXPORT_SYMBOL(ixp4xx_write_feature_bits);



#define IXP4XX_TIMER_FREQ 66666000



/*************************************************************************

arch/arm/mach-ixp4xx/include/mach/hardware.h

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 
#include "ixp4xx-regs.h"



#ifndef __ASSEMBLER__

#include <mach/cpu.h>

#include <linux/soc/ixp4xx/cpu.h>

#endif



/* Platform helper functions and definitions */

arch/arm/mach-ixp4xx/include/mach/ixp4xx-regs.h

+0 −54
Original line number Diff line number Diff line
@@ -300,58 +300,4 @@ 


#define DCMD_LENGTH	0x01fff		/* length mask (max = 8K - 1) */



/* "fuse" bits of IXP_EXP_CFG2 */

/* All IXP4xx CPUs */

#define IXP4XX_FEATURE_RCOMP		(1 << 0)

#define IXP4XX_FEATURE_USB_DEVICE	(1 << 1)

#define IXP4XX_FEATURE_HASH		(1 << 2)

#define IXP4XX_FEATURE_AES		(1 << 3)

#define IXP4XX_FEATURE_DES		(1 << 4)

#define IXP4XX_FEATURE_HDLC		(1 << 5)

#define IXP4XX_FEATURE_AAL		(1 << 6)

#define IXP4XX_FEATURE_HSS		(1 << 7)

#define IXP4XX_FEATURE_UTOPIA		(1 << 8)

#define IXP4XX_FEATURE_NPEB_ETH0	(1 << 9)

#define IXP4XX_FEATURE_NPEC_ETH		(1 << 10)

#define IXP4XX_FEATURE_RESET_NPEA	(1 << 11)

#define IXP4XX_FEATURE_RESET_NPEB	(1 << 12)

#define IXP4XX_FEATURE_RESET_NPEC	(1 << 13)

#define IXP4XX_FEATURE_PCI		(1 << 14)

#define IXP4XX_FEATURE_UTOPIA_PHY_LIMIT	(3 << 16)

#define IXP4XX_FEATURE_XSCALE_MAX_FREQ	(3 << 22)

#define IXP42X_FEATURE_MASK		(IXP4XX_FEATURE_RCOMP            | \

					 IXP4XX_FEATURE_USB_DEVICE       | \

					 IXP4XX_FEATURE_HASH             | \

					 IXP4XX_FEATURE_AES              | \

					 IXP4XX_FEATURE_DES              | \

					 IXP4XX_FEATURE_HDLC             | \

					 IXP4XX_FEATURE_AAL              | \

					 IXP4XX_FEATURE_HSS              | \

					 IXP4XX_FEATURE_UTOPIA           | \

					 IXP4XX_FEATURE_NPEB_ETH0        | \

					 IXP4XX_FEATURE_NPEC_ETH         | \

					 IXP4XX_FEATURE_RESET_NPEA       | \

					 IXP4XX_FEATURE_RESET_NPEB       | \

					 IXP4XX_FEATURE_RESET_NPEC       | \

					 IXP4XX_FEATURE_PCI              | \

					 IXP4XX_FEATURE_UTOPIA_PHY_LIMIT | \

					 IXP4XX_FEATURE_XSCALE_MAX_FREQ)





/* IXP43x/46x CPUs */

#define IXP4XX_FEATURE_ECC_TIMESYNC	(1 << 15)

#define IXP4XX_FEATURE_USB_HOST		(1 << 18)

#define IXP4XX_FEATURE_NPEA_ETH		(1 << 19)

#define IXP43X_FEATURE_MASK		(IXP42X_FEATURE_MASK             | \

					 IXP4XX_FEATURE_ECC_TIMESYNC     | \

					 IXP4XX_FEATURE_USB_HOST         | \

					 IXP4XX_FEATURE_NPEA_ETH)



/* IXP46x CPU (including IXP455) only */

#define IXP4XX_FEATURE_NPEB_ETH_1_TO_3	(1 << 20)

#define IXP4XX_FEATURE_RSA		(1 << 21)

#define IXP46X_FEATURE_MASK		(IXP43X_FEATURE_MASK             | \

					 IXP4XX_FEATURE_NPEB_ETH_1_TO_3  | \

					 IXP4XX_FEATURE_RSA)



#endif

drivers/crypto/ixp4xx_crypto.c

+4 −0
Original line number Diff line number Diff line
@@ -30,6 +30,10 @@ 
#include <linux/soc/ixp4xx/npe.h>

#include <linux/soc/ixp4xx/qmgr.h>



/* Intermittent includes, delete this after v5.14-rc1 */

#include <linux/soc/ixp4xx/cpu.h>

#include <mach/ixp4xx-regs.h>



#define MAX_KEYLEN 32



/* hash: cfgword + 2 * digestlen; crypt: keylen + cfgword */

drivers/net/ethernet/xscale/ixp4xx_eth.c

+1 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include <linux/soc/ixp4xx/npe.h>

#include <linux/soc/ixp4xx/qmgr.h>

#include <mach/hardware.h>

#include <linux/soc/ixp4xx/cpu.h>



#include "ixp46x_ts.h"