Commit 8409ebe2 authored by Nick Chan's avatar Nick Chan Committed by Sven Peter
Browse files

soc: apple: sart: Make allow flags SART version dependent 



SART versions that uses different allow flags will be added.

Reviewed-by: default avatarSven Peter <sven@kernel.org>
Signed-off-by: default avatarNick Chan <towinchenmi@gmail.com>
Link: https://lore.kernel.org/r/20250821-t8015-nvme-v3-4-14a4178adf68@gmail.com


Signed-off-by: default avatarSven Peter <sven@kernel.org>
parent 940ce882

drivers/soc/apple/sart.c

+9 −4
Original line number Diff line number Diff line
@@ -25,9 +25,6 @@ 


#define APPLE_SART_MAX_ENTRIES 16



/* This is probably a bitfield but the exact meaning of each bit is unknown. */

#define APPLE_SART_FLAGS_ALLOW 0xff



/* SARTv2 registers */

#define APPLE_SART2_CONFIG(idx)	      (0x00 + 4 * (idx))

#define APPLE_SART2_CONFIG_FLAGS      GENMASK(31, 24)
@@ -38,6 +35,8 @@ 
#define APPLE_SART2_PADDR(idx)	(0x40 + 4 * (idx))

#define APPLE_SART2_PADDR_SHIFT 12



#define APPLE_SART2_FLAGS_ALLOW 0xff



/* SARTv3 registers */

#define APPLE_SART3_CONFIG(idx) (0x00 + 4 * (idx))
@@ -48,11 +47,15 @@ 
#define APPLE_SART3_SIZE_SHIFT 12

#define APPLE_SART3_SIZE_MAX   GENMASK(29, 0)



#define APPLE_SART3_FLAGS_ALLOW 0xff



struct apple_sart_ops {

	void (*get_entry)(struct apple_sart *sart, int index, u8 *flags,

			  phys_addr_t *paddr, size_t *size);

	void (*set_entry)(struct apple_sart *sart, int index, u8 flags,

			  phys_addr_t paddr_shifted, size_t size_shifted);

	/* This is probably a bitfield but the exact meaning of each bit is unknown. */

	unsigned int flags_allow;

	unsigned int size_shift;

	unsigned int paddr_shift;

	size_t size_max;
@@ -95,6 +98,7 @@ static void sart2_set_entry(struct apple_sart *sart, int index, u8 flags, 
static struct apple_sart_ops sart_ops_v2 = {

	.get_entry = sart2_get_entry,

	.set_entry = sart2_set_entry,

	.flags_allow = APPLE_SART2_FLAGS_ALLOW,

	.size_shift = APPLE_SART2_CONFIG_SIZE_SHIFT,

	.paddr_shift = APPLE_SART2_PADDR_SHIFT,

	.size_max = APPLE_SART2_CONFIG_SIZE_MAX,
@@ -122,6 +126,7 @@ static void sart3_set_entry(struct apple_sart *sart, int index, u8 flags, 
static struct apple_sart_ops sart_ops_v3 = {

	.get_entry = sart3_get_entry,

	.set_entry = sart3_set_entry,

	.flags_allow = APPLE_SART3_FLAGS_ALLOW,

	.size_shift = APPLE_SART3_SIZE_SHIFT,

	.paddr_shift = APPLE_SART3_PADDR_SHIFT,

	.size_max = APPLE_SART3_SIZE_MAX,
@@ -233,7 +238,7 @@ int apple_sart_add_allowed_region(struct apple_sart *sart, phys_addr_t paddr, 
		if (test_and_set_bit(i, &sart->used_entries))

			continue;



		ret = sart_set_entry(sart, i, APPLE_SART_FLAGS_ALLOW, paddr,

		ret = sart_set_entry(sart, i, sart->ops->flags_allow, paddr,

				     size);

		if (ret) {

			dev_dbg(sart->dev,