From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E74FC3019C5; Mon, 18 Aug 2025 08:43:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755506630; cv=none; b=EIga/ROos9nNyEY++CdQzb+wpoNvfa62T5F8Brzm6jKahooy+icVaa5OuOjYTuVQoIMfdU7kmZioVcDLpXKHqXedkJT2HruzsTF9R79TAWbsWtXwI/vebVwMFOBdU3dB6Qh+H22rl0sXYbHhJNkdWiH1wx2NRhNQXTKmOcOkq7s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755506630; c=relaxed/simple; bh=SfdgOsOFi3dLK60ZgLb2wBFpqlY1bGwIVMJiWwSGmDY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=TIx8sNHmjzehOuVczlIfCLaVV+O8Ir7qvArpjJ4aUo1iuV3O82jV5ev6QLzS4djeywEjwDT/eZORKqdTAqbYE6Vr2bjyeiTuCCH7xkAdNnxNXh5N9XqvEydPsFizyQvGLgabAiOOaHL3uKbP1pIReA78MNilrQo+bs2b14PNEds= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=CYghNQIh; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CYghNQIh" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-24458272c00so38988995ad.3; Mon, 18 Aug 2025 01:43:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755506628; x=1756111428; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=lR6d/3iSNfW69zNSjSYVLBPlm+V1j+wnMpITzuYS4AA=; b=CYghNQIhPG2KgcstX9tnXGXwSeb6Ox0ErYLVs1TsJRbZkkqwQLZp4Gcs2ZCpGJPR+S HFOCgi+YNWWR6qRBldvmnZ3fLIqlRWeFrI6kMsgPAoqfkEr5JwcQNsr2k4Qx8bx0oKlg 95qtnfF23IynNZqi9sUEs3+7S0hH253N8xNYwwH8JwGkf35nwdQK+ju6f4PN/Z3KYPQ7 ySx7+4+92Roq72rz1cjF/JJEemyCV7KFf92GHGqWP+iyKHZ2TRIPJ52/IJrD92tjBD8t bM77w5nqy3xQmoE74kPraQZZ3B+XvCWBHER/UxyYRci8bL59zlZmggFjcK+pP4UBD88L faxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755506628; x=1756111428; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lR6d/3iSNfW69zNSjSYVLBPlm+V1j+wnMpITzuYS4AA=; b=YQWMuXXvQqevksc9HQJXncoCiuomZapu84fGqXnWg+0vv76f67z5aj3osfS+gAa/T2 4+mmh8qI8TediB/0K+PnMKLPuVp3uCyHXOlFpsvL2GH2dbMsbAB+k6xNZkE15jADS1hS xnUAUKxv6y4PXgrDqscqGxAYEqWYpPta9MyznrHQgfMmc95o1LXJ+DbDh9DNpBmMipbX nUQMW87So+IQW5T0KYwDEJQxJhqkXIb3ixqevQqNoOluJZbk3LSeZOCnqDNpq4Tk3c8G lhX/+s9yxQLChuFh/tWNl0dscHVlAjPpl6CF0g/v9DfjURI+c9FfYdQsiDSiYpQ3Ck8T A/NA== X-Forwarded-Encrypted: i=1; AJvYcCUnKWXtSvVaG/k/Y3lPUDOvmKXls7ECZIvOgqmwzGQ7PC8UhUWEUtHA8Gh003tv3+MT2n58HjwQECGg@vger.kernel.org, AJvYcCWTxbM13wle0YEg9lljEIUsohPWONl9l/0cSyNNK71IQ4LzTBDzohTsx/YUzyoq0iGc+BmmXpVSTJe7wjDo@vger.kernel.org X-Gm-Message-State: AOJu0YxvZ09JKet2Q+S+eKYZuxk4V+pIoXNI0MmXtdrJL2d1sS1q4iBe 7GBdPY5KnAAhqz1UgdbS10bJD46EWnW53X2jqBEQ4f+w1bHOGpx4wsb0 X-Gm-Gg: ASbGncsTV5vMmQT2GHZQX6G0GPF7twUzUyMt00mSo0x8mZ0t3UymgastfwzR0kHVQGN k63ihqJoRTRlyjFoqjYWk1Orm3uxKMVwocKMTszoZ8KaY1+0V7ACqdX0npe0JMV3hxs7NcvykSi l22C0kdI5w38mXh2TxexySdbcnLC2f/jxug9GlySlbBO+uxrpJ/DGNVhwxJalEgLTxDHnkNldBG xQ6BO6updHqxVYXiKtcx7+qhm+zUEXpXI1lTqz6HP2Ag6ddlt9A2g55Xx85ntjefe46mEOPKXly /RY/0qNVge3HCRh1kSViBIhyWwDl9nUBYO6xR7E8reemBtK5bdGe9p9sOMqeDklT0vlBHoI8tGj nXECAC9JzuAKZE9An/mdpa3LyF7foEWIyE4PsCEPuyLvVXrE= X-Google-Smtp-Source: AGHT+IGE0067BnqCsNs4bYtEQYzzJ4UirziWwa4iYUzmO8cpWyztzcvYDjdk1rlUKAgEjbaBIMQQEA== X-Received: by 2002:a17:903:1a2c:b0:240:50ef:2f00 with SMTP id d9443c01a7336-2446d8f407emr157641995ad.26.1755506628132; Mon, 18 Aug 2025 01:43:48 -0700 (PDT) Received: from [127.0.1.1] (061092221177.ctinets.com. [61.92.221.177]) by smtp.googlemail.com with ESMTPSA id d9443c01a7336-2446d538f75sm74090925ad.108.2025.08.18.01.43.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Aug 2025 01:43:47 -0700 (PDT) From: Nick Chan Date: Mon, 18 Aug 2025 16:42:57 +0800 Subject: [PATCH v2 4/9] soc: apple: sart: Make allow flags SART version dependent Precedence: bulk X-Mailing-List: devicetree@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250818-t8015-nvme-v2-4-65648cd189e0@gmail.com> References: <20250818-t8015-nvme-v2-0-65648cd189e0@gmail.com> In-Reply-To: <20250818-t8015-nvme-v2-0-65648cd189e0@gmail.com> To: Sven Peter , Janne Grunau , Alyssa Rosenzweig , Neal Gompa , Jassi Brar , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Hector Martin , Joerg Roedel , Will Deacon , Robin Murphy , Keith Busch , Jens Axboe , Christoph Hellwig , Sagi Grimberg Cc: asahi@lists.linux.dev, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, iommu@lists.linux.dev, linux-nvme@lists.infradead.org, Nick Chan X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=openpgp-sha256; l=2768; i=towinchenmi@gmail.com; h=from:subject:message-id; bh=SfdgOsOFi3dLK60ZgLb2wBFpqlY1bGwIVMJiWwSGmDY=; b=owEBbQKS/ZANAwAKAQHKCLemxQgkAcsmYgBoouellqqMH4V1jKMBzMhHfZrJO3Ydy7TcAv3fU mzAcpZmYteJAjMEAAEKAB0WIQRLUnh4XJes95w8aIMBygi3psUIJAUCaKLnpQAKCRABygi3psUI JBSAEACShbYtnm9veqAOH7lI1/GZtCd7iTn7NwNjLKYJCZjq3yEnkhimjP4juRRTv5iz1xUuRmC MXxW7WqQxAx1f/aAGdD3IYPSjtyA54MWPXesBRUkI/enofpJH+TW6uhs9W7FFPmC4rYBsDEm4fF V/5EUWfSYN8FJ2mC2mq+J+de/x5f+liD62wXjiCapu0CggzjOohIJ0+jjL6WVX4yJDXpfwEDIH1 vjqtG116IqW76NfkHFZFq5EyaiLSprlAmFsio0rjQ31LFlLKFOkbT65OX4XKPWJreTevTOt0NZ6 FnJ1VhTJ8pkSvRwsTEUKU8J0E21dnSj6U+rLdVfzjduUnqrljcgC2zmWUDW49vutVfb+KhRtZra s22lDgrQBFBX7vAaDR18a31ttMjPllD3YcEqQuZXkXpjKn38TizxwyLyiOcsw0TFmqWtGaKm5A6 OJtM2sNKMDuW+w0vEKi0zY9LoAV261VD7WqKk9fCYFvQ6cdswkLoNYd8heyFHoKhwkFbhvv4PHb vJElNLuTXfiHkBUlGqeyRZylNvMCJkzvTbaD635wXjf/raQOFAhyR+S+CYSErzGqyVeJKRGXPmD rp53KBdtTrqzbJphtsxkJe/Adrm/HWWGXzPQJJ7sBf1z5a5SQ+gKiPRKrcVKWp23oFKxTKFAEaa 5p1slDUgrXdxSNw== X-Developer-Key: i=towinchenmi@gmail.com; a=openpgp; fpr=4B5278785C97ACF79C3C688301CA08B7A6C50824 SART versions that uses different allow flags will be added. Reviewed-by: Sven Peter Signed-off-by: Nick Chan --- drivers/soc/apple/sart.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/drivers/soc/apple/sart.c b/drivers/soc/apple/sart.c index afa11173689979f100a63221af03214f4a928a7c..318f6e518a54f6edb8b97e320519df8f77c7f143 100644 --- a/drivers/soc/apple/sart.c +++ b/drivers/soc/apple/sart.c @@ -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, -- 2.50.1