From nobody Wed Oct 8 11:42:51 2025 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (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 E0E7223BD13; Sat, 28 Jun 2025 11:57:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751111841; cv=none; b=pmwjL7UG0zWXIoUtG10Vbd+n7bQ/nuqtyN0gpp/CQd9lxIUElyOJ4bmVLnEQEVlSXkSTVk8ShQ9JK+1i2iyeB7mGcMCMOganXicjpG5ZaygqrPCXBYGq2wfs/9dwwH0gQEv4L55aJlH5ohqT/C16bbv+t5A4bd3PYhauPihpSl0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751111841; c=relaxed/simple; bh=mr4OZ+xU5d9kdFOZJ2oHja9vhVwAoQdVD97OEXBhRKE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Mqm+WTyR9ooaf7jk1aR/ptRZAVAKA1GCm3k428lNkfSE5EBNV450+P7pU0Cff8l0WNB2Lif+Sp5YFAiuMbLsZVIoLorZBGhUtGZn+hBf4zQPd0wh+knmu9GPeyGo59vkUYFyJWKklyn+uC6/xlzJwKW0IFIhFWCvuxnaUbh/RdI= 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=GNJ7fM9e; arc=none smtp.client-ip=209.85.221.47 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="GNJ7fM9e" Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-3a536ecbf6fso1731526f8f.2; Sat, 28 Jun 2025 04:57:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751111838; x=1751716638; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DmH4/UammIJwWR8r8pdsi1PSjJlkibdp/FaYgime4pw=; b=GNJ7fM9eOPs+2foljV+beePzn7QwyhDtnTXNVcwVwPrRoL4AnApXrePApIIB0LbT9e mERoi1SoyCP0Nq6YKy5Q91x3BdeZfnDG0mrpLuiQbYDY/j6ez5ml4OgB/wYMP26WmsuM f2uTJNnsuAKugCR/mf8rwChlcJMcaERRayz/r2Uq/Y4/VxjLKwoYBZZrE5F76bvIsMmy iMtFPPMmmcSijERGUepN5B0GXKLSdKplZYMi1edJ20xkMptlBN3h0VHv23VYtfP63GEx PyimzKnpfzhjkNWi4VqoPEuReeHlnWE9ccsOXqFex84L3VXVApl5e+Oribx36DyIdyy0 /yEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751111838; x=1751716638; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DmH4/UammIJwWR8r8pdsi1PSjJlkibdp/FaYgime4pw=; b=VlnscsXYB2jGwrvQKY4YP44JZyP2vFfXoDBwXkPN1l3muDe7lAceiSOBQvl1V/ET4T NrxM5RTgJwuY1m0XlU1vTM84hDFJq5gfjXh1uyX9+zALXtUVFdZM/m5AATXL9UU1Auqm 77mC23cgfc4/D83tVbsQ2pfvY/njXk0SpVJC0ozccOy6lc8BjMlXTCD0J14JNpc4+vNd FygqjcO/iyR3twEgPUHWzdXwnh+wjRtsXfKNR8nv/c3VmSoClFNtQMSTGNw2u9WVqNB2 R+43vcbwf/1PSlkPTGTENQhdqk+0cOt1ZF1xUC60sUZnhdWy42eD0KfekrOYMSoJLiVc sXiA== X-Forwarded-Encrypted: i=1; AJvYcCWZD2IVQGnNuElZ0LYkPgifgi4IGrTd7930MkXDOEsMhWWgFUfGe8m55fIni/pig/HNUojYmdUeKTDJqTDrT57T4PY=@vger.kernel.org, AJvYcCXBbz9qWJawlQ/HH/DdNOL5zVP/y+v4Fmc36QHrztH7Hp7e+uGOtxMKVBrcaNCpxfFcQvlyAtEnsbje@vger.kernel.org, AJvYcCXtOXL6E8Q8i5Kbl5bsgzE2a8mZwgvckEN9zFyQtTwHtednwoGESHtWG9Hr78MynRMwGB72xJtgyuT03kbv@vger.kernel.org X-Gm-Message-State: AOJu0YxyTWasSyPgCtllKD9RNR2TrKUIsRNNUFRfWdGdqBj9SdEbBwh7 ZizdzS+5Sebt4LilGDCWLiyjRx+qVCe+D+az8n9DoSce6nIch8CsPkl3 X-Gm-Gg: ASbGncuIOqlHTvNEO9RRWJ3qkPYjWdh7tB2wNU9O4sGzI28QZ3zvvk6HTu0/bqP/56h eshXt7cfUDMcn7dFxDgXBEwB5f8+e/k7gh2Lq+Ziqh7bEwxd3p8z4U90daku5kT2YsA1ewQWcUi oJpIRFANjas5iEjMzvvmh3zYk3pIlcZVE5Xjn95CDK6GXv3r6fmaAYu9xBg/k2h8JRa0D/ldXsh PnoeWbinzdYcEsrV7awCmb39dkhLNOf83jjZVD6uq7rKMFXWN/qG2usO+LEfyY9/p1nv00GwFaG paHoXwmEyg19Et02OQG7ruuuqozbnTbTtImOZw1e+O4tlohgOHuRhw0wU358lsFjA2DDzsUGWMn ZEdL71RaiDXlWCqt3sGi6 X-Google-Smtp-Source: AGHT+IF3sfWUCW4uqB+IjR0BYBQRGHTp8Q3p1J/nSX00xlB2jVhL561hZeU310JKES5NxjyDH6cpeg== X-Received: by 2002:adf:b60b:0:b0:3a4:f939:b53 with SMTP id ffacd0b85a97d-3a8ffcc9d53mr5337407f8f.38.1751111837820; Sat, 28 Jun 2025 04:57:17 -0700 (PDT) Received: from iku.example.org ([2a06:5906:61b:2d00:dca0:b0f1:f055:ea37]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a88c7e7310sm5247818f8f.18.2025.06.28.04.57.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Jun 2025 04:57:17 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Greg Kroah-Hartman , Jiri Slaby , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Geert Uytterhoeven , Magnus Damm , Wolfram Sang , linux-serial@vger.kernel.org, devicetree@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Prabhakar , Biju Das , Fabrizio Castro , Lad Prabhakar Subject: [PATCH v13 1/5] dt-bindings: serial: renesas,rsci: Add optional secondary clock input Date: Sat, 28 Jun 2025 12:57:11 +0100 Message-ID: <20250628115715.102338-2-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250628115715.102338-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250628115715.102338-1-prabhakar.mahadev-lad.rj@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Thierry Bultel Update the RSCI binding to support an optional secondary clock input on the RZ/T2H SoC. At boot, the RSCI operates using the default synchronous clock (PCLKM core clock), which is enabled by the bootloader. However, to support a wider range of baud rates, the hardware also requires an asynchronous external clock input. Clock selection is controlled internally by the CCR3 register in the RSCI block. Due to an incomplete understanding of the hardware, the original binding defined only a single clock ("fck"), which is insufficient to describe the full capabilities of the RSCI on RZ/T2H. This update corrects the binding by allowing up to three clocks and defining the `clock-names` as "operation", "bus", and optionally "sck" for the asynchronous clock input. This is an ABI change, as it modifies the expected number and names of clocks. However, since there are no in-kernel consumers of this binding yet, the change is considered safe and non-disruptive. Also remove the unneeded `serial0` alias from the DTS example and use the R9A09G077_CLK_PCLKM macro for core clock. Signed-off-by: Thierry Bultel Signed-off-by: Lad Prabhakar Reviewed-by: Geert Uytterhoeven --- v12->v13: - Rebased on latest linux-next. - Updated commit message to clarify the ABI change. - Used `R9A09G077_CLK_PCLKM` macro for core clock --- .../bindings/serial/renesas,rsci.yaml | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/Documentation/devicetree/bindings/serial/renesas,rsci.yaml b/D= ocumentation/devicetree/bindings/serial/renesas,rsci.yaml index 4aacc44bb509..f80cb60ae099 100644 --- a/Documentation/devicetree/bindings/serial/renesas,rsci.yaml +++ b/Documentation/devicetree/bindings/serial/renesas,rsci.yaml @@ -41,10 +41,15 @@ properties: - const: tei =20 clocks: - maxItems: 1 + minItems: 2 + maxItems: 3 =20 clock-names: - const: fck # UART functional clock + minItems: 2 + items: + - const: operation + - const: bus + - const: sck # optional external clock input =20 power-domains: maxItems: 1 @@ -63,12 +68,8 @@ unevaluatedProperties: false =20 examples: - | + #include #include - #include - - aliases { - serial0 =3D &sci0; - }; =20 sci0: serial@80005000 { compatible =3D "renesas,r9a09g077-rsci"; @@ -78,7 +79,7 @@ examples: , ; interrupt-names =3D "eri", "rxi", "txi", "tei"; - clocks =3D <&cpg CPG_MOD 108>; - clock-names =3D "fck"; + clocks =3D <&cpg CPG_MOD 8>, <&cpg CPG_CORE R9A09G077_CLK_PCLKM>; + clock-names =3D "operation", "bus"; power-domains =3D <&cpg>; }; --=20 2.49.0 From nobody Wed Oct 8 11:42:51 2025 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (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 5DF6C242D8F; Sat, 28 Jun 2025 11:57:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751111843; cv=none; b=T6nI3MR8WToMoFbcqGj95eRkvA1b4f3HdxpnnJilFtVpniSY/b6P0LSSjFWz61T/aZwztOSfiMu/HX5Fn7XJwwEovxMfHUCW0IyMdT6TPzpK0eyW7zvDmElY4+UDUphhx3Gi4V1/9sbSBzVB3xw7q5dOBsAXemEEZZEn5MU4fa4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751111843; c=relaxed/simple; bh=yvzND0sg3vpEhdaF4vdRpgLUncWkV2C64H3T2NXjUg4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iJ1PvK1LMeFafBXIsLIk+fMf8Soz/sRKqbvsIkYBQUmPkuUpocdHOXLmbwll9U8fxBV6pIBDKHcR1uXJa5gvQSskYWy5y09ES+gB1mzAco8FC7hp8j4t20bfKHTCoH+Mqal9qHqjfGoWK7BZSCfoqdwXloLtNQ4hQesOy1ILhWQ= 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=VP5I16ga; arc=none smtp.client-ip=209.85.221.54 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="VP5I16ga" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-3a548a73ff2so2703727f8f.0; Sat, 28 Jun 2025 04:57:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751111840; x=1751716640; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=OuC82DbT1dmtTLXSBrJ5w6LkrvFEvJAEZJmY/9FJv/g=; b=VP5I16gaAe9a2TSiANApDdsEkrUWnqyRTuk2KLkW6sYFGC+9kA84F9/IYETNMgwXlZ p7RmiIu49gerzij2p4inH/C/Syanq7dWrk0RZI0C4GAyEFu8D7O2UEfUCZgJy/60/m5g hDZS4wGq5Cm36DZ0ftZrUxHraUaVU0bMPbN8yyiVfryI/B+6/zO3+0tM1jgUV7cXwsyT vSM/bUncXbLDNs/BjlNUtieRhrf2eyuMVOwriZL/p/GjnLE5d3Wuuk/hXnoHz0Ge/MtH 5fhbafXQUzZ/qvy6zeZvOH5Ghbku24thJNlgBfWKev7F1ujD/wUHsb09H8tOLTcjD05v LJ5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751111840; x=1751716640; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OuC82DbT1dmtTLXSBrJ5w6LkrvFEvJAEZJmY/9FJv/g=; b=IuZ9qu8LPyVliWZ3HjWhgw4QDmnoz7ZaVo0RMQAS41JrsH8o2rDIVkxS/TYN7zNDjr E+a/PXhEVx0yfQV35X4vaEX8jPXjsg5cdiDELBhDf/atqAj905vWOdBXqSYfNc2nm+wN xz+quIvniYnTzSF8eRg0FnOtNcxUEVlKEx+HH3/2Rsgs0+9pCT0+YyZCOarWkDa0kA/T mGZlMFlMomIWHardE52OceMa9WtDJZSj9ASZ660YgYDSOMDObsI+SBpl2Nb/tfYaJKUA J9+6vaCOshMchKcjCTYC9ZZKZhwvEscHql3dMnGi3vcg1o6isXzjWR6PXSljiphSIyf9 YfLQ== X-Forwarded-Encrypted: i=1; AJvYcCV2Djx4LZSrm7sF5iGBqFNG4+UYTWJeculvFKuwyObZyN/Cx+EWsk7MJAp+YIssdw3BkZuCO+CXasiU@vger.kernel.org, AJvYcCWfryS25YHmsYm2Yi3LQLbmA1PrU5A7J6YjMiB3QSwSGu5xpAPPlb0JOKD1BK41q6ZFWAwUAYYp8PJCrs4d14Onfn0=@vger.kernel.org, AJvYcCWwtVWrBndsRiwYEHtWgA8ejAPbGJSsBIY8RYJrP72+fsDyENNKOlPT8KGgJ7UlxlzStYqMMadakW6UpU/s@vger.kernel.org X-Gm-Message-State: AOJu0Yx8ZR9+oOzhTFuqiNROtSBk19OF1CMoXqOjgmM+TEnrr65BNZWw k8dqrkT4I0TA2qO/BDTCOzVM44/U36rwGcFb/QU6sbk5KRtHiYZV0HQH X-Gm-Gg: ASbGncvGr0fEOvCposRp3g3OJAXFXz2NOLdj9DgUZJtk18SFKSxO51GNm/uXbTiPyPZ shQ3wAo0oD3WXrc6ks3X89F3dOE+CUotjTzh2sxSwlkVUWwxJNmDDbV8gllnNAv183ujzCvTHqT 2zFzyFeq+PB2260lIFEqIG4EyaZIAQMjxto4vRAHc7CcjYT2UOKKZOlBjl2WclnilodKke3HgMl bAhQ4dJGYUUC48mLjY/ykxObYqEaW3c4NYBvrJDSwoZsn38S2cN/N12quQG7FUkt1KAJ2cOfch7 D8o+/XbCqUVKJaM8o+tNRmh6XPsMA4pwjQp/axkn3YNFv0XttEeRG+YZ5XUPwLDdSjlaZ8NNT/P hSfAh5iaXDZ2SgW3yIrgG X-Google-Smtp-Source: AGHT+IG09ATMYcw8IIItItTBNyXB9mBmFjmTyoZsuRr0D1YtmHXdtsrvLFML5KcswZmf7Cwze7KJ/w== X-Received: by 2002:a05:6000:40c6:b0:3a5:527b:64c6 with SMTP id ffacd0b85a97d-3a90d0d6ce1mr6864480f8f.1.1751111839307; Sat, 28 Jun 2025 04:57:19 -0700 (PDT) Received: from iku.example.org ([2a06:5906:61b:2d00:dca0:b0f1:f055:ea37]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a88c7e7310sm5247818f8f.18.2025.06.28.04.57.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Jun 2025 04:57:18 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Greg Kroah-Hartman , Jiri Slaby , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Geert Uytterhoeven , Magnus Damm , Wolfram Sang , linux-serial@vger.kernel.org, devicetree@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Prabhakar , Biju Das , Fabrizio Castro , Lad Prabhakar Subject: [PATCH v13 2/5] dt-bindings: serial: rsci: Update maintainer entry Date: Sat, 28 Jun 2025 12:57:12 +0100 Message-ID: <20250628115715.102338-3-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250628115715.102338-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250628115715.102338-1-prabhakar.mahadev-lad.rj@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Lad Prabhakar Add myself as the maintainer for the Renesas RSCI device tree binding, as Thierry Bultel no longer works for Renesas. Signed-off-by: Lad Prabhakar Reviewed-by: Geert Uytterhoeven Acked-by: Rob Herring (Arm) --- v12->v13: - Rebased on latest linux-next. - Added Reviewed-by and Acked-by tags. --- Documentation/devicetree/bindings/serial/renesas,rsci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/serial/renesas,rsci.yaml b/D= ocumentation/devicetree/bindings/serial/renesas,rsci.yaml index f80cb60ae099..5aa31e2e31c8 100644 --- a/Documentation/devicetree/bindings/serial/renesas,rsci.yaml +++ b/Documentation/devicetree/bindings/serial/renesas,rsci.yaml @@ -8,7 +8,7 @@ title: Renesas RSCI Serial Communication Interface =20 maintainers: - Geert Uytterhoeven - - Thierry Bultel + - Lad Prabhakar =20 allOf: - $ref: serial.yaml# --=20 2.49.0 From nobody Wed Oct 8 11:42:51 2025 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (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 A27C2246BC6; Sat, 28 Jun 2025 11:57:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751111844; cv=none; b=UFs7J9O7cq4+dira2/glT//AMLmH7pU+hGpqD1t7Ffm5114MriWHFkzhrIa25t2BRDXsSRAo2OjQyVc/dql+wWCkttWE54niji9+Bt2VaGlBy+UvmsI6tL+ooC1EaFJw2P535HzWbTpnCLqLZrHdup7Z7+nKt9pvBGBFUvlG318= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751111844; c=relaxed/simple; bh=+P7qdg3affLONYbyRNA52F9b0gXvCpeloZTRNGflykk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=js2mnm/+5v24xDRsBhOXADN931xXEHGx1s7UTEJUFDE7gm8vi/OmFjMgjaGz/vu8IViuRApn7SWK284HWCKRS31wA/67G250ztmhPGFUcEdgoNgXezsqXRw4FLXZXYWxMkaZlFA+cOheSrHpqd96Cs8Aqq7I1pwRm7MpMjurfLg= 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=KAAf73ag; arc=none smtp.client-ip=209.85.221.54 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="KAAf73ag" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-3a575a988f9so1844331f8f.0; Sat, 28 Jun 2025 04:57:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751111841; x=1751716641; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Vt57lhKghs0xjG0iIIUZ8pzjHBVb+Sq327e3qQGY/5A=; b=KAAf73agHqzrtZfVaWKXNUgRWVpg1kZeIOx3BvZnLR1d7nMl9nrJ2r5CsBV6Irmlw0 55Sz6+DdQIBkBvU2/gBAC3fnaxWouk5GryddJlH9xLOOEKCKUO9njEMvC5sqYnXAp1PB Ps7nM48URXIjsK0yXHVH7C2Ds5BZ6NYi3n1d+FrsQ7NbG4hYwyHijjupjE31sxRHhOYp nMQMkzUdqFcAIty6AJmUm0VNcj7Hwlp+vNcDUWWhc7++gqVzR7yr0jHFP05PkPtGnMeF sghe+O+P+wg5TwGbRdWTE0i4sn7ZAtiIHlpiJoSvElirT0T7VUFlD+R1eSjBgEeJnaig bngQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751111841; x=1751716641; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Vt57lhKghs0xjG0iIIUZ8pzjHBVb+Sq327e3qQGY/5A=; b=W7+ltYJwVZFDLpRM/jMVKCD9+RkfzQa46ecK+xFKoeDkktgK3Rzyzbn8A6KuJwRRyk 278koq0YpvW9Oja+/GexTiaxSoKtJIhmuIhugUXC7yZE21TKBSAarCYHS+mpnRXwuWRS bgIIdGxwPONQ7AOt+rwH7xz2vqoSdBRnowbvWYjqftcC6Y8RLerm95mXdVwzmZCpVYYz aAniEFRTP2XgOoaPFL3xJRyT6R0gNI8qOtYbUGHBsCJr4doQZt+/ZDSc6jFdq3FCw2WH ZlHrbxdcOIK61sSXzGT2rKWw6VZ+vYI5FtH3QkB+DRDHxRzcDuRpkNmOvmkHfhG1Xd3d CvVA== X-Forwarded-Encrypted: i=1; AJvYcCVGndFmE2nIXhQu9adcZpvjfhcTC0g/qkG/sznyzzqPotKYbSOtBKEGH1+87YeeFMnnU3ClaB9qjCMYDsbd@vger.kernel.org, AJvYcCXNM7AIDbUNQEs5W4hZ8vkhmF23Xh2gx77j5DOByhh1wF4OKAi9hkPtCDHOTwwdTRLfPZk2NPyzh/9T@vger.kernel.org, AJvYcCXzuMAqlanbVnEgSHYS7s+b6vblc4ujuqaFE/k/dJUXMiPcy36P45/o8IwFz2IUtyPnDYJNbBZuS8CpbdSPlsMehHA=@vger.kernel.org X-Gm-Message-State: AOJu0YyCQcpDtr1h4WAS1cxobushioJZiwOEHmOvA56dPh31UP6yxnhL ilh5z7EXMd6wGhW14Ap24+uZFfJzjneJk6ti6HYJoZ1K8Tk7aNUtMxD+FzJivy7b X-Gm-Gg: ASbGncuBGKc/u1UwC4ilalgT4wTB/5BDlzurvXYmNKjQ/Z2nEfHa0iKYEZlyEBjXQGC U0ypBsTWVJIbpvXWrnOQvjBb3BUQ4erLG4Ke7WH0o9pDGla95b4Z0xJXYN8J1zW70fw6IUvU+rj AMSuW1iQFAh50NcovMHCisrULPjWzQxMkZCzMALHpJs2owJaC14L4TGF+pu0YuwAGN4eNxeTfSy 10que7I9FtkHyUteCovIC/04ECZaEHAM0M9AY5ROSs3ys5i5qqBCzkQmqOsrRgwI5khxo2zM/gb uwhBgppbTn65L3fqZ5P3lkDGzQNQA3/Tj4ToPfxkoOWqEkVK34iPo4hMX9W/h651VifLXaDTRG7 LIUYpOdb2J8i7093U9oBY X-Google-Smtp-Source: AGHT+IEA3BjMqaD1Rc+5dV+vcziUGPD6+GTIDJcNWmkEf/rWGznrE7Q6fPbHQGqTuKtx4IAvtu3Ygw== X-Received: by 2002:adf:9dd2:0:b0:3a4:eec5:443d with SMTP id ffacd0b85a97d-3a8ffcc9e9amr5197727f8f.29.1751111840546; Sat, 28 Jun 2025 04:57:20 -0700 (PDT) Received: from iku.example.org ([2a06:5906:61b:2d00:dca0:b0f1:f055:ea37]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a88c7e7310sm5247818f8f.18.2025.06.28.04.57.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Jun 2025 04:57:19 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Greg Kroah-Hartman , Jiri Slaby , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Geert Uytterhoeven , Magnus Damm , Wolfram Sang , linux-serial@vger.kernel.org, devicetree@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Prabhakar , Biju Das , Fabrizio Castro , Lad Prabhakar Subject: [PATCH v13 3/5] serial: sh-sci: Replace direct stop_rx/stop_tx calls with port ops in sci_shutdown() Date: Sat, 28 Jun 2025 12:57:13 +0100 Message-ID: <20250628115715.102338-4-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250628115715.102338-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250628115715.102338-1-prabhakar.mahadev-lad.rj@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Lad Prabhakar Replace direct calls to sci_stop_rx() and sci_stop_tx() with port ops callbacks in sci_shutdown(). This enables the RSCI driver, which reuses the SCI core but implements its own stop_rx and stop_tx logic, to reuse sci_shutdown() without duplicating code. Signed-off-by: Lad Prabhakar Reviewed-by: Geert Uytterhoeven --- v12->v13: - Added Reviewed-by tag. --- drivers/tty/serial/sh-sci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 1c356544a832..5c4283ce542d 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -2289,8 +2289,8 @@ void sci_shutdown(struct uart_port *port) mctrl_gpio_disable_ms_sync(to_sci_port(port)->gpios); =20 uart_port_lock_irqsave(port, &flags); - sci_stop_rx(port); - sci_stop_tx(port); + s->port.ops->stop_rx(port); + s->port.ops->stop_tx(port); s->ops->shutdown_complete(port); uart_port_unlock_irqrestore(port, flags); =20 --=20 2.49.0 From nobody Wed Oct 8 11:42:51 2025 Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) (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 BE00724A063; Sat, 28 Jun 2025 11:57:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751111846; cv=none; b=sqX+4u1/tfOWnRQyo0plVJsAh8wOQzG+swRpG1KI5y+gML2ejCyPyBDlAcVtJVCoeLSdaviG58K5/C2u5tuZ69LxtLAcsTW9gUun9+fsh1okJujw8NS8JXR7VU9TIi9zVMQSDl5/qScWciSubzTsj0DTcObqBxDYIt/g6yZ8oIg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751111846; c=relaxed/simple; bh=NVj33GGtqtNsoY5q50Y5QCy2i9xI5ZKYXt759VsiPHE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JPc2rWVzDhDOnLonBwJILk50b+UxSGKc7ae0oi1E6AldTtt+2Gusi9U0QplqYWI+Yb3s4ZU3BVG00mxqlLuv6c6nZJoOf6FGrjEPiHkS7WiN5RdJEh0Dudh3npu5ATVY2b38XTP+xvnnoc3jJu4Fnck3kaP3O1jCx7MlYkkrQSM= 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=Co55/rJT; arc=none smtp.client-ip=209.85.128.42 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="Co55/rJT" Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-453643020bdso26361225e9.1; Sat, 28 Jun 2025 04:57:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751111842; x=1751716642; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6jRY762+mddMevHXqV+MenoIZG0gyllUIhFlampiqTg=; b=Co55/rJT64ub2hQHHvfyr4eO9HEL0bUDbajabRHRWngkzGOsl9r/jpG3Swwm3VbqoJ VS0IfS2tM/lgpD2mFoQfUta6pcIPHoxet7j4aAQ+//rLA6N1RZGs5197yEdtFAjs/Fq9 D0IAEC33W85aZ4OK+AD8OhftrL8PoS9XxvE3tj7v4dAdHLpSOOE2tzPVEJoQRQtzKyPr /EUpbVP72FBYak4VGBIhzuror9/+BB6A4x8GCN/1xp2dopHwsidbG9HgFVKWL05hMmkQ Fn78TfI3YGyj6GkwCs6AsaQuQ3XsQeYTDn5rhYJpOucL63PSKasAc474DRu1/Y762f8r v/kw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751111842; x=1751716642; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6jRY762+mddMevHXqV+MenoIZG0gyllUIhFlampiqTg=; b=Evsl3+ovR0BXHF3nK/6lIpArf4QybE8zm4v13j9TyfU5oR+pN5itb4jcdObD6sYUJX u695m94aA5mU1AGZH85uKzFhFgyrSMY3EhiHpSiN4kjT0n4F+rgeJp/AUJ708wsEmUI3 QJoRxDNAedOYGDru+8xY8lp1RItfDz+dwkwqV5sUEm6E8iex0L4d17o4/pOjmI9iVKXr HRoZ16zfsDJwEszzeArDvRzuA5juhDO3o0bQ5B4rTn5OHGnJHrnB1BQbz1DSTaa27TCz kGOhCZXd8sxyhPqLtesqgBzzgNmYaeJclo9YwQkWgsMa53uNHqGhTJOOcO6eaJYIwzHq mjCg== X-Forwarded-Encrypted: i=1; AJvYcCWj3rUUc2WlNBJLzFyWNkpy8es1h4kQ/+mV7y3VXyccRsf82fmDQJHcnuP+SQOn+8FDRfJbNwijFTMDChRb@vger.kernel.org, AJvYcCWxLp2UMsUzhhY/r4mXXvMPUmkbJYMAXTQDHar9/ix7m/FubvsXdwyDUV99VdAIZgFrTFiLqfYHp/WR@vger.kernel.org, AJvYcCWyS2n3WOhuPAOAp2D6y3dSxUusKJsSA9mYkDpXL/lPQHisT+GPsSFAQF+6QVKR/A7L6xHaJvx+QXFsvX5WAF0/voQ=@vger.kernel.org X-Gm-Message-State: AOJu0YxYbI7FAjkcPymZeG+k/2IVlq1nFaT5yozq7JtBBtln19Pd1jji K1WVLA4Zoyiielc36pyAo5Ny/KrvnPDvu6Yv/fITg7RP5Js+bW8TbD3d X-Gm-Gg: ASbGncv9uVU60WSrv/wKp0dgCfWfNjyFq44RvSJzSzEzJ0N0gFq76MObT4zcghlCj3k CjWenPrW/kVLXYtyr5zMlU+DJd9E+5GPM1sIe+aXchio7ccOElJyYOuKNn/AEYWLFC3SWh4iMcj GD+OrZrMDX133renrDXnoXd8g2qfqsYQzCPLoQWLWuNlGpi8xaIEtFH3qY2rMls2EmxhHL93mql bYP/y8zt9QOI8f+ovV1bwDRel1rwEsQSWuCAgpSc2yfkBjPH7dAoHU7ecl+XZDYqRjoOGBqfp+a GspmZ7XXg0mKWOp+/e2iTtfBcALlCNj5t+dsZNcJ/moqEKUIaTlA8zzra5pyoeu0WTFuYLOzjb5 DjpVO1FBw5GwxWEgA0YAB X-Google-Smtp-Source: AGHT+IFnQszQuMXXj4LRtHpeK/0BEi4QaYtX0di12sKq+z8xv6GpqMApsavO100OXSxjllQFPPG3Nw== X-Received: by 2002:a05:600c:4f95:b0:453:23fe:ca86 with SMTP id 5b1f17b1804b1-4538ee50438mr73315585e9.4.1751111841792; Sat, 28 Jun 2025 04:57:21 -0700 (PDT) Received: from iku.example.org ([2a06:5906:61b:2d00:dca0:b0f1:f055:ea37]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a88c7e7310sm5247818f8f.18.2025.06.28.04.57.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Jun 2025 04:57:20 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Greg Kroah-Hartman , Jiri Slaby , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Geert Uytterhoeven , Magnus Damm , Wolfram Sang , linux-serial@vger.kernel.org, devicetree@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Prabhakar , Biju Das , Fabrizio Castro , Lad Prabhakar Subject: [PATCH v13 4/5] serial: sh-sci: Use private port ID Date: Sat, 28 Jun 2025 12:57:14 +0100 Message-ID: <20250628115715.102338-5-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250628115715.102338-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250628115715.102338-1-prabhakar.mahadev-lad.rj@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Thierry Bultel New port types cannot be added in serial_core.h, which is shared with userspace. In order to support new port types, the coming new ones will have BIT(7) set in the id value, and in this case, uartport->type is set to PORT_GENERIC. This commit therefore changes all the places where the port type is read, by not relying on uartport->type but on the private value stored in struct sci_port. Signed-off-by: Thierry Bultel Signed-off-by: Lad Prabhakar Reviewed-by: Wolfram Sang Reviewed-by: Geert Uytterhoeven --- v12-> v13: - Fixed checkpatch warnings. --- drivers/tty/serial/sh-sci-common.h | 3 + drivers/tty/serial/sh-sci.c | 161 ++++++++++++++++------------- 2 files changed, 93 insertions(+), 71 deletions(-) diff --git a/drivers/tty/serial/sh-sci-common.h b/drivers/tty/serial/sh-sci= -common.h index bd9d9cfac1c8..fcddf66780c9 100644 --- a/drivers/tty/serial/sh-sci-common.h +++ b/drivers/tty/serial/sh-sci-common.h @@ -142,6 +142,9 @@ struct sci_port { int rx_fifo_timeout; u16 hscif_tot; =20 + u8 type; + u8 regtype; + const struct sci_port_ops *ops; =20 bool has_rtscts; diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 5c4283ce542d..26536ff2eda1 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -75,6 +75,8 @@ =20 #define SCI_NPORTS CONFIG_SERIAL_SH_SCI_NR_UARTS =20 +#define SCI_PUBLIC_PORT_ID(port) (((port) & BIT(7)) ? PORT_GENERIC : (port= )) + static struct sci_port sci_ports[SCI_NPORTS]; static unsigned long sci_ports_in_use; static struct uart_driver sci_uart_driver; @@ -580,7 +582,7 @@ static void sci_start_tx(struct uart_port *port) unsigned short ctrl; =20 #ifdef CONFIG_SERIAL_SH_SCI_DMA - if (port->type =3D=3D PORT_SCIFA || port->type =3D=3D PORT_SCIFB) { + if (s->type =3D=3D PORT_SCIFA || s->type =3D=3D PORT_SCIFB) { u16 new, scr =3D sci_serial_in(port, SCSCR); if (s->chan_tx) new =3D scr | SCSCR_TDRQE; @@ -592,7 +594,7 @@ static void sci_start_tx(struct uart_port *port) =20 if (s->chan_tx && !kfifo_is_empty(&port->state->port.xmit_fifo) && dma_submit_error(s->cookie_tx)) { - if (s->cfg->regtype =3D=3D SCIx_RZ_SCIFA_REGTYPE) + if (s->regtype =3D=3D SCIx_RZ_SCIFA_REGTYPE) /* Switch irq from SCIF to DMA */ disable_irq_nosync(s->irqs[SCIx_TXI_IRQ]); =20 @@ -601,8 +603,8 @@ static void sci_start_tx(struct uart_port *port) } #endif =20 - if (!s->chan_tx || s->cfg->regtype =3D=3D SCIx_RZ_SCIFA_REGTYPE || - port->type =3D=3D PORT_SCIFA || port->type =3D=3D PORT_SCIFB) { + if (!s->chan_tx || s->regtype =3D=3D SCIx_RZ_SCIFA_REGTYPE || + s->type =3D=3D PORT_SCIFA || s->type =3D=3D PORT_SCIFB) { /* Set TIE (Transmit Interrupt Enable) bit in SCSCR */ ctrl =3D sci_serial_in(port, SCSCR); =20 @@ -611,7 +613,7 @@ static void sci_start_tx(struct uart_port *port) * (transmit interrupt enable) or in the same instruction to start * the transmit process. */ - if (port->type =3D=3D PORT_SCI) + if (s->type =3D=3D PORT_SCI) ctrl |=3D SCSCR_TE; =20 sci_serial_out(port, SCSCR, ctrl | SCSCR_TIE); @@ -620,12 +622,13 @@ static void sci_start_tx(struct uart_port *port) =20 static void sci_stop_tx(struct uart_port *port) { + struct sci_port *s =3D to_sci_port(port); unsigned short ctrl; =20 /* Clear TIE (Transmit Interrupt Enable) bit in SCSCR */ ctrl =3D sci_serial_in(port, SCSCR); =20 - if (port->type =3D=3D PORT_SCIFA || port->type =3D=3D PORT_SCIFB) + if (s->type =3D=3D PORT_SCIFA || s->type =3D=3D PORT_SCIFB) ctrl &=3D ~SCSCR_TDRQE; =20 ctrl &=3D ~SCSCR_TIE; @@ -633,21 +636,22 @@ static void sci_stop_tx(struct uart_port *port) sci_serial_out(port, SCSCR, ctrl); =20 #ifdef CONFIG_SERIAL_SH_SCI_DMA - if (to_sci_port(port)->chan_tx && - !dma_submit_error(to_sci_port(port)->cookie_tx)) { - dmaengine_terminate_async(to_sci_port(port)->chan_tx); - to_sci_port(port)->cookie_tx =3D -EINVAL; + if (s->chan_tx && + !dma_submit_error(s->cookie_tx)) { + dmaengine_terminate_async(s->chan_tx); + s->cookie_tx =3D -EINVAL; } #endif } =20 static void sci_start_rx(struct uart_port *port) { + struct sci_port *s =3D to_sci_port(port); unsigned short ctrl; =20 ctrl =3D sci_serial_in(port, SCSCR) | port_rx_irq_mask(port); =20 - if (port->type =3D=3D PORT_SCIFA || port->type =3D=3D PORT_SCIFB) + if (s->type =3D=3D PORT_SCIFA || s->type =3D=3D PORT_SCIFB) ctrl &=3D ~SCSCR_RDRQE; =20 sci_serial_out(port, SCSCR, ctrl); @@ -655,11 +659,12 @@ static void sci_start_rx(struct uart_port *port) =20 static void sci_stop_rx(struct uart_port *port) { + struct sci_port *s =3D to_sci_port(port); unsigned short ctrl; =20 ctrl =3D sci_serial_in(port, SCSCR); =20 - if (port->type =3D=3D PORT_SCIFA || port->type =3D=3D PORT_SCIFB) + if (s->type =3D=3D PORT_SCIFA || s->type =3D=3D PORT_SCIFB) ctrl &=3D ~SCSCR_RDRQE; =20 ctrl &=3D ~port_rx_irq_mask(port); @@ -669,10 +674,12 @@ static void sci_stop_rx(struct uart_port *port) =20 static void sci_clear_SCxSR(struct uart_port *port, unsigned int mask) { - if (port->type =3D=3D PORT_SCI) { + struct sci_port *s =3D to_sci_port(port); + + if (s->type =3D=3D PORT_SCI) { /* Just store the mask */ sci_serial_out(port, SCxSR, mask); - } else if (to_sci_port(port)->params->overrun_mask =3D=3D SCIFA_ORER) { + } else if (s->params->overrun_mask =3D=3D SCIFA_ORER) { /* SCIFA/SCIFB and SCIF on SH7705/SH7720/SH7721 */ /* Only clear the status bits we want to clear */ sci_serial_out(port, SCxSR, sci_serial_in(port, SCxSR) & mask); @@ -742,13 +749,13 @@ static void sci_init_pins(struct uart_port *port, uns= igned int cflag) return; } =20 - if (port->type =3D=3D PORT_SCIFA || port->type =3D=3D PORT_SCIFB) { + if (s->type =3D=3D PORT_SCIFA || s->type =3D=3D PORT_SCIFB) { u16 data =3D sci_serial_in(port, SCPDR); u16 ctrl =3D sci_serial_in(port, SCPCR); =20 /* Enable RXD and TXD pin functions */ ctrl &=3D ~(SCPCR_RXDC | SCPCR_TXDC); - if (to_sci_port(port)->has_rtscts) { + if (s->has_rtscts) { /* RTS# is output, active low, unless autorts */ if (!(port->mctrl & TIOCM_RTS)) { ctrl |=3D SCPCR_RTSC; @@ -765,7 +772,7 @@ static void sci_init_pins(struct uart_port *port, unsig= ned int cflag) } sci_serial_out(port, SCPDR, data); sci_serial_out(port, SCPCR, ctrl); - } else if (sci_getreg(port, SCSPTR)->size && s->cfg->regtype !=3D SCIx_RZ= V2H_SCIF_REGTYPE) { + } else if (sci_getreg(port, SCSPTR)->size && s->regtype !=3D SCIx_RZV2H_S= CIF_REGTYPE) { u16 status =3D sci_serial_in(port, SCSPTR); =20 /* RTS# is always output; and active low, unless autorts */ @@ -852,8 +859,8 @@ static void sci_transmit_chars(struct uart_port *port) c =3D port->x_char; port->x_char =3D 0; } else if (stopped || !kfifo_get(&tport->xmit_fifo, &c)) { - if (port->type =3D=3D PORT_SCI && - kfifo_is_empty(&tport->xmit_fifo)) { + if (s->type =3D=3D PORT_SCI && + kfifo_is_empty(&tport->xmit_fifo)) { ctrl =3D sci_serial_in(port, SCSCR); ctrl &=3D ~SCSCR_TE; sci_serial_out(port, SCSCR, ctrl); @@ -873,7 +880,7 @@ static void sci_transmit_chars(struct uart_port *port) if (kfifo_len(&tport->xmit_fifo) < WAKEUP_CHARS) uart_write_wakeup(port); if (kfifo_is_empty(&tport->xmit_fifo)) { - if (port->type =3D=3D PORT_SCI) { + if (s->type =3D=3D PORT_SCI) { ctrl =3D sci_serial_in(port, SCSCR); ctrl &=3D ~SCSCR_TIE; ctrl |=3D SCSCR_TEIE; @@ -904,7 +911,7 @@ static void sci_receive_chars(struct uart_port *port) if (count =3D=3D 0) break; =20 - if (port->type =3D=3D PORT_SCI) { + if (s->type =3D=3D PORT_SCI) { char c =3D sci_serial_in(port, SCxRDR); if (uart_handle_sysrq_char(port, c)) count =3D 0; @@ -914,8 +921,8 @@ static void sci_receive_chars(struct uart_port *port) for (i =3D 0; i < count; i++) { char c; =20 - if (port->type =3D=3D PORT_SCIF || - port->type =3D=3D PORT_HSCIF) { + if (s->type =3D=3D PORT_SCIF || + s->type =3D=3D PORT_HSCIF) { status =3D sci_serial_in(port, SCxSR); c =3D sci_serial_in(port, SCxRDR); } else { @@ -1052,6 +1059,7 @@ static int sci_handle_breaks(struct uart_port *port) =20 static int scif_set_rtrg(struct uart_port *port, int rx_trig) { + struct sci_port *s =3D to_sci_port(port); unsigned int bits; =20 if (rx_trig >=3D port->fifosize) @@ -1065,7 +1073,7 @@ static int scif_set_rtrg(struct uart_port *port, int = rx_trig) return rx_trig; } =20 - switch (port->type) { + switch (s->type) { case PORT_SCIF: if (rx_trig < 4) { bits =3D 0; @@ -1150,7 +1158,7 @@ static ssize_t rx_fifo_trigger_store(struct device *d= ev, return ret; =20 sci->rx_trigger =3D sci->ops->set_rtrg(port, r); - if (port->type =3D=3D PORT_SCIFA || port->type =3D=3D PORT_SCIFB) + if (sci->type =3D=3D PORT_SCIFA || sci->type =3D=3D PORT_SCIFB) sci->ops->set_rtrg(port, 1); =20 return count; @@ -1166,7 +1174,7 @@ static ssize_t rx_fifo_timeout_show(struct device *de= v, struct sci_port *sci =3D to_sci_port(port); int v; =20 - if (port->type =3D=3D PORT_HSCIF) + if (sci->type =3D=3D PORT_HSCIF) v =3D sci->hscif_tot >> HSSCR_TOT_SHIFT; else v =3D sci->rx_fifo_timeout; @@ -1188,7 +1196,7 @@ static ssize_t rx_fifo_timeout_store(struct device *d= ev, if (ret) return ret; =20 - if (port->type =3D=3D PORT_HSCIF) { + if (sci->type =3D=3D PORT_HSCIF) { if (r < 0 || r > 3) return -EINVAL; sci->hscif_tot =3D r << HSSCR_TOT_SHIFT; @@ -1229,11 +1237,11 @@ static void sci_dma_tx_complete(void *arg) schedule_work(&s->work_tx); } else { s->cookie_tx =3D -EINVAL; - if (port->type =3D=3D PORT_SCIFA || port->type =3D=3D PORT_SCIFB || - s->cfg->regtype =3D=3D SCIx_RZ_SCIFA_REGTYPE) { + if (s->type =3D=3D PORT_SCIFA || s->type =3D=3D PORT_SCIFB || + s->regtype =3D=3D SCIx_RZ_SCIFA_REGTYPE) { u16 ctrl =3D sci_serial_in(port, SCSCR); sci_serial_out(port, SCSCR, ctrl & ~SCSCR_TIE); - if (s->cfg->regtype =3D=3D SCIx_RZ_SCIFA_REGTYPE) { + if (s->regtype =3D=3D SCIx_RZ_SCIFA_REGTYPE) { /* Switch irq from DMA to SCIF */ dmaengine_pause(s->chan_tx_saved); enable_irq(s->irqs[SCIx_TXI_IRQ]); @@ -1315,10 +1323,10 @@ static void sci_dma_rx_reenable_irq(struct sci_port= *s) =20 /* Direct new serial port interrupts back to CPU */ scr =3D sci_serial_in(port, SCSCR); - if (port->type =3D=3D PORT_SCIFA || port->type =3D=3D PORT_SCIFB || - s->cfg->regtype =3D=3D SCIx_RZ_SCIFA_REGTYPE) { + if (s->type =3D=3D PORT_SCIFA || s->type =3D=3D PORT_SCIFB || + s->regtype =3D=3D SCIx_RZ_SCIFA_REGTYPE) { enable_irq(s->irqs[SCIx_RXI_IRQ]); - if (s->cfg->regtype =3D=3D SCIx_RZ_SCIFA_REGTYPE) + if (s->regtype =3D=3D SCIx_RZ_SCIFA_REGTYPE) s->ops->set_rtrg(port, s->rx_trigger); else scr &=3D ~SCSCR_RDRQE; @@ -1558,8 +1566,8 @@ static enum hrtimer_restart sci_dma_rx_timer_fn(struc= t hrtimer *t) tty_flip_buffer_push(&port->state->port); } =20 - if (port->type =3D=3D PORT_SCIFA || port->type =3D=3D PORT_SCIFB || - s->cfg->regtype =3D=3D SCIx_RZ_SCIFA_REGTYPE) + if (s->type =3D=3D PORT_SCIFA || s->type =3D=3D PORT_SCIFB || + s->regtype =3D=3D SCIx_RZ_SCIFA_REGTYPE) sci_dma_rx_submit(s, true); =20 sci_dma_rx_reenable_irq(s); @@ -1682,8 +1690,8 @@ static void sci_request_dma(struct uart_port *port) =20 s->chan_rx_saved =3D s->chan_rx =3D chan; =20 - if (port->type =3D=3D PORT_SCIFA || port->type =3D=3D PORT_SCIFB || - s->cfg->regtype =3D=3D SCIx_RZ_SCIFA_REGTYPE) + if (s->type =3D=3D PORT_SCIFA || s->type =3D=3D PORT_SCIFB || + s->regtype =3D=3D SCIx_RZ_SCIFA_REGTYPE) sci_dma_rx_submit(s, false); } } @@ -1753,10 +1761,10 @@ static irqreturn_t sci_rx_interrupt(int irq, void *= ptr) u16 ssr =3D sci_serial_in(port, SCxSR); =20 /* Disable future Rx interrupts */ - if (port->type =3D=3D PORT_SCIFA || port->type =3D=3D PORT_SCIFB || - s->cfg->regtype =3D=3D SCIx_RZ_SCIFA_REGTYPE) { + if (s->type =3D=3D PORT_SCIFA || s->type =3D=3D PORT_SCIFB || + s->regtype =3D=3D SCIx_RZ_SCIFA_REGTYPE) { disable_irq_nosync(s->irqs[SCIx_RXI_IRQ]); - if (s->cfg->regtype =3D=3D SCIx_RZ_SCIFA_REGTYPE) { + if (s->regtype =3D=3D SCIx_RZ_SCIFA_REGTYPE) { s->ops->set_rtrg(port, 1); scr |=3D SCSCR_RIE; } else { @@ -1820,7 +1828,7 @@ static irqreturn_t sci_tx_end_interrupt(int irq, void= *ptr) unsigned long flags; u32 ctrl; =20 - if (port->type !=3D PORT_SCI) + if (s->type !=3D PORT_SCI) return sci_tx_interrupt(irq, ptr); =20 uart_port_lock_irqsave(port, &flags); @@ -1867,7 +1875,7 @@ static irqreturn_t sci_er_interrupt(int irq, void *pt= r) } =20 /* Handle errors */ - if (port->type =3D=3D PORT_SCI) { + if (s->type =3D=3D PORT_SCI) { if (sci_handle_errors(port)) { /* discard character in rx buffer */ sci_serial_in(port, SCxSR); @@ -2091,7 +2099,9 @@ static unsigned int sci_tx_empty(struct uart_port *po= rt) =20 static void sci_set_rts(struct uart_port *port, bool state) { - if (port->type =3D=3D PORT_SCIFA || port->type =3D=3D PORT_SCIFB) { + struct sci_port *s =3D to_sci_port(port); + + if (s->type =3D=3D PORT_SCIFA || s->type =3D=3D PORT_SCIFB) { u16 data =3D sci_serial_in(port, SCPDR); =20 /* Active low */ @@ -2118,7 +2128,9 @@ static void sci_set_rts(struct uart_port *port, bool = state) =20 static bool sci_get_cts(struct uart_port *port) { - if (port->type =3D=3D PORT_SCIFA || port->type =3D=3D PORT_SCIFB) { + struct sci_port *s =3D to_sci_port(port); + + if (s->type =3D=3D PORT_SCIFA || s->type =3D=3D PORT_SCIFB) { /* Active low */ return !(sci_serial_in(port, SCPDR) & SCPDR_CTSD); } else if (sci_getreg(port, SCSPTR)->size) { @@ -2164,21 +2176,21 @@ static void sci_set_mctrl(struct uart_port *port, u= nsigned int mctrl) =20 if (!(mctrl & TIOCM_RTS)) { /* Disable Auto RTS */ - if (s->cfg->regtype !=3D SCIx_RZV2H_SCIF_REGTYPE) + if (s->regtype !=3D SCIx_RZV2H_SCIF_REGTYPE) sci_serial_out(port, SCFCR, sci_serial_in(port, SCFCR) & ~SCFCR_MCE); =20 /* Clear RTS */ sci_set_rts(port, 0); } else if (s->autorts) { - if (port->type =3D=3D PORT_SCIFA || port->type =3D=3D PORT_SCIFB) { + if (s->type =3D=3D PORT_SCIFA || s->type =3D=3D PORT_SCIFB) { /* Enable RTS# pin function */ sci_serial_out(port, SCPCR, sci_serial_in(port, SCPCR) & ~SCPCR_RTSC); } =20 /* Enable Auto RTS */ - if (s->cfg->regtype !=3D SCIx_RZV2H_SCIF_REGTYPE) + if (s->regtype !=3D SCIx_RZV2H_SCIF_REGTYPE) sci_serial_out(port, SCFCR, sci_serial_in(port, SCFCR) | SCFCR_MCE); } else { @@ -2315,7 +2327,7 @@ static int sci_sck_calc(struct sci_port *s, unsigned = int bps, int err, min_err =3D INT_MAX; unsigned int sr; =20 - if (s->port.type !=3D PORT_HSCIF) + if (s->type !=3D PORT_HSCIF) freq *=3D 2; =20 for_each_sr(sr, s) { @@ -2342,7 +2354,7 @@ static int sci_brg_calc(struct sci_port *s, unsigned = int bps, int err, min_err =3D INT_MAX; unsigned int sr, dl; =20 - if (s->port.type !=3D PORT_HSCIF) + if (s->type !=3D PORT_HSCIF) freq *=3D 2; =20 for_each_sr(sr, s) { @@ -2375,7 +2387,7 @@ static int sci_scbrr_calc(struct sci_port *s, unsigne= d int bps, unsigned int sr, br, prediv, scrate, c; int err, min_err =3D INT_MAX; =20 - if (s->port.type !=3D PORT_HSCIF) + if (s->type !=3D PORT_HSCIF) freq *=3D 2; =20 /* @@ -2460,8 +2472,8 @@ static void sci_reset(struct uart_port *port) s->ops->set_rtrg(port, 1); timer_setup(&s->rx_fifo_timer, rx_fifo_timer_fn, 0); } else { - if (port->type =3D=3D PORT_SCIFA || - port->type =3D=3D PORT_SCIFB) + if (s->type =3D=3D PORT_SCIFA || + s->type =3D=3D PORT_SCIFB) s->ops->set_rtrg(port, 1); else s->ops->set_rtrg(port, s->rx_trigger); @@ -2521,8 +2533,8 @@ static void sci_set_termios(struct uart_port *port, s= truct ktermios *termios, */ =20 /* Optional Undivided External Clock */ - if (s->clk_rates[SCI_SCK] && port->type !=3D PORT_SCIFA && - port->type !=3D PORT_SCIFB) { + if (s->clk_rates[SCI_SCK] && s->type !=3D PORT_SCIFA && + s->type !=3D PORT_SCIFB) { err =3D sci_sck_calc(s, baud, &srr1); if (abs(err) < abs(min_err)) { best_clk =3D SCI_SCK; @@ -2607,7 +2619,7 @@ static void sci_set_termios(struct uart_port *port, s= truct ktermios *termios, sci_serial_out(port, SEMR, 0); =20 if (best_clk >=3D 0) { - if (port->type =3D=3D PORT_SCIFA || port->type =3D=3D PORT_SCIFB) + if (s->type =3D=3D PORT_SCIFA || s->type =3D=3D PORT_SCIFB) switch (srr + 1) { case 5: smr_val |=3D SCSMR_SRC_5; break; case 7: smr_val |=3D SCSMR_SRC_7; break; @@ -2692,12 +2704,12 @@ static void sci_set_termios(struct uart_port *port,= struct ktermios *termios, * (transmit interrupt enable) or in the same instruction to * start the transmitting process. So skip setting TE here for SCI. */ - if (port->type !=3D PORT_SCI) + if (s->type !=3D PORT_SCI) scr_val |=3D SCSCR_TE; scr_val |=3D SCSCR_RE | (s->cfg->scscr & ~(SCSCR_CKE1 | SCSCR_CKE0)); sci_serial_out(port, SCSCR, scr_val | s->hscif_tot); if ((srr + 1 =3D=3D 5) && - (port->type =3D=3D PORT_SCIFA || port->type =3D=3D PORT_SCIFB)) { + (s->type =3D=3D PORT_SCIFA || s->type =3D=3D PORT_SCIFB)) { /* * In asynchronous mode, when the sampling rate is 1/5, first * received data may become invalid on some SCIFA and SCIFB. @@ -2741,7 +2753,9 @@ void sci_pm(struct uart_port *port, unsigned int stat= e, =20 static const char *sci_type(struct uart_port *port) { - switch (port->type) { + struct sci_port *s =3D to_sci_port(port); + + switch (s->type) { case PORT_IRDA: return "irda"; case PORT_SCI: @@ -2825,8 +2839,7 @@ void sci_config_port(struct uart_port *port, int flag= s) { if (flags & UART_CONFIG_TYPE) { struct sci_port *sport =3D to_sci_port(port); - - port->type =3D sport->cfg->type; + port->type =3D SCI_PUBLIC_PORT_ID(sport->type); sci_request_port(port); } } @@ -2964,7 +2977,7 @@ static int sci_init_clocks(struct sci_port *sci_port,= struct device *dev) struct clk *clk; unsigned int i; =20 - if (sci_port->cfg->type =3D=3D PORT_HSCIF) + if (sci_port->type =3D=3D PORT_HSCIF) clk_names[SCI_SCK] =3D "hsck"; =20 for (i =3D 0; i < SCI_NUM_CLKS; i++) { @@ -3050,6 +3063,9 @@ static int sci_init_single(struct platform_device *de= v, =20 sci_port->cfg =3D p; =20 + sci_port->type =3D p->type; + sci_port->regtype =3D p->regtype; + port->iotype =3D UPIO_MEM; port->line =3D index; port->has_sysrq =3D IS_ENABLED(CONFIG_SERIAL_SH_SCI_CONSOLE); @@ -3128,11 +3144,11 @@ static int sci_init_single(struct platform_device *= dev, return ret; } =20 - port->type =3D p->type; + port->type =3D SCI_PUBLIC_PORT_ID(p->type); port->flags =3D UPF_FIXED_PORT | UPF_BOOT_AUTOCONF | p->flags; port->fifosize =3D sci_port->params->fifosize; =20 - if (port->type =3D=3D PORT_SCI && !dev->dev.of_node) { + if (p->type =3D=3D PORT_SCI && !dev->dev.of_node) { if (sci_port->reg_size >=3D 0x20) port->regshift =3D 2; else @@ -3322,13 +3338,13 @@ static struct uart_driver sci_uart_driver =3D { =20 static void sci_remove(struct platform_device *dev) { - struct sci_port *port =3D platform_get_drvdata(dev); - unsigned int type =3D port->port.type; /* uart_remove_... clears it */ + struct sci_port *s =3D platform_get_drvdata(dev); + unsigned int type =3D s->type; /* uart_remove_... clears it */ =20 - sci_ports_in_use &=3D ~BIT(port->port.line); - uart_remove_one_port(&sci_uart_driver, &port->port); + sci_ports_in_use &=3D ~BIT(s->port.line); + uart_remove_one_port(&sci_uart_driver, &s->port); =20 - if (port->port.fifosize > 1) + if (s->port.fifosize > 1) device_remove_file(&dev->dev, &dev_attr_rx_fifo_trigger); if (type =3D=3D PORT_SCIFA || type =3D=3D PORT_SCIFB || type =3D=3D PORT_= HSCIF) device_remove_file(&dev->dev, &dev_attr_rx_fifo_timeout); @@ -3682,8 +3698,8 @@ static int sci_probe(struct platform_device *dev) if (ret) return ret; } - if (sp->port.type =3D=3D PORT_SCIFA || sp->port.type =3D=3D PORT_SCIFB || - sp->port.type =3D=3D PORT_HSCIF) { + if (sp->type =3D=3D PORT_SCIFA || sp->type =3D=3D PORT_SCIFB || + sp->type =3D=3D PORT_HSCIF) { ret =3D device_create_file(&dev->dev, &dev_attr_rx_fifo_timeout); if (ret) { if (sp->port.fifosize > 1) { @@ -3799,8 +3815,11 @@ int __init scix_early_console_setup(struct earlycon_= device *device, if (!device->port.membase) return -ENODEV; =20 - device->port.type =3D data->type; + device->port.type =3D SCI_PUBLIC_PORT_ID(data->type); + sci_ports[0].port =3D device->port; + sci_ports[0].type =3D data->type; + sci_ports[0].regtype =3D data->regtype; =20 port_cfg.type =3D data->type; port_cfg.regtype =3D data->regtype; --=20 2.49.0 From nobody Wed Oct 8 11:42:51 2025 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (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 E4A392512D7; Sat, 28 Jun 2025 11:57:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751111847; cv=none; b=S+kt9y8pVc1Ke3F+uQDNrqjw7pXgLxM9TnuLTKlQ4uZXcP5AYnIF8DalGVJL46s+2dP3TYqNol7HOop6bzL2YiygKS+z+Q/Ko+w1HSzSjhjLd0NjyShettgWILvwlt5E0KxDGt51/ePzlpdIYdpYTO+UJ6JyboxZq6PAWXjHdv0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751111847; c=relaxed/simple; bh=5+oN6k0QIsiPQQSamlGR1JN2kYiXirxdPBC77ez6ftE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=r6gT51q6AxqUD/uEvKfWJvL+t60BUHTNh4rBS8T39mXPftNIR3b4Eynxuyoyss8UrVTMM4ulhq3YV8j5VpvzSfX8BropM2LApp2QRRg+JkumTfouePbgKpfw4l2Y1wQEqshDOFDvRDv9p42aAfitKJ/MGy6lTWXxfc8E3v8dpP4= 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=KeNnxxsH; arc=none smtp.client-ip=209.85.221.54 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="KeNnxxsH" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-3a6e8b1fa37so606228f8f.2; Sat, 28 Jun 2025 04:57:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1751111843; x=1751716643; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rcAnSzNjmk4w2RyV4jIIs/EVLnef9xQevQsqDg9T7fY=; b=KeNnxxsHD24DsDSRsxZKdKWMVHsG24querb017407qEFvk09CgXKjXVC5jhhUXjuoB EXfSuI4nIt6eB7mKCCerMnN03kvEDMOj36/Zt3GxyrOhMIyYurViiHndkLYtWkkSBcsm L2DtHAiVuJv/+Sq/VW/mVWuI+VJet78fHKEjze+BvLITVG2/OsUsigTw4BnMdxY9o+0c 8TK7DVDr53V6+ksvQxK32Yneo5UyDIUFATm1pTOPdlszaXwQand0ZszGAs3cphmyWsh0 1l1PrwMLcBmpnlSUPtwfa5inlFoV7XvPdU7TP+MTQAIatjauk4Iv8UUPXXBnpzHZF9XT CBKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751111843; x=1751716643; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rcAnSzNjmk4w2RyV4jIIs/EVLnef9xQevQsqDg9T7fY=; b=KhAWJu+38M+uIoKldjiWWAocbhdf19+cfRNF0YSppf0K7z1SsyeehjNblr6vHERwAc kRsRqCSpL+4lf7u8VHmgzMk/IjoT3NBg6IdOzUr84wV+885g+ai/qdj1B+sRAgpsdE8/ zyF+4lm/SWRPZnUToCYzB15EzptVyziqyBidJv3Z1k2Z12Jiy7HaXdNIU6o5qvRW9+w8 w4fbkYC5D3v8S5qxuCcY84zI1AHzrlXJKaIt6OpKl3zl4XUbyYivaww9j4f55IoqH1KI /lHaGqwZ3DM3qhfn6tRrMPPs77+cV1wFk5Jk6FBOZTGPNK2aD26wtzHP6yPlCkiQXkLE mqrQ== X-Forwarded-Encrypted: i=1; AJvYcCUNLsFgOZNf1uMUeGGFVb8QgDDVAUB143jNtuwPDNJcC+klCUsxCR3fekOCNwBz8qvaqaPxrSOhO2DqsQcTdBpGTKc=@vger.kernel.org, AJvYcCVzv3T4lhvr5pljyx30dikbESNPDlwqYuwmOOL9Fa3RgjfY8pQLlGAnMEZcUOMfJaVn5y3f/Q9dJeLAPu5s@vger.kernel.org, AJvYcCXAPmA7i7YRYCg8ZGwM6dKu3waODYnkDDkObmxieM51v5s7ctQEQI3NFxegbiQyCwtHGU8rH/uhB/ru@vger.kernel.org X-Gm-Message-State: AOJu0YxwJ0F4grpRgaKCjwThxsaKs/QOIY5rlVBMEFWaESjz3Ga5OfCI tcxrjFWOipnusdSc+R1Ty8un18zbJ2iyYj0ReBFl3dBRQhXOVZHZzCyL X-Gm-Gg: ASbGnctuhwZxwD8SK24nqd5R2fGT9NBizC6kO1E41Qq1eZVrZBKOBvI1dQwHUs7rD9o 93S51IlBuP7GRmcy5emcsRnmqApJg7rQQxVGD60as2mmxyLlJycbpYkcz2yRjwYWp9xgCYDXRyC i+115hqDe+TDpcb4xFPxu2uWjf/Skw1AprYINcYOHrBBZSEdAosXMwB1zlMwSTlCVBoeyc8CNiS HSWaIrHJQuHj+Z8VIYiRt0GN4bZ/V6MtMVPyMRq1Mg124ARueyQbwfEMFyIl5HWtv5kHXvHH1NW wGZ1s6jTagF7Mdy+TBDfV8LCWudkBCQVdbr2G9jTGdIBK79+tzgbAH3wly/SRAaInw+K/KuwnOA PxyaGBSVlp63Ry+nckbDwrMFCoxSCTWU= X-Google-Smtp-Source: AGHT+IHfIPzHGp4eRJrtjbO7iUse9tJSXUAliGqw/P8quLHaMIBpEV+oUPIXYSGXxKjU8T26Tda5ng== X-Received: by 2002:a05:6000:25e8:b0:3a4:d31e:4af3 with SMTP id ffacd0b85a97d-3a8fee64e2fmr4541459f8f.37.1751111843017; Sat, 28 Jun 2025 04:57:23 -0700 (PDT) Received: from iku.example.org ([2a06:5906:61b:2d00:dca0:b0f1:f055:ea37]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a88c7e7310sm5247818f8f.18.2025.06.28.04.57.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 28 Jun 2025 04:57:22 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Greg Kroah-Hartman , Jiri Slaby , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Geert Uytterhoeven , Magnus Damm , Wolfram Sang , linux-serial@vger.kernel.org, devicetree@vger.kernel.org Cc: linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Prabhakar , Biju Das , Fabrizio Castro , Lad Prabhakar Subject: [PATCH v13 5/5] serial: sh-sci: Add support for RZ/T2H SCI Date: Sat, 28 Jun 2025 12:57:15 +0100 Message-ID: <20250628115715.102338-6-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250628115715.102338-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250628115715.102338-1-prabhakar.mahadev-lad.rj@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Thierry Bultel Define a new RSCI port type, and the RSCI 32 bits registers set. The RZ/T2H SCI has a a fifo, and a quite different set of registers from the original SH SCI ones. DMA is not supported yet. Signed-off-by: Thierry Bultel Signed-off-by: Lad Prabhakar Reviewed-by: Wolfram Sang Reviewed-by: Geert Uytterhoeven --- v12-> v13: - No changes --- drivers/tty/serial/Kconfig | 7 + drivers/tty/serial/Makefile | 1 + drivers/tty/serial/rsci.c | 477 +++++++++++++++++++++++++++++ drivers/tty/serial/rsci.h | 10 + drivers/tty/serial/sh-sci-common.h | 5 + drivers/tty/serial/sh-sci.c | 53 +++- 6 files changed, 543 insertions(+), 10 deletions(-) create mode 100644 drivers/tty/serial/rsci.c create mode 100644 drivers/tty/serial/rsci.h diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index 79a8186d3361..44427415a80d 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -675,6 +675,13 @@ config SERIAL_SH_SCI_DMA depends on SERIAL_SH_SCI && DMA_ENGINE default ARCH_RENESAS =20 +config SERIAL_RSCI + tristate "Support for Renesas RZ/T2H SCI variant" + depends on SERIAL_SH_SCI + help + Support for the RZ/T2H SCI variant with fifo. + Say Y if you want to be able to use the RZ/T2H SCI serial port. + config SERIAL_HS_LPC32XX tristate "LPC32XX high speed serial port support" depends on ARCH_LPC32XX || COMPILE_TEST diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile index d58d9f719889..a2ccbc508ec5 100644 --- a/drivers/tty/serial/Makefile +++ b/drivers/tty/serial/Makefile @@ -71,6 +71,7 @@ obj-$(CONFIG_SERIAL_QCOM_GENI) +=3D qcom_geni_serial.o obj-$(CONFIG_SERIAL_QE) +=3D ucc_uart.o obj-$(CONFIG_SERIAL_RDA) +=3D rda-uart.o obj-$(CONFIG_SERIAL_RP2) +=3D rp2.o +obj-$(CONFIG_SERIAL_RSCI) +=3D rsci.o obj-$(CONFIG_SERIAL_SA1100) +=3D sa1100.o obj-$(CONFIG_SERIAL_SAMSUNG) +=3D samsung_tty.o obj-$(CONFIG_SERIAL_SB1250_DUART) +=3D sb1250-duart.o diff --git a/drivers/tty/serial/rsci.c b/drivers/tty/serial/rsci.c new file mode 100644 index 000000000000..8274dbbd7cc2 --- /dev/null +++ b/drivers/tty/serial/rsci.c @@ -0,0 +1,477 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright (C) 2025 Renesas Electronics Corp. + */ + +#include +#include +#include +#include +#include +#include +#include +#include "rsci.h" + +/* RSCI registers */ +#define RDR 0x00 +#define TDR 0x04 +#define CCR0 0x08 +#define CCR1 0x0C +#define CCR2 0x10 +#define CCR3 0x14 +#define CCR4 0x18 +#define FCR 0x24 +#define DCR 0x30 +#define CSR 0x48 +#define FRSR 0x50 +#define FTSR 0x54 +#define CFCLR 0x68 +#define FFCLR 0x70 + +/* RDR (Receive Data Register) */ +#define RDR_FFER BIT(12) /* FIFO Framing Error */ +#define RDR_FPER BIT(11) /* FIFO Parity Error */ +#define RDR_RDAT_MSK GENMASK(8, 0) + +/* TDR (Transmit Data Register) */ +#define TDR_MPBT BIT(9) /* Multiprocessor Transfer */ +#define TDR_TDAT_9BIT_LSHIFT 0 +#define TDR_TDAT_9BIT_VAL 0x1FF +#define TDR_TDAT_9BIT_MSK (TDR_TDAT_9BIT_VAL << TDR_TDAT_9BIT_LSHIFT) + +/* CCR0 (Common Control Register 0) */ +#define CCR0_SSE BIT(24) /* SSn# Pin Function Enable */ +#define CCR0_TEIE BIT(21) /* Transmit End Interrupt Enable */ +#define CCR0_TIE BIT(20) /* Transmit Interrupt Enable */ +#define CCR0_RIE BIT(16) /* Receive Interrupt Enable */ +#define CCR0_IDSEL BIT(10) /* ID Frame Select */ +#define CCR0_DCME BIT(9) /* Data Compare Match Enable */ +#define CCR0_MPIE BIT(8) /* Multiprocessor Interrupt Enable */ +#define CCR0_TE BIT(4) /* Transmit Enable */ +#define CCR0_RE BIT(0) /* Receive Enable */ + +/* CCR1 (Common Control Register 1) */ +#define CCR1_NFEN BIT(28) /* Digital Noise Filter Function */ +#define CCR1_SHARPS BIT(20) /* Half -duplex Communication Select */ +#define CCR1_SPLP BIT(16) /* Loopback Control */ +#define CCR1_RINV BIT(13) /* RxD invert */ +#define CCR1_TINV BIT(12) /* TxD invert */ +#define CCR1_PM BIT(9) /* Parity Mode */ +#define CCR1_PE BIT(8) /* Parity Enable */ +#define CCR1_SPB2IO BIT(5) /* Serial Port Break I/O */ +#define CCR1_SPB2DT BIT(4) /* Serial Port Break Data Select */ +#define CCR1_CTSPEN BIT(1) /* CTS External Pin Enable */ +#define CCR1_CTSE BIT(0) /* CTS Enable */ + +/* FCR (FIFO Control Register) */ +#define FCR_RFRST BIT(23) /* Receive FIFO Data Register Reset */ +#define FCR_TFRST BIT(15) /* Transmit FIFO Data Register Reset */ +#define FCR_DRES BIT(0) /* Incoming Data Ready Error Select */ +#define FCR_RTRG4_0 GENMASK(20, 16) +#define FCR_TTRG GENMASK(12, 8) + +/* CSR (Common Status Register) */ +#define CSR_RDRF BIT(31) /* Receive Data Full */ +#define CSR_TEND BIT(30) /* Transmit End Flag */ +#define CSR_TDRE BIT(29) /* Transmit Data Empty */ +#define CSR_FER BIT(28) /* Framing Error */ +#define CSR_PER BIT(27) /* Parity Error */ +#define CSR_MFF BIT(26) /* Mode Fault Error */ +#define CSR_ORER BIT(24) /* Overrun Error */ +#define CSR_DFER BIT(18) /* Data Compare Match Framing Error */ +#define CSR_DPER BIT(17) /* Data Compare Match Parity Error */ +#define CSR_DCMF BIT(16) /* Data Compare Match */ +#define CSR_RXDMON BIT(15) /* Serial Input Data Monitor */ +#define CSR_ERS BIT(4) /* Error Signal Status */ + +#define SCxSR_ERRORS(port) (to_sci_port(port)->params->error_mask) +#define SCxSR_ERROR_CLEAR(port) (to_sci_port(port)->params->error_clear) + +#define RSCI_DEFAULT_ERROR_MASK (CSR_PER | CSR_FER) + +#define RSCI_RDxF_CLEAR (CFCLR_RDRFC) +#define RSCI_ERROR_CLEAR (CFCLR_PERC | CFCLR_FERC) +#define RSCI_TDxE_CLEAR (CFCLR_TDREC) +#define RSCI_BREAK_CLEAR (CFCLR_PERC | CFCLR_FERC | CFCLR_ORERC) + +/* FRSR (FIFO Receive Status Register) */ +#define FRSR_R5_0 GENMASK(13, 8) /* Receive FIFO Data Count */ +#define FRSR_DR BIT(0) /* Receive Data Ready */ + +/* CFCLR (Common Flag CLear Register) */ +#define CFCLR_RDRFC BIT(31) /* RDRF Clear */ +#define CFCLR_TDREC BIT(29) /* TDRE Clear */ +#define CFCLR_FERC BIT(28) /* FER Clear */ +#define CFCLR_PERC BIT(27) /* PER Clear */ +#define CFCLR_MFFC BIT(26) /* MFF Clear */ +#define CFCLR_ORERC BIT(24) /* ORER Clear */ +#define CFCLR_DFERC BIT(18) /* DFER Clear */ +#define CFCLR_DPERC BIT(17) /* DPER Clear */ +#define CFCLR_DCMFC BIT(16) /* DCMF Clear */ +#define CFCLR_ERSC BIT(4) /* ERS Clear */ +#define CFCLR_CLRFLAG (CFCLR_RDRFC | CFCLR_FERC | CFCLR_PERC | \ + CFCLR_MFFC | CFCLR_ORERC | CFCLR_DFERC | \ + CFCLR_DPERC | CFCLR_DCMFC | CFCLR_ERSC) + +/* FFCLR (FIFO Flag CLear Register) */ +#define FFCLR_DRC BIT(0) /* DR Clear */ + +#define DCR_DEPOL BIT(0) + +static u32 rsci_serial_in(struct uart_port *p, int offset) +{ + return readl(p->membase + offset); +} + +static void rsci_serial_out(struct uart_port *p, int offset, int value) +{ + writel(value, p->membase + offset); +} + +static void rsci_clear_DRxC(struct uart_port *port) +{ + rsci_serial_out(port, CFCLR, CFCLR_RDRFC); + rsci_serial_out(port, FFCLR, FFCLR_DRC); +} + +static void rsci_clear_SCxSR(struct uart_port *port, unsigned int mask) +{ + rsci_serial_out(port, CFCLR, mask); +} + +static void rsci_start_rx(struct uart_port *port) +{ + unsigned int ctrl; + + ctrl =3D rsci_serial_in(port, CCR0); + ctrl |=3D CCR0_RIE; + rsci_serial_out(port, CCR0, ctrl); +} + +static void rsci_set_termios(struct uart_port *port, struct ktermios *term= ios, + const struct ktermios *old) +{ + struct sci_port *s =3D to_sci_port(port); + unsigned long flags; + + sci_port_enable(s); + uart_port_lock_irqsave(port, &flags); + + /* For now, only RX enabling is supported */ + if (termios->c_cflag & CREAD) + rsci_start_rx(port); + + uart_port_unlock_irqrestore(port, flags); + sci_port_disable(s); +} + +static int rsci_txfill(struct uart_port *port) +{ + return rsci_serial_in(port, FTSR); +} + +static int rsci_rxfill(struct uart_port *port) +{ + u32 val =3D rsci_serial_in(port, FRSR); + + return FIELD_GET(FRSR_R5_0, val); +} + +static unsigned int rsci_tx_empty(struct uart_port *port) +{ + unsigned int status =3D rsci_serial_in(port, CSR); + unsigned int in_tx_fifo =3D rsci_txfill(port); + + return (status & CSR_TEND) && !in_tx_fifo ? TIOCSER_TEMT : 0; +} + +static void rsci_set_mctrl(struct uart_port *port, unsigned int mctrl) +{ + /* Not supported yet */ +} + +static unsigned int rsci_get_mctrl(struct uart_port *port) +{ + /* Not supported yet */ + return 0; +} + +static void rsci_clear_CFC(struct uart_port *port, unsigned int mask) +{ + rsci_serial_out(port, CFCLR, mask); +} + +static void rsci_start_tx(struct uart_port *port) +{ + struct sci_port *sp =3D to_sci_port(port); + u32 ctrl; + + if (sp->chan_tx) + return; + + /* + * TE (Transmit Enable) must be set after setting TIE + * (Transmit Interrupt Enable) or in the same instruction + * to start the transmit process. + */ + ctrl =3D rsci_serial_in(port, CCR0); + ctrl |=3D CCR0_TIE | CCR0_TE; + rsci_serial_out(port, CCR0, ctrl); +} + +static void rsci_stop_tx(struct uart_port *port) +{ + u32 ctrl; + + ctrl =3D rsci_serial_in(port, CCR0); + ctrl &=3D ~CCR0_TIE; + rsci_serial_out(port, CCR0, ctrl); +} + +static void rsci_stop_rx(struct uart_port *port) +{ + u32 ctrl; + + ctrl =3D rsci_serial_in(port, CCR0); + ctrl &=3D ~CCR0_RIE; + rsci_serial_out(port, CCR0, ctrl); +} + +static int rsci_txroom(struct uart_port *port) +{ + return port->fifosize - rsci_txfill(port); +} + +static void rsci_transmit_chars(struct uart_port *port) +{ + unsigned int stopped =3D uart_tx_stopped(port); + struct tty_port *tport =3D &port->state->port; + u32 status, ctrl; + int count; + + status =3D rsci_serial_in(port, CSR); + if (!(status & CSR_TDRE)) { + ctrl =3D rsci_serial_in(port, CCR0); + if (kfifo_is_empty(&tport->xmit_fifo)) + ctrl &=3D ~CCR0_TIE; + else + ctrl |=3D CCR0_TIE; + rsci_serial_out(port, CCR0, ctrl); + return; + } + + count =3D rsci_txroom(port); + + do { + unsigned char c; + + if (port->x_char) { + c =3D port->x_char; + port->x_char =3D 0; + } else if (stopped || !kfifo_get(&tport->xmit_fifo, &c)) { + break; + } + + rsci_clear_CFC(port, CFCLR_TDREC); + rsci_serial_out(port, TDR, c); + + port->icount.tx++; + } while (--count > 0); + + if (kfifo_len(&tport->xmit_fifo) < WAKEUP_CHARS) + uart_write_wakeup(port); + + if (kfifo_is_empty(&tport->xmit_fifo)) { + ctrl =3D rsci_serial_in(port, CCR0); + ctrl &=3D ~CCR0_TIE; + ctrl |=3D CCR0_TEIE; + rsci_serial_out(port, CCR0, ctrl); + } +} + +static void rsci_receive_chars(struct uart_port *port) +{ + struct tty_port *tport =3D &port->state->port; + u32 rdat, status, frsr_status =3D 0; + int i, count, copied =3D 0; + unsigned char flag; + + status =3D rsci_serial_in(port, CSR); + frsr_status =3D rsci_serial_in(port, FRSR); + + if (!(status & CSR_RDRF) && !(frsr_status & FRSR_DR)) + return; + + while (1) { + /* Don't copy more bytes than there is room for in the buffer */ + count =3D tty_buffer_request_room(tport, rsci_rxfill(port)); + + /* If for any reason we can't copy more data, we're done! */ + if (count =3D=3D 0) + break; + + for (i =3D 0; i < count; i++) { + char c; + + rdat =3D rsci_serial_in(port, RDR); + /* 9-bits data is not supported yet */ + c =3D rdat & RDR_RDAT_MSK; + + if (uart_handle_sysrq_char(port, c)) { + count--; + i--; + continue; + } + + /* Store data and status. + * Non FIFO mode is not supported + */ + if (rdat & RDR_FFER) { + flag =3D TTY_FRAME; + port->icount.frame++; + } else if (rdat & RDR_FPER) { + flag =3D TTY_PARITY; + port->icount.parity++; + } else { + flag =3D TTY_NORMAL; + } + + tty_insert_flip_char(tport, c, flag); + } + + rsci_serial_in(port, CSR); /* dummy read */ + rsci_clear_DRxC(port); + + copied +=3D count; + port->icount.rx +=3D count; + } + + if (copied) { + /* Tell the rest of the system the news. New characters! */ + tty_flip_buffer_push(tport); + } else { + /* TTY buffers full; read from RX reg to prevent lockup */ + rsci_serial_in(port, RDR); + rsci_serial_in(port, CSR); /* dummy read */ + rsci_clear_DRxC(port); + } +} + +static void rsci_poll_put_char(struct uart_port *port, unsigned char c) +{ + u32 status; + int ret; + + ret =3D readl_relaxed_poll_timeout_atomic(port->membase + CSR, status, + (status & CSR_TDRE), 100, + USEC_PER_SEC); + if (ret !=3D 0) { + dev_err(port->dev, + "Error while sending data in UART TX : %d\n", ret); + goto done; + } + rsci_serial_out(port, TDR, c); +done: + rsci_clear_SCxSR(port, CFCLR_TDREC); +} + +static void rsci_prepare_console_write(struct uart_port *port, u32 ctrl) +{ + struct sci_port *s =3D to_sci_port(port); + u32 ctrl_temp =3D + s->params->param_bits->rxtx_enable | CCR0_TIE | + s->hscif_tot; + rsci_serial_out(port, CCR0, ctrl_temp); +} + +static const char *rsci_type(struct uart_port *port) +{ + return "rsci"; +} + +static size_t rsci_suspend_regs_size(void) +{ + return 0; +} + +static void rsci_shutdown_complete(struct uart_port *port) +{ + /* + * Stop RX and TX, disable related interrupts, keep clock source + */ + rsci_serial_out(port, CCR0, 0); +} + +static const struct sci_common_regs rsci_common_regs =3D { + .status =3D CSR, + .control =3D CCR0, +}; + +static const struct sci_port_params_bits rsci_port_param_bits =3D { + .rxtx_enable =3D CCR0_RE | CCR0_TE, + .te_clear =3D CCR0_TE | CCR0_TEIE, + .poll_sent_bits =3D CSR_TDRE | CSR_TEND, +}; + +static const struct sci_port_params rsci_port_params =3D { + .fifosize =3D 16, + .overrun_reg =3D CSR, + .overrun_mask =3D CSR_ORER, + .sampling_rate_mask =3D SCI_SR(32), + .error_mask =3D RSCI_DEFAULT_ERROR_MASK, + .error_clear =3D RSCI_ERROR_CLEAR, + .param_bits =3D &rsci_port_param_bits, + .common_regs =3D &rsci_common_regs, +}; + +static const struct uart_ops rsci_uart_ops =3D { + .tx_empty =3D rsci_tx_empty, + .set_mctrl =3D rsci_set_mctrl, + .get_mctrl =3D rsci_get_mctrl, + .start_tx =3D rsci_start_tx, + .stop_tx =3D rsci_stop_tx, + .stop_rx =3D rsci_stop_rx, + .startup =3D sci_startup, + .shutdown =3D sci_shutdown, + .set_termios =3D rsci_set_termios, + .pm =3D sci_pm, + .type =3D rsci_type, + .release_port =3D sci_release_port, + .request_port =3D sci_request_port, + .config_port =3D sci_config_port, + .verify_port =3D sci_verify_port, +}; + +static const struct sci_port_ops rsci_port_ops =3D { + .read_reg =3D rsci_serial_in, + .write_reg =3D rsci_serial_out, + .clear_SCxSR =3D rsci_clear_SCxSR, + .transmit_chars =3D rsci_transmit_chars, + .receive_chars =3D rsci_receive_chars, + .poll_put_char =3D rsci_poll_put_char, + .prepare_console_write =3D rsci_prepare_console_write, + .suspend_regs_size =3D rsci_suspend_regs_size, + .shutdown_complete =3D rsci_shutdown_complete, +}; + +struct sci_of_data of_sci_rsci_data =3D { + .type =3D SCI_PORT_RSCI, + .ops =3D &rsci_port_ops, + .uart_ops =3D &rsci_uart_ops, + .params =3D &rsci_port_params, +}; + +#ifdef CONFIG_SERIAL_SH_SCI_EARLYCON + +static int __init rsci_early_console_setup(struct earlycon_device *device, + const char *opt) +{ + return scix_early_console_setup(device, &of_sci_rsci_data); +} + +OF_EARLYCON_DECLARE(rsci, "renesas,r9a09g077-rsci", rsci_early_console_set= up); + +#endif /* CONFIG_SERIAL_SH_SCI_EARLYCON */ + +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("RSCI serial driver"); diff --git a/drivers/tty/serial/rsci.h b/drivers/tty/serial/rsci.h new file mode 100644 index 000000000000..2af3f28b465a --- /dev/null +++ b/drivers/tty/serial/rsci.h @@ -0,0 +1,10 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __RSCI_H__ +#define __RSCI_H__ + +#include "sh-sci-common.h" + +extern struct sci_of_data of_sci_rsci_data; + +#endif /* __RSCI_H__ */ diff --git a/drivers/tty/serial/sh-sci-common.h b/drivers/tty/serial/sh-sci= -common.h index fcddf66780c9..e3c028df14f1 100644 --- a/drivers/tty/serial/sh-sci-common.h +++ b/drivers/tty/serial/sh-sci-common.h @@ -5,6 +5,11 @@ =20 #include =20 +/* Private port IDs */ +enum SCI_PORT_TYPE { + SCI_PORT_RSCI =3D BIT(7) | 0, +}; + enum SCI_CLKS { SCI_FCK, /* Functional Clock */ SCI_SCK, /* Optional External Clock */ diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 26536ff2eda1..6867ccfa5ac6 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c @@ -54,6 +54,7 @@ #include #endif =20 +#include "rsci.h" #include "serial_mctrl_gpio.h" #include "sh-sci.h" #include "sh-sci-common.h" @@ -550,6 +551,7 @@ void sci_port_enable(struct sci_port *sci_port) } sci_port->port.uartclk =3D sci_port->clk_rates[SCI_FCK]; } +EXPORT_SYMBOL(sci_port_enable); =20 void sci_port_disable(struct sci_port *sci_port) { @@ -563,6 +565,7 @@ void sci_port_disable(struct sci_port *sci_port) =20 pm_runtime_put_sync(sci_port->port.dev); } +EXPORT_SYMBOL(sci_port_disable); =20 static inline unsigned long port_rx_irq_mask(struct uart_port *port) { @@ -1828,7 +1831,7 @@ static irqreturn_t sci_tx_end_interrupt(int irq, void= *ptr) unsigned long flags; u32 ctrl; =20 - if (s->type !=3D PORT_SCI) + if (s->type !=3D PORT_SCI && s->type !=3D SCI_PORT_RSCI) return sci_tx_interrupt(irq, ptr); =20 uart_port_lock_irqsave(port, &flags); @@ -2289,6 +2292,7 @@ int sci_startup(struct uart_port *port) =20 return 0; } +EXPORT_SYMBOL(sci_startup); =20 void sci_shutdown(struct uart_port *port) { @@ -2319,6 +2323,7 @@ void sci_shutdown(struct uart_port *port) sci_free_irq(s); sci_free_dma(port); } +EXPORT_SYMBOL(sci_shutdown); =20 static int sci_sck_calc(struct sci_port *s, unsigned int bps, unsigned int *srr) @@ -2750,6 +2755,7 @@ void sci_pm(struct uart_port *port, unsigned int stat= e, break; } } +EXPORT_SYMBOL(sci_pm); =20 static const char *sci_type(struct uart_port *port) { @@ -2812,6 +2818,7 @@ void sci_release_port(struct uart_port *port) =20 release_mem_region(port->mapbase, sport->reg_size); } +EXPORT_SYMBOL(sci_release_port); =20 int sci_request_port(struct uart_port *port) { @@ -2834,6 +2841,7 @@ int sci_request_port(struct uart_port *port) =20 return 0; } +EXPORT_SYMBOL(sci_request_port); =20 void sci_config_port(struct uart_port *port, int flags) { @@ -2843,6 +2851,7 @@ void sci_config_port(struct uart_port *port, int flag= s) sci_request_port(port); } } +EXPORT_SYMBOL(sci_config_port); =20 int sci_verify_port(struct uart_port *port, struct serial_struct *ser) { @@ -2852,6 +2861,7 @@ int sci_verify_port(struct uart_port *port, struct se= rial_struct *ser) =20 return 0; } +EXPORT_SYMBOL(sci_verify_port); =20 static void sci_prepare_console_write(struct uart_port *port, u32 ctrl) { @@ -2977,14 +2987,27 @@ static int sci_init_clocks(struct sci_port *sci_por= t, struct device *dev) struct clk *clk; unsigned int i; =20 - if (sci_port->type =3D=3D PORT_HSCIF) + if (sci_port->type =3D=3D PORT_HSCIF) { clk_names[SCI_SCK] =3D "hsck"; + } else if (sci_port->type =3D=3D SCI_PORT_RSCI) { + clk_names[SCI_FCK] =3D "operation"; + clk_names[SCI_BRG_INT] =3D "bus"; + } =20 for (i =3D 0; i < SCI_NUM_CLKS; i++) { - clk =3D devm_clk_get_optional(dev, clk_names[i]); + const char *name =3D clk_names[i]; + + clk =3D devm_clk_get_optional(dev, name); if (IS_ERR(clk)) return PTR_ERR(clk); =20 + if (!clk && sci_port->type =3D=3D SCI_PORT_RSCI && + (i =3D=3D SCI_FCK || i =3D=3D SCI_BRG_INT)) { + return dev_err_probe(dev, -ENODEV, + "failed to get %s\n", + name); + } + if (!clk && i =3D=3D SCI_FCK) { /* * Not all SH platforms declare a clock lookup entry @@ -2995,13 +3018,13 @@ static int sci_init_clocks(struct sci_port *sci_por= t, struct device *dev) if (IS_ERR(clk)) return dev_err_probe(dev, PTR_ERR(clk), "failed to get %s\n", - clk_names[i]); + name); } =20 if (!clk) - dev_dbg(dev, "failed to get %s\n", clk_names[i]); + dev_dbg(dev, "failed to get %s\n", name); else - dev_dbg(dev, "clk %s is %pC rate %lu\n", clk_names[i], + dev_dbg(dev, "clk %s is %pC rate %lu\n", name, clk, clk_get_rate(clk)); sci_port->clks[i] =3D clk; } @@ -3085,10 +3108,10 @@ static int sci_init_single(struct platform_device *= dev, } =20 /* - * The fourth interrupt on SCI port is transmit end interrupt, so + * The fourth interrupt on SCI and RSCI port is transmit end interrupt, so * shuffle the interrupts. */ - if (p->type =3D=3D PORT_SCI) + if (p->type =3D=3D PORT_SCI || p->type =3D=3D SCI_PORT_RSCI) swap(sci_port->irqs[SCIx_BRI_IRQ], sci_port->irqs[SCIx_TEI_IRQ]); =20 /* The SCI generates several interrupts. They can be muxed together or @@ -3122,6 +3145,9 @@ static int sci_init_single(struct platform_device *de= v, else sci_port->rx_trigger =3D 8; break; + case SCI_PORT_RSCI: + sci_port->rx_trigger =3D 15; + break; default: sci_port->rx_trigger =3D 1; break; @@ -3346,7 +3372,8 @@ static void sci_remove(struct platform_device *dev) =20 if (s->port.fifosize > 1) device_remove_file(&dev->dev, &dev_attr_rx_fifo_trigger); - if (type =3D=3D PORT_SCIFA || type =3D=3D PORT_SCIFB || type =3D=3D PORT_= HSCIF) + if (type =3D=3D PORT_SCIFA || type =3D=3D PORT_SCIFB || type =3D=3D PORT_= HSCIF || + type =3D=3D SCI_PORT_RSCI) device_remove_file(&dev->dev, &dev_attr_rx_fifo_timeout); } =20 @@ -3440,6 +3467,12 @@ static const struct of_device_id of_sci_match[] __ma= ybe_unused =3D { .compatible =3D "renesas,scif-r9a09g057", .data =3D &of_sci_scif_rzv2h, }, +#ifdef CONFIG_SERIAL_RSCI + { + .compatible =3D "renesas,r9a09g077-rsci", + .data =3D &of_sci_rsci_data, + }, +#endif /* CONFIG_SERIAL_RSCI */ /* Family-specific types */ { .compatible =3D "renesas,rcar-gen1-scif", @@ -3699,7 +3732,7 @@ static int sci_probe(struct platform_device *dev) return ret; } if (sp->type =3D=3D PORT_SCIFA || sp->type =3D=3D PORT_SCIFB || - sp->type =3D=3D PORT_HSCIF) { + sp->type =3D=3D PORT_HSCIF || sp->type =3D=3D SCI_PORT_RSCI) { ret =3D device_create_file(&dev->dev, &dev_attr_rx_fifo_timeout); if (ret) { if (sp->port.fifosize > 1) { --=20 2.49.0