From patchwork Tue Mar 7 16:30:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 65695 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2530727wrd; Tue, 7 Mar 2023 08:37:36 -0800 (PST) X-Google-Smtp-Source: AK7set8LRSovGOO2y2ecVS+Mh3e1EvjMqcqAvak24GDpuhir+12TStzOl9zT1zVX35piDLp40Fm8 X-Received: by 2002:a17:906:ce39:b0:8aa:f2f2:7543 with SMTP id sd25-20020a170906ce3900b008aaf2f27543mr15088171ejb.29.1678207056732; Tue, 07 Mar 2023 08:37:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678207056; cv=none; d=google.com; s=arc-20160816; b=q3XI9JiexxW/C1WwVtXLnLa1z933N2xGFEdNjRxQfmLCnhRZNLtFKUZM106GbVo9Z1 2EyrsOFxdoScyqII1+ophMR6/YGTH8ZBWmlir7FdYRTGe4gwIVubLS8xrXM5L3J9buvP 1o7oqeeD3w0hmXBAJ6U+YT027rS8oWdGvvTzsn+tcfM/iPOa6rqD0eeZqcbB0sHTEuv4 GaFDIxpEbD7RbX4WYUCTjKouXWhSkcNSEPp5LFOC7RoK2Gxp/c4jip1GVitZXnMSIyeN B1EStDTDVhdtZBf/VF3TEs1meHVwRrM+PEAKdZ1zVkr69dtE2nUv05iXfTVn7p10GFti Ec1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=bB4Z8WWz8MwXHMLbFuPP2jmZkWAkIXpQvcfndYFJ654=; b=OGXSM+BOIQVXsBDLe/T//CAaoLWc78JWF+GnuqENnQbqKaAA+4mkER6+bER5iuyp6z Yt/5G1VbPsXIQXnKEkORiv0p1415IBi8rqpH+N2QRlS5b3PI/4Gmt1Hs1OCvraxp+Lb6 C62VUElMJbPzOd0zglapFFRF1H1h5ZedB5IDn3HNrSCbo+2xoJxxdCtvJafzK3OUX7wJ K8eTewFfj4+e9pyTNkgFXpYWrimHWde3QIprLNaSzA028SGMQb1NbG2+r17jSpxov/GN VxQteCtwN9Yesj3YJRjqvXBAAqJGImRolyx/zGS4eHBuQsKcwMC6RrOcDZ4+k5a4u6FT uKUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail (test mode) header.i=@sang-engineering.com header.s=k1 header.b=tyKU84er; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l8-20020a170906794800b008c960203230si1613853ejo.351.2023.03.07.08.37.12; Tue, 07 Mar 2023 08:37:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail (test mode) header.i=@sang-engineering.com header.s=k1 header.b=tyKU84er; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230157AbjCGQbe (ORCPT + 99 others); Tue, 7 Mar 2023 11:31:34 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229914AbjCGQbJ (ORCPT ); Tue, 7 Mar 2023 11:31:09 -0500 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E684384F57 for ; Tue, 7 Mar 2023 08:31:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=k1; bh=JtgpuSK8MmevXI itz6mQVyFwa8KVkr2/FF+DSt6FhcE=; b=tyKU84erH9mXtS96aLIMQKmyVSd9L3 ZS1PHqinNMVw4uzLZioEtVQewxGVlp1FYSsHs+bLNjI8rdqUhOF7bCoZiTMhNvN9 JSyLEQ7lm3IwtF6a+KvacNjqBY/D0XS7XVvgQcjo1ktaJnGqkujpq3oi0H34OJxL V3Q7L7KzZf5Q8= Received: (qmail 751874 invoked from network); 7 Mar 2023 17:31:02 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 7 Mar 2023 17:31:02 +0100 X-UD-Smtp-Session: l3s3148p1@DE3z71H2QI0gAQnoAFQ+AGEn9EY5VOxJ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Wolfram Sang , Laurent Pinchart , Geert Uytterhoeven , Joerg Roedel , Will Deacon , Robin Murphy , iommu@lists.linux.dev, linux-kernel@vger.kernel.org Subject: [PATCH 01/11] iommu/ipmmu-vmsa: remove R-Car H3 ES1.* handling Date: Tue, 7 Mar 2023 17:30:29 +0100 Message-Id: <20230307163041.3815-2-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> References: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_NONE, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759727642366325929?= X-GMAIL-MSGID: =?utf-8?q?1759727642366325929?= R-Car H3 ES1.* was only available to an internal development group and needed a lot of quirks and workarounds. These become a maintenance burden now, so our development group decided to remove upstream support and disable booting for this SoC. Public users only have ES2 onwards. Reviewed-by: Laurent Pinchart Reviewed-by: Geert Uytterhoeven Signed-off-by: Wolfram Sang --- Please apply individually per subsystem. There are no dependencies and the SoC doesn't boot anymore since v6.3-rc1. drivers/iommu/ipmmu-vmsa.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/iommu/ipmmu-vmsa.c b/drivers/iommu/ipmmu-vmsa.c index bdf1a4e5eae0..ba42001a6f57 100644 --- a/drivers/iommu/ipmmu-vmsa.c +++ b/drivers/iommu/ipmmu-vmsa.c @@ -697,7 +697,6 @@ static const struct soc_device_attribute soc_needs_opt_in[] = { static const struct soc_device_attribute soc_denylist[] = { { .soc_id = "r8a774a1", }, - { .soc_id = "r8a7795", .revision = "ES1.*" }, { .soc_id = "r8a7795", .revision = "ES2.*" }, { .soc_id = "r8a7796", }, { /* sentinel */ } From patchwork Tue Mar 7 16:30:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 65697 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2531069wrd; Tue, 7 Mar 2023 08:38:23 -0800 (PST) X-Google-Smtp-Source: AK7set/n9o8ho9Lk6SEb88fgq32XBt9IoNh+S9SbAvdr4QC4ZU8R6mwcF/Wu0xvcXi6/4otZkw8p X-Received: by 2002:a17:907:2d0d:b0:903:9733:5ef with SMTP id gs13-20020a1709072d0d00b00903973305efmr19063580ejc.21.1678207103310; Tue, 07 Mar 2023 08:38:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678207103; cv=none; d=google.com; s=arc-20160816; b=JKzfyeC6YEt0TLtztqTmVSOISrSc7erE+9OTAOi3eghz/6BnkK3e2imil6WwAvHMdv a9bBzJAe7Ac1CigprXDUlT7kUx4+dPoxIUrcgY37mMpkLLm0xz4EH/AvvbzNokUa1kpB KWuDnu7g2d9ZyahSq2iFzKgXwPfK4+zvKUkS6iopwCvRz+QEFbSrrNW4CTcl4Ha+GwSA rUNPWRkRphppSSk4StW7q5YmqZ/YZJd0xjwfuBW8Pfisg2DJwSYMf2JX+E4HVl+QTBkZ ETK+cItkU21WwFcArb6+kR5tryEfScSKSe8oZM3zkONMWWuN9AJqnAsJDV1bWp9BAXEI bXZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=P/bb2zTYYZ/whbbi7oKyWYYmcr6IX5e/wn0WrHMSDqw=; b=vVk3clk1m8AYExT5Du21wP7mlm/kijP4iXc8X4skwX5UqSNiOoBeAKvcaVglGhiDby ylDZPzPseJpZczcEPqe+sAAhwCw1q/YkYpJytsX8h4dKoNUhSGAy61qhhpF03KFmXjrj b2m+mGZR+gTR4YhT5Bj/OsFx53aymIOkOPPpPONxEIYyiKJn9mcYcd2x3IXDPO4YB+28 GChf2p5it0/nyvPP+OSth9Qykxc1ewU3PHtE/2f1loeUMxnXWmm6VRXsw9EcZjvZ2yrQ xVCfLYc4G3D5y1VlpIUaOcc7xhNMmGet7TcISMfT7jnBBdavDmTh6u+BpUv7A6upg/NE kVVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail (test mode) header.i=@sang-engineering.com header.s=k1 header.b=E1ggGJn6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id h22-20020a170906829600b008b223aa7a2esi13086508ejx.82.2023.03.07.08.37.59; Tue, 07 Mar 2023 08:38:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail (test mode) header.i=@sang-engineering.com header.s=k1 header.b=E1ggGJn6; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229971AbjCGQbn (ORCPT + 99 others); Tue, 7 Mar 2023 11:31:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39680 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230019AbjCGQbK (ORCPT ); Tue, 7 Mar 2023 11:31:10 -0500 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6A52D81CE9 for ; Tue, 7 Mar 2023 08:31:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=k1; bh=r8NJlSYVQC97KP ANJwbJ5dxBfAnx+TEcfLLwOb6eoh8=; b=E1ggGJn6imOYD6aNKrT5pHezz7nQYY F/QCUUzkEtJQmHsQNNP1FWrwomOKs4rLXAtuDRntfKowCo0o5qpP2wy69oDqVkUK ClgyzVJudK/4BUgZnr8d+uwDsWMf6WWIRgdNLjGJkR2s62vSY9qsxa5nZJeNxVlu 9i8e7q0916XJs= Received: (qmail 751936 invoked from network); 7 Mar 2023 17:31:03 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 7 Mar 2023 17:31:03 +0100 X-UD-Smtp-Session: l3s3148p1@lYsB8FH2RI0gAQnoAFQ+AGEn9EY5VOxJ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Wolfram Sang , Laurent Pinchart , Kieran Bingham , David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 02/11] drm: rcar-du: remove R-Car H3 ES1.* workarounds Date: Tue, 7 Mar 2023 17:30:30 +0100 Message-Id: <20230307163041.3815-3-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> References: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_NONE, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759727691429223502?= X-GMAIL-MSGID: =?utf-8?q?1759727691429223502?= R-Car H3 ES1.* was only available to an internal development group and needed a lot of quirks and workarounds. These become a maintenance burden now, so our development group decided to remove upstream support and disable booting for this SoC. Public users only have ES2 onwards. Signed-off-by: Wolfram Sang Reviewed-by: Kieran Bingham --- Please apply individually per subsystem. There are no dependencies and the SoC doesn't boot anymore since v6.3-rc1. drivers/gpu/drm/rcar-du/rcar_du_crtc.c | 37 ++------------------ drivers/gpu/drm/rcar-du/rcar_du_drv.c | 48 -------------------------- drivers/gpu/drm/rcar-du/rcar_du_drv.h | 2 -- drivers/gpu/drm/rcar-du/rcar_du_regs.h | 3 +- 4 files changed, 4 insertions(+), 86 deletions(-) diff --git a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c index 008e172ed43b..84411c452e30 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_crtc.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_crtc.c @@ -223,20 +223,6 @@ static void rcar_du_crtc_set_display_timing(struct rcar_du_crtc *rcrtc) * DU channels that have a display PLL can't use the internal * system clock, and have no internal clock divider. */ - - /* - * The H3 ES1.x exhibits dot clock duty cycle stability issues. - * We can work around them by configuring the DPLL to twice the - * desired frequency, coupled with a /2 post-divider. Restrict - * the workaround to H3 ES1.x as ES2.0 and all other SoCs have - * no post-divider when a display PLL is present (as shown by - * the workaround breaking HDMI output on M3-W during testing). - */ - if (rcdu->info->quirks & RCAR_DU_QUIRK_H3_ES1_PCLK_STABILITY) { - target *= 2; - div = 1; - } - extclk = clk_get_rate(rcrtc->extclock); rcar_du_dpll_divider(rcrtc, &dpll, extclk, target); @@ -245,30 +231,13 @@ static void rcar_du_crtc_set_display_timing(struct rcar_du_crtc *rcrtc) | DPLLCR_N(dpll.n) | DPLLCR_M(dpll.m) | DPLLCR_STBY; - if (rcrtc->index == 1) { + if (rcrtc->index == 1) dpllcr |= DPLLCR_PLCS1 | DPLLCR_INCS_DOTCLKIN1; - } else { - dpllcr |= DPLLCR_PLCS0_PLL + else + dpllcr |= DPLLCR_PLCS0 | DPLLCR_INCS_DOTCLKIN0; - /* - * On ES2.x we have a single mux controlled via bit 21, - * which selects between DCLKIN source (bit 21 = 0) and - * a PLL source (bit 21 = 1), where the PLL is always - * PLL1. - * - * On ES1.x we have an additional mux, controlled - * via bit 20, for choosing between PLL0 (bit 20 = 0) - * and PLL1 (bit 20 = 1). We always want to use PLL1, - * so on ES1.x, in addition to setting bit 21, we need - * to set the bit 20. - */ - - if (rcdu->info->quirks & RCAR_DU_QUIRK_H3_ES1_PLL) - dpllcr |= DPLLCR_PLCS0_H3ES1X_PLL1; - } - rcar_du_group_write(rcrtc->group, DPLLCR, dpllcr); escr = ESCR_DCLKSEL_DCLKIN | div; diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c index b9a94c5260e9..1ffde19cb87f 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c @@ -16,7 +16,6 @@ #include #include #include -#include #include #include @@ -387,43 +386,6 @@ static const struct rcar_du_device_info rcar_du_r8a7795_info = { .dpll_mask = BIT(2) | BIT(1), }; -static const struct rcar_du_device_info rcar_du_r8a7795_es1_info = { - .gen = 3, - .features = RCAR_DU_FEATURE_CRTC_IRQ - | RCAR_DU_FEATURE_CRTC_CLOCK - | RCAR_DU_FEATURE_VSP1_SOURCE - | RCAR_DU_FEATURE_INTERLACED - | RCAR_DU_FEATURE_TVM_SYNC, - .quirks = RCAR_DU_QUIRK_H3_ES1_PCLK_STABILITY - | RCAR_DU_QUIRK_H3_ES1_PLL, - .channels_mask = BIT(3) | BIT(2) | BIT(1) | BIT(0), - .routes = { - /* - * R8A7795 has one RGB output, two HDMI outputs and one - * LVDS output. - */ - [RCAR_DU_OUTPUT_DPAD0] = { - .possible_crtcs = BIT(3), - .port = 0, - }, - [RCAR_DU_OUTPUT_HDMI0] = { - .possible_crtcs = BIT(1), - .port = 1, - }, - [RCAR_DU_OUTPUT_HDMI1] = { - .possible_crtcs = BIT(2), - .port = 2, - }, - [RCAR_DU_OUTPUT_LVDS0] = { - .possible_crtcs = BIT(0), - .port = 3, - }, - }, - .num_lvds = 1, - .num_rpf = 5, - .dpll_mask = BIT(2) | BIT(1), -}; - static const struct rcar_du_device_info rcar_du_r8a7796_info = { .gen = 3, .features = RCAR_DU_FEATURE_CRTC_IRQ @@ -614,11 +576,6 @@ static const struct of_device_id rcar_du_of_table[] = { MODULE_DEVICE_TABLE(of, rcar_du_of_table); -static const struct soc_device_attribute rcar_du_soc_table[] = { - { .soc_id = "r8a7795", .revision = "ES1.*", .data = &rcar_du_r8a7795_es1_info }, - { /* sentinel */ } -}; - const char *rcar_du_output_name(enum rcar_du_output output) { static const char * const names[] = { @@ -707,7 +664,6 @@ static void rcar_du_shutdown(struct platform_device *pdev) static int rcar_du_probe(struct platform_device *pdev) { - const struct soc_device_attribute *soc_attr; struct rcar_du_device *rcdu; unsigned int mask; int ret; @@ -725,10 +681,6 @@ static int rcar_du_probe(struct platform_device *pdev) rcdu->info = of_device_get_match_data(rcdu->dev); - soc_attr = soc_device_match(rcar_du_soc_table); - if (soc_attr) - rcdu->info = soc_attr->data; - platform_set_drvdata(pdev, rcdu); /* I/O resources */ diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.h b/drivers/gpu/drm/rcar-du/rcar_du_drv.h index acc3673fefe1..5cfa2bb7ad93 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.h +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.h @@ -34,8 +34,6 @@ struct rcar_du_device; #define RCAR_DU_FEATURE_NO_BLENDING BIT(5) /* PnMR.SPIM does not have ALP nor EOR bits */ #define RCAR_DU_QUIRK_ALIGN_128B BIT(0) /* Align pitches to 128 bytes */ -#define RCAR_DU_QUIRK_H3_ES1_PCLK_STABILITY BIT(1) /* H3 ES1 has pclk stability issue */ -#define RCAR_DU_QUIRK_H3_ES1_PLL BIT(2) /* H3 ES1 PLL setup differs from non-ES1 */ enum rcar_du_output { RCAR_DU_OUTPUT_DPAD0, diff --git a/drivers/gpu/drm/rcar-du/rcar_du_regs.h b/drivers/gpu/drm/rcar-du/rcar_du_regs.h index 789ae9285108..288eff12b2b1 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_regs.h +++ b/drivers/gpu/drm/rcar-du/rcar_du_regs.h @@ -283,8 +283,7 @@ #define DPLLCR 0x20044 #define DPLLCR_CODE (0x95 << 24) #define DPLLCR_PLCS1 (1 << 23) -#define DPLLCR_PLCS0_PLL (1 << 21) -#define DPLLCR_PLCS0_H3ES1X_PLL1 (1 << 20) +#define DPLLCR_PLCS0 (1 << 21) #define DPLLCR_CLKE (1 << 18) #define DPLLCR_FDPLL(n) ((n) << 12) #define DPLLCR_N(n) ((n) << 5) From patchwork Tue Mar 7 16:30:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 65711 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2540796wrd; Tue, 7 Mar 2023 08:59:21 -0800 (PST) X-Google-Smtp-Source: AK7set++7fO9+btv9JI0ZS7czSG/XRUaiwBsdppijgGgM3BXVismzeb5SFz4fe+0F3QygXRECmmY X-Received: by 2002:aa7:d80f:0:b0:4ce:bb5c:158e with SMTP id v15-20020aa7d80f000000b004cebb5c158emr14311115edq.19.1678208360952; Tue, 07 Mar 2023 08:59:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678208360; cv=none; d=google.com; s=arc-20160816; b=al0PYH2+P6UCTgex8wsVCkHd0BtA/kzAg4Nmlt1500x/LO2YQJwogLfTSptee3qo9y if0vr6ctLgEIdRKvTU05WarQkm8liouhR6OR2uBxgDk0ruX/tO168LrncX+qUkBI/XG1 SY3DpTd18OR3AkJGIuvL2rPC5XqvoTPOW2+ZeThg7p0l+uoymxCehKTGNMt6AM4qIuTd rE0buICkpkOlpW2WcF6q6fwK/1BA4iLkeGhp+6l76XfrLYWplzsRkK069xJLGFYkygmk 0L/LGIpobC3MdyhycnQGM23dDKWvief2pEAPXdtkClIoYc6SE5b503g8ZKYNxMGsJZel F3Zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=OtQSD5Q4ffofnGiKWRzQ8ktkTPKMeSaeHlht3rq3j18=; b=QKWCwNwoXRnJskNuEw0f0fo3qGeyL3NKVyigH5e2tHo2yAt6G+WMdIsjL3qcO+sQk1 ZzC/nxP0RqFs5cIDbQE6cZU1ZjIyWRn3DcZ0xJESiS3F6TTz99gZoW7mZLRms/HbR8O/ T9Xws6zL1T2+gaRg30RGzlLHvnQVVOLJnBWFVZMAricOqPpjeGP1YAXluap4Tk0qBEAG R5KqqutKiYBsU3r9yQelxkl9WGkj2nynDVkMt6fBkESL8NWNF8Y+xA6YjdqZExHWKmOa q3uOviowJVWbvJjbvDoEzfnGK4v+fewmdnJoh16R23GQTwxh9QmKM6iIIOs/0YS32FG6 sZnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail (test mode) header.i=@sang-engineering.com header.s=k1 header.b=QoFqkIOd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id m11-20020aa7d34b000000b004af64997fb7si2510362edr.18.2023.03.07.08.58.57; Tue, 07 Mar 2023 08:59:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail (test mode) header.i=@sang-engineering.com header.s=k1 header.b=QoFqkIOd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229879AbjCGQbi (ORCPT + 99 others); Tue, 7 Mar 2023 11:31:38 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39668 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230014AbjCGQbK (ORCPT ); Tue, 7 Mar 2023 11:31:10 -0500 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D68DC81CD9 for ; Tue, 7 Mar 2023 08:31:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; s=k1; bh=K SmFdOPKLYCNJfgM7xNMVh9zw+j6Ry9MBKk15S61PCk=; b=QoFqkIOdij8DrVq4M B12B1L6LVsd0RXz4z9JgR8m9f8RPeKHcwpu+ILuQdUzWBgEwpR2wQPBPMGh62OVn csP6BIRhBcdYCH78xmZf5vba1Dh0JnU9I0aFQ3h8LA1HjWjY0TnVER2u5chWm5JR v+2Q5G+uIAnx5gpZaOY2euP8dk= Received: (qmail 751963 invoked from network); 7 Mar 2023 17:31:03 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 7 Mar 2023 17:31:03 +0100 X-UD-Smtp-Session: l3s3148p1@wTYM8FH2To0gAQnoAFQ+AGEn9EY5VOxJ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Wolfram Sang , Laurent Pinchart , =?utf-8?q?Nik?= =?utf-8?q?las_S=C3=B6derlund?= , Geert Uytterhoeven , =?utf-8?q?Niklas_S=C3=B6derlu?= =?utf-8?q?nd?= , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 03/11] media: rcar-vin: remove R-Car H3 ES1.* handling Date: Tue, 7 Mar 2023 17:30:31 +0100 Message-Id: <20230307163041.3815-4-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> References: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_NONE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759729010033423728?= X-GMAIL-MSGID: =?utf-8?q?1759729010033423728?= R-Car H3 ES1.* was only available to an internal development group and needed a lot of quirks and workarounds. These become a maintenance burden now, so our development group decided to remove upstream support and disable booting for this SoC. Public users only have ES2 onwards. Reviewed-by: Laurent Pinchart Reviewed-by: Niklas Söderlund Reviewed-by: Geert Uytterhoeven Signed-off-by: Wolfram Sang --- Please apply individually per subsystem. There are no dependencies and the SoC doesn't boot anymore since v6.3-rc1. .../platform/renesas/rcar-vin/rcar-core.c | 36 ------------------- 1 file changed, 36 deletions(-) diff --git a/drivers/media/platform/renesas/rcar-vin/rcar-core.c b/drivers/media/platform/renesas/rcar-vin/rcar-core.c index 5e53d6b7036c..ac8f2126540b 100644 --- a/drivers/media/platform/renesas/rcar-vin/rcar-core.c +++ b/drivers/media/platform/renesas/rcar-vin/rcar-core.c @@ -17,7 +17,6 @@ #include #include #include -#include #include #include @@ -1183,24 +1182,6 @@ static const struct rvin_info rcar_info_r8a7795 = { .scaler = rvin_scaler_gen3, }; -static const struct rvin_group_route rcar_info_r8a7795es1_routes[] = { - { .master = 0, .csi = RVIN_CSI20, .chsel = 0x04 }, - { .master = 0, .csi = RVIN_CSI21, .chsel = 0x05 }, - { .master = 0, .csi = RVIN_CSI40, .chsel = 0x03 }, - { .master = 4, .csi = RVIN_CSI20, .chsel = 0x04 }, - { .master = 4, .csi = RVIN_CSI21, .chsel = 0x05 }, - { .master = 4, .csi = RVIN_CSI41, .chsel = 0x03 }, - { /* Sentinel */ } -}; - -static const struct rvin_info rcar_info_r8a7795es1 = { - .model = RCAR_GEN3, - .use_mc = true, - .max_width = 4096, - .max_height = 4096, - .routes = rcar_info_r8a7795es1_routes, -}; - static const struct rvin_group_route rcar_info_r8a7796_routes[] = { { .master = 0, .csi = RVIN_CSI20, .chsel = 0x04 }, { .master = 0, .csi = RVIN_CSI40, .chsel = 0x03 }, @@ -1372,17 +1353,8 @@ static const struct of_device_id rvin_of_id_table[] = { }; MODULE_DEVICE_TABLE(of, rvin_of_id_table); -static const struct soc_device_attribute r8a7795es1[] = { - { - .soc_id = "r8a7795", .revision = "ES1.*", - .data = &rcar_info_r8a7795es1, - }, - { /* Sentinel */ } -}; - static int rcar_vin_probe(struct platform_device *pdev) { - const struct soc_device_attribute *attr; struct rvin_dev *vin; int irq, ret; @@ -1394,14 +1366,6 @@ static int rcar_vin_probe(struct platform_device *pdev) vin->info = of_device_get_match_data(&pdev->dev); vin->alpha = 0xff; - /* - * Special care is needed on r8a7795 ES1.x since it - * uses different routing than r8a7795 ES2.0. - */ - attr = soc_device_match(r8a7795es1); - if (attr) - vin->info = attr->data; - vin->base = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(vin->base)) return PTR_ERR(vin->base); From patchwork Tue Mar 7 16:30:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 65709 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2540751wrd; Tue, 7 Mar 2023 08:59:16 -0800 (PST) X-Google-Smtp-Source: AK7set+DcsmDUjPOZptxbnqFHVc5NCZ4mjMbTc4Yh3TFnn0V7LtS8ew7HCTxdF7KDPFrmd3wy5dc X-Received: by 2002:a17:907:1c15:b0:8af:2fa1:2226 with SMTP id nc21-20020a1709071c1500b008af2fa12226mr19356914ejc.6.1678208356086; Tue, 07 Mar 2023 08:59:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678208356; cv=none; d=google.com; s=arc-20160816; b=tf+3XXxHTpqGvpJdsNQADMFG+2FKNNYJrC3zLX69SNPaDZEO0wVT12p/JMxU97QQ54 0JwI8sTP5Qi3mQOPcEge9pYVM/EQ/Vi5SPPmrgPrAzqQefpP4yzGm3X92iqtAyiPRM75 GY/c9z9hJmgp/yilkRqz6Wtsw9357ltCH3eIfAFXIqJKoaP4LIGmhD4+RZutLqFFRE9i TI36YyDbcFCk4WAcwfOP997bSNKBGpofm54UbyZHQKRFLPWaaM+OcQxo296DePJwk1g0 1TkLxzqQFzNDQkCRqkKIDgueMZp1KS9ZEvhM7UKf4Jz9QON07eH/FDKQ41Ca5WS+ZlTQ AXgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=UqxnmZiRTOZgyOSvdONkDaer1w9nkW8TY6opAWL/gRo=; b=M30L3vsfVjxsOtSRbl83wTEgSewaiCNGF81ehjv26ekKdbbvnrv2XAuHEWQOf1w7BV Kt/VCAgxaEy9V0eQ4RY64mK/mT4fcGZllPDzyL0Vdlyfiw3o6sdHb63hpoOdf8MY8xjU hDzpllBuaB9zCP+tFgjd8Mr9diu3iFhI7+N7mpLuvR1rbuJi4q1ok2efp4PLj82h+/Kr i+iOiiphUtLraknp3F3E1hTStN+MiMw4CdDeE27UHVwAAhXwyX01CJZ864pOK/mvAKys Xcp4yhyC7MzV4h0BESfT9e32ozG4AcKJ1Z4xq86OhBxQOuGP8xYSuUZFt52QM0T44eTb Uo6A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail (test mode) header.i=@sang-engineering.com header.s=k1 header.b=Asljh3Po; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hr16-20020a1709073f9000b008d3be841ccfsi1205364ejc.753.2023.03.07.08.58.52; Tue, 07 Mar 2023 08:59:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail (test mode) header.i=@sang-engineering.com header.s=k1 header.b=Asljh3Po; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230152AbjCGQbr (ORCPT + 99 others); Tue, 7 Mar 2023 11:31:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40380 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229963AbjCGQbc (ORCPT ); Tue, 7 Mar 2023 11:31:32 -0500 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2B16B8537E for ; Tue, 7 Mar 2023 08:31:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; s=k1; bh=2 xmX64li5R8XVTY3e1IAV+jsSJYToTSbgonh9QmzGO8=; b=Asljh3Po8WQaM88UM /Qq2Lpzu4SxwtJIev27pFgr42fbPqqVDHXgovSh6/rAueps5ji3Y76gowGbtp9Qi HP1dbCiOJCFgwEYaiGQjEoam7gl0rx9DZ0B5ppkUZ6AqeCJF1T2X6XTCBQ4huIg9 sJIqXFRFl+YsGj4lRQLREZ7rK8= Received: (qmail 751992 invoked from network); 7 Mar 2023 17:31:04 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 7 Mar 2023 17:31:04 +0100 X-UD-Smtp-Session: l3s3148p1@a1AX8FH2XI0gAQnoAFQ+AGEn9EY5VOxJ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Wolfram Sang , Laurent Pinchart , =?utf-8?q?Nik?= =?utf-8?q?las_S=C3=B6derlund?= , =?utf-8?q?Niklas_S=C3=B6derlund?= , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 04/11] media: rcar-vin: csi2: remove R-Car H3 ES1.* handling Date: Tue, 7 Mar 2023 17:30:32 +0100 Message-Id: <20230307163041.3815-5-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> References: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_NONE, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759729005452237380?= X-GMAIL-MSGID: =?utf-8?q?1759729005452237380?= R-Car H3 ES1.* was only available to an internal development group and needed a lot of quirks and workarounds. These become a maintenance burden now, so our development group decided to remove upstream support and disable booting for this SoC. Public users only have ES2 onwards. Reviewed-by: Laurent Pinchart Reviewed-by: Niklas Söderlund Signed-off-by: Wolfram Sang --- Please apply individually per subsystem. There are no dependencies and the SoC doesn't boot anymore since v6.3-rc1. .../media/platform/renesas/rcar-vin/rcar-csi2.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c b/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c index 174aa6176f54..5dbd0daa8735 100644 --- a/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c +++ b/drivers/media/platform/renesas/rcar-vin/rcar-csi2.c @@ -345,7 +345,7 @@ static const struct rcsi2_mbps_reg hsfreqrange_h3_v3h_m3n[] = { { /* sentinel */ }, }; -static const struct rcsi2_mbps_reg hsfreqrange_m3w_h3es1[] = { +static const struct rcsi2_mbps_reg hsfreqrange_m3w[] = { { .mbps = 80, .reg = 0x00 }, { .mbps = 90, .reg = 0x10 }, { .mbps = 100, .reg = 0x20 }, @@ -1369,11 +1369,6 @@ static const struct rcar_csi2_info rcar_csi2_info_r8a7795 = { .clear_ulps = true, }; -static const struct rcar_csi2_info rcar_csi2_info_r8a7795es1 = { - .hsfreqrange = hsfreqrange_m3w_h3es1, - .num_channels = 4, -}; - static const struct rcar_csi2_info rcar_csi2_info_r8a7795es2 = { .init_phtw = rcsi2_init_phtw_h3es2, .hsfreqrange = hsfreqrange_h3_v3h_m3n, @@ -1383,12 +1378,12 @@ static const struct rcar_csi2_info rcar_csi2_info_r8a7795es2 = { }; static const struct rcar_csi2_info rcar_csi2_info_r8a7796 = { - .hsfreqrange = hsfreqrange_m3w_h3es1, + .hsfreqrange = hsfreqrange_m3w, .num_channels = 4, }; static const struct rcar_csi2_info rcar_csi2_info_r8a77961 = { - .hsfreqrange = hsfreqrange_m3w_h3es1, + .hsfreqrange = hsfreqrange_m3w, .num_channels = 4, }; @@ -1481,10 +1476,6 @@ static const struct of_device_id rcar_csi2_of_table[] = { MODULE_DEVICE_TABLE(of, rcar_csi2_of_table); static const struct soc_device_attribute r8a7795[] = { - { - .soc_id = "r8a7795", .revision = "ES1.*", - .data = &rcar_csi2_info_r8a7795es1, - }, { .soc_id = "r8a7795", .revision = "ES2.*", .data = &rcar_csi2_info_r8a7795es2, From patchwork Tue Mar 7 16:30:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 65698 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2531877wrd; Tue, 7 Mar 2023 08:39:56 -0800 (PST) X-Google-Smtp-Source: AK7set9EaoutMKB7BcA05h1EtRX1uxxqi+dTxnnDaO26QuY75FRpgpSywYjPmBxQ6NK+bK9rmR0v X-Received: by 2002:a17:907:a705:b0:8f1:dfa5:8117 with SMTP id vw5-20020a170907a70500b008f1dfa58117mr17594915ejc.51.1678207196004; Tue, 07 Mar 2023 08:39:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678207195; cv=none; d=google.com; s=arc-20160816; b=OlLm4sY1PAwQkOakNBu6vOheigm7LjBcFgsYOsNSyiXtsjZz8jZWW+/Vco13NZOAuo sk3v0iYs15S2UhHCjtW3j2uv880cHd+wv1I6q8czjP4u+sbhsRX4F05d/w5gWK762BRH PsKX5tybdsKziZUMwnMLaGPGuk2YC88yFRg/GYR7OqhX+yrkEikwR3JBbdS7MHP4L6hr wvUrQwVfQgF6sqOjRAQg062e7IawPj2Skt50HB41eoj0bM7tKRuYSwJzQzhdt7BHKsqK N38IbMocDqhCUuMo4S+vi5ZJKbv9UhcKJml/M5aYGYuhdSWSLNXM/z9yOsBCPY/PTEv6 zm8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=oDidKX3/ttbzi+hyJivCcj7ODzlYk3Er+KzKdrY+QZI=; b=vfvMmeyMvwAvWb8m8iCtcWMbucAqPbxwH7P+alEKX5JvdY5AlV0GLyxy+UQI0WBgRu AU9y9E2AF190smRnQNW+iwOXZi99ywqNIUzdlKBqDVEaFGcNWmQV4lHLJ088BJpuoBjR LZszuZuL6UPqSNMHjeqS5CT6OrZ2gsAwGNDD2u42B9W02Mc87xMD70ku8UvhV7QKIXMk ZuwNKTO/kJ9E1l40wYyKkIyLPqD7XbSlpSlsAScQ2QW2fhZGJAdTbdCSd2AU9gwZ8Yfv Q9O8pLhPumEtjgMF4Oapj8kXMeaVfbvOqoufNy1ROh8uwQKkO5V4x7oHsDEejscZr5de TKfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail (test mode) header.i=@sang-engineering.com header.s=k1 header.b=JDSYoj8V; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z22-20020a1709063ad600b008e20382c9bcsi737647ejd.439.2023.03.07.08.39.32; Tue, 07 Mar 2023 08:39:55 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail (test mode) header.i=@sang-engineering.com header.s=k1 header.b=JDSYoj8V; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230512AbjCGQby (ORCPT + 99 others); Tue, 7 Mar 2023 11:31:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39618 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229958AbjCGQbc (ORCPT ); Tue, 7 Mar 2023 11:31:32 -0500 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3220C85A42 for ; Tue, 7 Mar 2023 08:31:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=k1; bh=BL47/9gshlsQiA D5V7ioQV+yS8e/Scob5w8583YxF3o=; b=JDSYoj8VlQmdXygO7ag7zGmEizmUR4 rmYi5kQbOz4dp6qm+SOZ12S6B5zg5R1o8Kg9yxr6EmDyWyo4SJUD5Ia8qNI39dSv rvXDSYTdsSwBBj/B8rb1CLBD2QULzLezh88j6DLbeUFrATr7zs1eJiy2ajVsPO9y U02JKNT4atRw8= Received: (qmail 752025 invoked from network); 7 Mar 2023 17:31:05 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 7 Mar 2023 17:31:05 +0100 X-UD-Smtp-Session: l3s3148p1@ROgh8FH2bI0gAQnoAFQ+AGEn9EY5VOxJ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Wolfram Sang , Geert Uytterhoeven , Kieran Bingham , Mauro Carvalho Chehab , linux-media@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 05/11] media: renesas: fdp1: remove R-Car H3 ES1.* handling Date: Tue, 7 Mar 2023 17:30:33 +0100 Message-Id: <20230307163041.3815-6-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> References: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_NONE, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759727788699748234?= X-GMAIL-MSGID: =?utf-8?q?1759727788699748234?= R-Car H3 ES1.* was only available to an internal development group and needed a lot of quirks and workarounds. These become a maintenance burden now, so our development group decided to remove upstream support and disable booting for this SoC. Public users only have ES2 onwards. Reviewed-by: Geert Uytterhoeven Signed-off-by: Wolfram Sang Reviewed-by: Kieran Bingham --- Please apply individually per subsystem. There are no dependencies and the SoC doesn't boot anymore since v6.3-rc1. drivers/media/platform/renesas/rcar_fdp1.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/media/platform/renesas/rcar_fdp1.c b/drivers/media/platform/renesas/rcar_fdp1.c index 37ecf489d112..f4a1fc8ce595 100644 --- a/drivers/media/platform/renesas/rcar_fdp1.c +++ b/drivers/media/platform/renesas/rcar_fdp1.c @@ -254,7 +254,6 @@ MODULE_PARM_DESC(debug, "activate debug info"); /* Internal Data (HW Version) */ #define FD1_IP_INTDATA 0x0800 -#define FD1_IP_H3_ES1 0x02010101 #define FD1_IP_M3W 0x02010202 #define FD1_IP_H3 0x02010203 #define FD1_IP_M3N 0x02010204 @@ -2359,9 +2358,6 @@ static int fdp1_probe(struct platform_device *pdev) hw_version = fdp1_read(fdp1, FD1_IP_INTDATA); switch (hw_version) { - case FD1_IP_H3_ES1: - dprintk(fdp1, "FDP1 Version R-Car H3 ES1\n"); - break; case FD1_IP_M3W: dprintk(fdp1, "FDP1 Version R-Car M3-W\n"); break; From patchwork Tue Mar 7 16:30:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 65699 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2531932wrd; Tue, 7 Mar 2023 08:40:02 -0800 (PST) X-Google-Smtp-Source: AK7set/A9jj9k8YkSqrBUMormIdBLGIO5QhvVWw2cag6lCDF/xsCg/pRcoR2D4VpTxt9z5ZKCdJU X-Received: by 2002:a17:906:eb4c:b0:8aa:bea6:ce8b with SMTP id mc12-20020a170906eb4c00b008aabea6ce8bmr14205541ejb.53.1678207202451; Tue, 07 Mar 2023 08:40:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678207202; cv=none; d=google.com; s=arc-20160816; b=BRI77Sag+MwPKMXj44t9hyyQ8GGfdhqB33bj2iNda6AzN3+Xj0O1q09MwU2/II2khY hGy5Mqmdqcv+pwXKgFlwGGOv6rZXrWlmXiqGpZvLdZPWk/w97vYRNKKCpy1U87L8Msct mL4yOZkeqWXC0T9tqSWuGtQXOlSi3b+wKC0r/3t8XM1WJVgznmxdQ4+09S3tv0+7ac78 cTNXHr9PYuXU+JHEftGT1KZHYzSL37AL7tG39X55hXegv71XcY+cKusrkmShSKXOzBDQ u9dzPzOYDU1CAjK7SfnErHyxMoDQzempaVOsU5CiP3fV3p1K79gAtV5bteMXEg0fEul0 4Lrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=iCdIeQlG1ROoVZvei4gUl8PQjGGYSR2pYJCMBGbFsJI=; b=DPjJl2kU9bmu41V6QD/Q6Xg5iP/Q2yrBIEjwWf0pYHzWeWSOHwVpOCQ+0ZZVhP1jOZ Vm4Hf5A5dRhvQF0UdBMTBic0TowJ8Kcr92yWkWgw+xgqUPMwQLRG7/JeuuZB88IIU6x0 mjqsS4CMkACg6yeC+OMDV5t5iEiW32Z8DfbPfOHbK3Hh5cx7AP0yqqkUEtkwElZ19tvq jXQy6bXu2BYuWeA1shuq+y2UApg6Wc9GjEZeOH8ZutsrjmFgzJMSneQ4femmpI93lHaS utjpb6S5+KhUQ5vvI6xvV56NbiKYxQLJss1qSRWjXj0NF0PpMfFm0JsIQQv3iO0iHcIY x8xw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail (test mode) header.i=@sang-engineering.com header.s=k1 header.b=dKsH9dmT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id be4-20020a1709070a4400b008c660960fa5si3191381ejc.336.2023.03.07.08.39.38; Tue, 07 Mar 2023 08:40:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail (test mode) header.i=@sang-engineering.com header.s=k1 header.b=dKsH9dmT; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230521AbjCGQcA (ORCPT + 99 others); Tue, 7 Mar 2023 11:32:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39648 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230120AbjCGQbd (ORCPT ); Tue, 7 Mar 2023 11:31:33 -0500 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5D98585A6B for ; Tue, 7 Mar 2023 08:31:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; s=k1; bh=n MY5bp/F1Kn36OJqLi8QTMaLHuNLJdfOvyLRKL/dfXI=; b=dKsH9dmTF5NW5Pq15 dDiu59gIoegD8bIv8XjwHOAdxhvUTYJ20c+A+ZmGn9DQojqDbaWWjQDEANvOv0io qQI3k/s91plKOYXSXQia4cnVRPWd06KwhDHpsj4xsSv10RNrYvDQn7tLD2N1nX8L dq33zlAgKwpq/6pAgpm4irwXIM= Received: (qmail 752052 invoked from network); 7 Mar 2023 17:31:06 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 7 Mar 2023 17:31:06 +0100 X-UD-Smtp-Session: l3s3148p1@1Bwt8FH2bo0gAQnoAFQ+AGEn9EY5VOxJ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Wolfram Sang , Laurent Pinchart , =?utf-8?q?Nik?= =?utf-8?q?las_S=C3=B6derlund?= , Geert Uytterhoeven , =?utf-8?q?Niklas_S=C3=B6derlu?= =?utf-8?q?nd?= , "Rafael J. Wysocki" , Daniel Lezcano , Amit Kucheria , Zhang Rui , linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 06/11] thermal/drivers/rcar_gen3_thermal: remove R-Car H3 ES1.* handling Date: Tue, 7 Mar 2023 17:30:34 +0100 Message-Id: <20230307163041.3815-7-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> References: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_NONE, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759727795816905135?= X-GMAIL-MSGID: =?utf-8?q?1759727795816905135?= R-Car H3 ES1.* was only available to an internal development group and needed a lot of quirks and workarounds. These become a maintenance burden now, so our development group decided to remove upstream support and disable booting for this SoC. Public users only have ES2 onwards. Reviewed-by: Laurent Pinchart Reviewed-by: Niklas Söderlund Reviewed-by: Geert Uytterhoeven Signed-off-by: Wolfram Sang --- Please apply individually per subsystem. There are no dependencies and the SoC doesn't boot anymore since v6.3-rc1. drivers/thermal/rcar_gen3_thermal.c | 52 ++--------------------------- 1 file changed, 2 insertions(+), 50 deletions(-) diff --git a/drivers/thermal/rcar_gen3_thermal.c b/drivers/thermal/rcar_gen3_thermal.c index d6b5b59c5c53..e97d1798b5a3 100644 --- a/drivers/thermal/rcar_gen3_thermal.c +++ b/drivers/thermal/rcar_gen3_thermal.c @@ -14,7 +14,6 @@ #include #include #include -#include #include #include "thermal_hwmon.h" @@ -27,7 +26,6 @@ #define REG_GEN3_IRQTEMP1 0x14 #define REG_GEN3_IRQTEMP2 0x18 #define REG_GEN3_IRQTEMP3 0x1C -#define REG_GEN3_CTSR 0x20 #define REG_GEN3_THCTR 0x20 #define REG_GEN3_TEMP 0x28 #define REG_GEN3_THCODE1 0x50 @@ -46,14 +44,6 @@ #define IRQ_TEMPD2 BIT(4) #define IRQ_TEMPD3 BIT(5) -/* CTSR bits */ -#define CTSR_PONM BIT(8) -#define CTSR_AOUT BIT(7) -#define CTSR_THBGR BIT(5) -#define CTSR_VMEN BIT(4) -#define CTSR_VMST BIT(1) -#define CTSR_THSST BIT(0) - /* THCTR bits */ #define THCTR_PONM BIT(6) #define THCTR_THSST BIT(0) @@ -88,8 +78,6 @@ struct rcar_gen3_thermal_priv { struct rcar_gen3_thermal_tsc *tscs[TSC_MAX_NUM]; struct thermal_zone_device_ops ops; unsigned int num_tscs; - void (*thermal_init)(struct rcar_gen3_thermal_priv *priv, - struct rcar_gen3_thermal_tsc *tsc); int ptat[3]; }; @@ -248,11 +236,6 @@ static irqreturn_t rcar_gen3_thermal_irq(int irq, void *data) return IRQ_HANDLED; } -static const struct soc_device_attribute r8a7795es1[] = { - { .soc_id = "r8a7795", .revision = "ES1.*" }, - { /* sentinel */ } -}; - static bool rcar_gen3_thermal_read_fuses(struct rcar_gen3_thermal_priv *priv) { unsigned int i; @@ -311,34 +294,6 @@ static bool rcar_gen3_thermal_read_fuses(struct rcar_gen3_thermal_priv *priv) return true; } -static void rcar_gen3_thermal_init_r8a7795es1(struct rcar_gen3_thermal_priv *priv, - struct rcar_gen3_thermal_tsc *tsc) -{ - rcar_gen3_thermal_write(tsc, REG_GEN3_CTSR, CTSR_THBGR); - rcar_gen3_thermal_write(tsc, REG_GEN3_CTSR, 0x0); - - usleep_range(1000, 2000); - - rcar_gen3_thermal_write(tsc, REG_GEN3_CTSR, CTSR_PONM); - - rcar_gen3_thermal_write(tsc, REG_GEN3_IRQCTL, 0x3F); - rcar_gen3_thermal_write(tsc, REG_GEN3_IRQMSK, 0); - if (priv->ops.set_trips) - rcar_gen3_thermal_write(tsc, REG_GEN3_IRQEN, - IRQ_TEMPD1 | IRQ_TEMP2); - - rcar_gen3_thermal_write(tsc, REG_GEN3_CTSR, - CTSR_PONM | CTSR_AOUT | CTSR_THBGR | CTSR_VMEN); - - usleep_range(100, 200); - - rcar_gen3_thermal_write(tsc, REG_GEN3_CTSR, - CTSR_PONM | CTSR_AOUT | CTSR_THBGR | CTSR_VMEN | - CTSR_VMST | CTSR_THSST); - - usleep_range(1000, 2000); -} - static void rcar_gen3_thermal_init(struct rcar_gen3_thermal_priv *priv, struct rcar_gen3_thermal_tsc *tsc) { @@ -474,9 +429,6 @@ static int rcar_gen3_thermal_probe(struct platform_device *pdev) return -ENOMEM; priv->ops = rcar_gen3_tz_of_ops; - priv->thermal_init = rcar_gen3_thermal_init; - if (soc_device_match(r8a7795es1)) - priv->thermal_init = rcar_gen3_thermal_init_r8a7795es1; platform_set_drvdata(pdev, priv); @@ -516,7 +468,7 @@ static int rcar_gen3_thermal_probe(struct platform_device *pdev) for (i = 0; i < priv->num_tscs; i++) { struct rcar_gen3_thermal_tsc *tsc = priv->tscs[i]; - priv->thermal_init(priv, tsc); + rcar_gen3_thermal_init(priv, tsc); rcar_gen3_thermal_calc_coefs(priv, tsc, *ths_tj_1); zone = devm_thermal_of_zone_register(dev, i, tsc, &priv->ops); @@ -564,7 +516,7 @@ static int __maybe_unused rcar_gen3_thermal_resume(struct device *dev) for (i = 0; i < priv->num_tscs; i++) { struct rcar_gen3_thermal_tsc *tsc = priv->tscs[i]; - priv->thermal_init(priv, tsc); + rcar_gen3_thermal_init(priv, tsc); } return 0; From patchwork Tue Mar 7 16:30:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 65717 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2541235wrd; Tue, 7 Mar 2023 09:00:11 -0800 (PST) X-Google-Smtp-Source: AK7set+zmlFw8QIWgYOYqEd2Ece5CLPcjgGvnm3z+QbdqXrYq/R2kpnpOIOqqANADZfnT+R596sS X-Received: by 2002:a05:6402:5145:b0:4ae:eab6:9fac with SMTP id n5-20020a056402514500b004aeeab69facmr14584613edd.32.1678208411650; Tue, 07 Mar 2023 09:00:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678208411; cv=none; d=google.com; s=arc-20160816; b=rK2yX2nXWiO0MVsBXK7PrWNAWgIJ2miTKPZxB2jgL89rZrnV42DLRfhxCe3N4JcdrM 3l6xRXUfIyrvO9pf5UA19UGFd+4zS48/fqapMqMsK4CqXgugiI564aPJ+h0eZfZHmuew Zh1LHuj1XSwDMkVFWTYYe3BXeGoG+9QI3tu17oZFqeuKup73BZJRmAiTtqp7o6HY0b7E b/aICiGsbjjHnn+KhtMc7WgKI2oN/u5zGWfDzR8MRkcTaEq2a5j3zqLP2pIw+8rLuIVl c1nuZK+JDDzx+BEOaqBUXzLKqXE7nQuV0aNiFnYc91iyIPShNeenrZkfrVV7CPLchSqL a1qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Zv+i7P4YcDVSywTr4wseRShc/6ExM6dLESnNWqFigQg=; b=WNZ02LOrnmprUWC2aksNV0GSnTx/C+cbP5j/VqnNsgq+jheuXOr5e9W2xpUzkaX90n bG3nNbEQMxTMLYNpJR2hvotdZlJW2yATZL/oe55dv6HrrsmYKMXCaKQ8rycjHZmHNCqt ie2CCZfruDeuI2OqIK/Pvyxe5LXswbYvUAWL/VqTc71L6tNBIwvpngOwxMoKmXCUphkX 0W87ntYrAZuiBea93soG6CLPO+3aJ5YkpiY6EkxZpMUBapVc65nClxGeaS2zHUjUcsW0 vN0FMGSve3Pleohn5YT0f9iAY/cxoUdNRSDUDvmitQseDOAysfAXNN5l/zTNaKiz01yz ou8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail (test mode) header.i=@sang-engineering.com header.s=k1 header.b=d8U3ZjUd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r5-20020aa7c145000000b004bfaddc283esi2829397edp.144.2023.03.07.08.59.46; Tue, 07 Mar 2023 09:00:11 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail (test mode) header.i=@sang-engineering.com header.s=k1 header.b=d8U3ZjUd; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231139AbjCGQcD (ORCPT + 99 others); Tue, 7 Mar 2023 11:32:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229906AbjCGQbd (ORCPT ); Tue, 7 Mar 2023 11:31:33 -0500 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3E6F867F5 for ; Tue, 7 Mar 2023 08:31:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=k1; bh=GpZGDUwUsE0ds3 5pzFLaSmr9UzqZGY5gVr/k+4eStUI=; b=d8U3ZjUdS2Nw+DeBbeC04ON8UrepdH YdMmmpWc+wEMSdxPTDCRtV/+gV+d1IXrtqFEIAHk2TsR2FKaPX06lQCnuoA9QmwN bPbSwtm1Ll0zjXq8c/bm0K94IvQWEiN2IE8Zvw6XnCH0cfdDejo3Y78WIC/YRyNW +SvV5BjoxHBik= Received: (qmail 752076 invoked from network); 7 Mar 2023 17:31:06 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 7 Mar 2023 17:31:06 +0100 X-UD-Smtp-Session: l3s3148p1@b+848FH2dI0gAQnoAFQ+AGEn9EY5VOxJ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Wolfram Sang , Laurent Pinchart , Geert Uytterhoeven , Sergey Shtylyov , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 07/11] ravb: remove R-Car H3 ES1.* handling Date: Tue, 7 Mar 2023 17:30:35 +0100 Message-Id: <20230307163041.3815-8-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> References: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_NONE, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759729063260783391?= X-GMAIL-MSGID: =?utf-8?q?1759729063260783391?= R-Car H3 ES1.* was only available to an internal development group and needed a lot of quirks and workarounds. These become a maintenance burden now, so our development group decided to remove upstream support and disable booting for this SoC. Public users only have ES2 onwards. Reviewed-by: Laurent Pinchart Reviewed-by: Geert Uytterhoeven Signed-off-by: Wolfram Sang Signed-off-by: Simon Horman Reviewed-by: Sergey Shtylyov --- Please apply individually per subsystem. There are no dependencies and the SoC doesn't boot anymore since v6.3-rc1. drivers/net/ethernet/renesas/ravb_main.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index 0f54849a3823..b81f0d8dfda8 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c @@ -28,7 +28,6 @@ #include #include #include -#include #include #include @@ -1390,11 +1389,6 @@ static void ravb_adjust_link(struct net_device *ndev) phy_print_status(phydev); } -static const struct soc_device_attribute r8a7795es10[] = { - { .soc_id = "r8a7795", .revision = "ES1.0", }, - { /* sentinel */ } -}; - /* PHY init function */ static int ravb_phy_init(struct net_device *ndev) { @@ -1434,15 +1428,6 @@ static int ravb_phy_init(struct net_device *ndev) goto err_deregister_fixed_link; } - /* This driver only support 10/100Mbit speeds on R-Car H3 ES1.0 - * at this time. - */ - if (soc_device_match(r8a7795es10)) { - phy_set_max_speed(phydev, SPEED_100); - - netdev_info(ndev, "limited PHY to 100Mbit/s\n"); - } - if (!info->half_duplex) { /* 10BASE, Pause and Asym Pause is not supported */ phy_remove_link_mode(phydev, ETHTOOL_LINK_MODE_10baseT_Half_BIT); From patchwork Tue Mar 7 16:30:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 65704 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2538256wrd; Tue, 7 Mar 2023 08:53:54 -0800 (PST) X-Google-Smtp-Source: AK7set/Bbk1LZw8XT3Vy9ySchvYdZfLTWIE+zXp2Xk7/NJjB0XDAGkuvo1W/nPpu5T0UXI7udFjZ X-Received: by 2002:a17:906:948:b0:87f:5d0a:c610 with SMTP id j8-20020a170906094800b0087f5d0ac610mr15089302ejd.32.1678208034164; Tue, 07 Mar 2023 08:53:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678208034; cv=none; d=google.com; s=arc-20160816; b=YvPXpi/c49F/ZzWtDJeM+/3RRPU+GKBp5hivPFBI2sdtWfc1WiMxVl/JYmt7zSUBLB rTLNtaxKuuIued4jyG20ZVcKaJTsgkoWUIALiSLAnd9FE90HIH3f254wpH2l7DvYfj3f a7vt81GxTEhDxkR7+zR6Oj4z1GQfHIaLzU7ozSxGJK5mh+W/hbCXUPnZUyXGfcFqUQgA h0h8t7e0z/UO1zP9Y0P1eDv0H2DipfG45cY9heHXTCEHrxSbe3Kaa4tQma/Erdc8El68 6hlNnYg0ULxCQKpgDEHVGN0vUvzgzOM39vzIIqiiRNw+7dCGv3Xng0KGRbLglXeBFagf nMeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=3H0Ut1XfN/gExysBMdzFUKV7F3RP3gbQAXdjKCzmwgc=; b=ClsHRrYXFNCwVqtriMV9maEtIXcNjDfQZgeqFq/cFQRbIuuxtDu8sgcL/Wm5Kcdm8J RLegMUAo9dn+AYTwKrtf3Ur3vz2n7nNhvloCe2jQNPODSW44SXeis5/3eo0c9M7eKkgI 7wznB8g+cOk0O7N6wQZHpwRGg7ne6G6bUBXfAYTc7AW6IcaN3xwiRZ1EN3e8a01m2C0Z Wc/mCdU+kyIwCrQ3ywgqVtJmFWWeL7rHKSmgAmZljSqWk9vYOYO9aBPblgBMMvx9MX+G qVUAntadcoC3R6NuWwFWZ6XuqgxBXW5U7rq+FfPwNEviTz/bbFfrKfnBja8NccsDYveW VmMQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail (test mode) header.i=@sang-engineering.com header.s=k1 header.b=bXVpGEvc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ay25-20020a056402203900b004bfcd531e73si1161169edb.291.2023.03.07.08.53.30; Tue, 07 Mar 2023 08:53:54 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail (test mode) header.i=@sang-engineering.com header.s=k1 header.b=bXVpGEvc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231153AbjCGQcG (ORCPT + 99 others); Tue, 7 Mar 2023 11:32:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39682 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230172AbjCGQbe (ORCPT ); Tue, 7 Mar 2023 11:31:34 -0500 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C8A22867FF for ; Tue, 7 Mar 2023 08:31:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=k1; bh=/K+5ZHq3qxSf+u vMlu2Mbiy40EGhHX9fwgqPWBWOR8I=; b=bXVpGEvcPTMHGGn12V34q06RQqS/TJ MSkDKcNVIhNZGp7VZjENZqlGZICMjLAgfjIKNchkI9GePBemruUWSrM+vofyci+n b3iCFgHU4k7Vor6ZOMq4EWTXI6xjoJImlsPOWXkNpZqK/w6J6an/8HkMAIvd3pwc NZDsuJLSKxJho= Received: (qmail 752100 invoked from network); 7 Mar 2023 17:31:07 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 7 Mar 2023 17:31:07 +0100 X-UD-Smtp-Session: l3s3148p1@lJ5E8FH2go0gAQnoAFQ+AGEn9EY5VOxJ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Wolfram Sang , Laurent Pinchart , Geert Uytterhoeven , Ulf Hansson , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 08/11] mmc: renesas_sdhi: remove R-Car H3 ES1.* handling Date: Tue, 7 Mar 2023 17:30:36 +0100 Message-Id: <20230307163041.3815-9-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> References: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_NONE, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759728667373664949?= X-GMAIL-MSGID: =?utf-8?q?1759728667373664949?= R-Car H3 ES1.* was only available to an internal development group and needed a lot of quirks and workarounds. These become a maintenance burden now, so our development group decided to remove upstream support and disable booting for this SoC. Public users only have ES2 onwards. Reviewed-by: Laurent Pinchart Reviewed-by: Geert Uytterhoeven Signed-off-by: Wolfram Sang --- Please apply individually per subsystem. There are no dependencies and the SoC doesn't boot anymore since v6.3-rc1. drivers/mmc/host/renesas_sdhi_internal_dmac.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/mmc/host/renesas_sdhi_internal_dmac.c b/drivers/mmc/host/renesas_sdhi_internal_dmac.c index f38003f6b1ca..9ab813903b2c 100644 --- a/drivers/mmc/host/renesas_sdhi_internal_dmac.c +++ b/drivers/mmc/host/renesas_sdhi_internal_dmac.c @@ -72,11 +72,10 @@ enum renesas_sdhi_dma_cookie { static unsigned long global_flags; /* - * Workaround for avoiding to use RX DMAC by multiple channels. - * On R-Car H3 ES1.* and M3-W ES1.0, when multiple SDHI channels use - * RX DMAC simultaneously, sometimes hundreds of bytes data are not - * stored into the system memory even if the DMAC interrupt happened. - * So, this driver then uses one RX DMAC channel only. + * Workaround for avoiding to use RX DMAC by multiple channels. On R-Car M3-W + * ES1.0, when multiple SDHI channels use RX DMAC simultaneously, sometimes + * hundreds of data bytes are not stored into the system memory even if the + * DMAC interrupt happened. So, this driver then uses one RX DMAC channel only. */ #define SDHI_INTERNAL_DMAC_RX_IN_USE 0 @@ -222,7 +221,6 @@ static const struct renesas_sdhi_quirks sdhi_quirks_r9a09g011 = { */ static const struct soc_device_attribute sdhi_quirks_match[] = { { .soc_id = "r8a774a1", .revision = "ES1.[012]", .data = &sdhi_quirks_4tap_nohs400 }, - { .soc_id = "r8a7795", .revision = "ES1.*", .data = &sdhi_quirks_4tap_nohs400_one_rx }, { .soc_id = "r8a7795", .revision = "ES2.0", .data = &sdhi_quirks_4tap }, { .soc_id = "r8a7796", .revision = "ES1.0", .data = &sdhi_quirks_4tap_nohs400_one_rx }, { .soc_id = "r8a7796", .revision = "ES1.[12]", .data = &sdhi_quirks_4tap_nohs400 }, From patchwork Tue Mar 7 16:30:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 65713 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2540892wrd; Tue, 7 Mar 2023 08:59:35 -0800 (PST) X-Google-Smtp-Source: AK7set8ZjiGlWyDBBvQ07pUjQrQZ9g7UmIWJrb7wx4vpS41k8NykTBLbP03Myd/xZhWCIJRTdccF X-Received: by 2002:a17:907:7244:b0:8b1:78b6:bbd7 with SMTP id ds4-20020a170907724400b008b178b6bbd7mr19201511ejc.10.1678208375189; Tue, 07 Mar 2023 08:59:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678208375; cv=none; d=google.com; s=arc-20160816; b=SJ9YKiD34PE36rK+4g7qAK/L5YW2J9tMwM8vLX8qGRjnC6qbrjHyYdmlzFdhwiEiQy 7fkqfZFm8NpBItNa0Jmuy+FFXhflfMySBSoNrJPnpbOVdHssqfZSjvQZuh0tj7R3oWV6 PcDwM4WI4UbidkrPwhNy12XDc3h2r0e7cUyyPk5l2XNYIVWCqOF+RLMku+sxSjyHrIzf J6MWBe1AcoPruN0LYI24FLt0koVwWb9jVbYg7qamf3UBiTJgaI4pIOAUr2aPG7wk5JUp l0hketRjDsHkePUAVV8TNiQJO+dDvTgK3sjD3wcMv2baMy7CM3eKKiz0QVxV3+u1HknO mzyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=G8cm8h+umv95t+zOdLgS3z8YUCXLbIwS9uvCAKHjSWk=; b=n6kaouhoWP3PFMYlHC5N4Ry7t18VnCMv8wkGtC2ZzdZxeUIFB9tp/6pIoyFOa1ejDr RBh5OaNTpYVQSRe2DIjMNBozf1akqwFmFTtnJp1J0qyHXhRFPCvQDMD7JT7HbIIKQo+B XknpoS75L573f/HzUm7c7oShaREiH55SP0raMB5a4bsx6FQ4Q+dbo9B/ffbRhwe1Bged NXoDeDxmZ+MhXP6BDjyKI37hQ8BSfUjnnujWRoqGwhv/R2vz13KP8+U2KvzQn2+BCMsu +Ta0DMNnpHjd1iHRrF/FjXXRoTEGLDaSyU4hoQGIw3L11rpezkvRhv0B+7Icb7La8qoS crig== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail (test mode) header.i=@sang-engineering.com header.s=k1 header.b=OtSAgJqk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e25-20020a170906375900b008dffd95e783si698748ejc.568.2023.03.07.08.59.12; Tue, 07 Mar 2023 08:59:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail (test mode) header.i=@sang-engineering.com header.s=k1 header.b=OtSAgJqk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230458AbjCGQcR (ORCPT + 99 others); Tue, 7 Mar 2023 11:32:17 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39624 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230199AbjCGQbf (ORCPT ); Tue, 7 Mar 2023 11:31:35 -0500 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BA32B85B37 for ; Tue, 7 Mar 2023 08:31:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=k1; bh=tgR8Ib7gK0xta9 gDLehMBy5oVmognDSKS3+BEb2nqRg=; b=OtSAgJqkwCb6Mk0PQ1uS5dTxmbrriB z12jHlsAq1QaKoaNz3LyOZvaAsGJNQLOxSB+vDtlbV++blTyISQXyUCNW180CXnG LGv5vGJr+bfv0IklUrgYAUh0R4z/LAkOdX2gqKzJ6GGhMXLYSk86uRJHWUFhPfMh /zVCxFrB7G4aA= Received: (qmail 752141 invoked from network); 7 Mar 2023 17:31:08 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 7 Mar 2023 17:31:08 +0100 X-UD-Smtp-Session: l3s3148p1@VDhQ8FH2hI0gAQnoAFQ+AGEn9EY5VOxJ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Wolfram Sang , Geert Uytterhoeven , Mathias Nyman , Greg Kroah-Hartman , Yoshihiro Shimoda , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 09/11] usb: host: xhci-rcar: remove leftover quirk handling Date: Tue, 7 Mar 2023 17:30:37 +0100 Message-Id: <20230307163041.3815-10-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> References: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_NONE, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759729024869742884?= X-GMAIL-MSGID: =?utf-8?q?1759729024869742884?= Loading V3 firmware does not need a quirk anymore, remove the leftover code. Fixes: ed8603e11124 ("usb: host: xhci-rcar: Simplify getting the firmware name for R-Car Gen3") Reviewed-by: Geert Uytterhoeven Signed-off-by: Wolfram Sang --- Please apply individually per subsystem. This is in preparation for R-Car H3 ES1 removal. There are no dependencies. drivers/usb/host/xhci-rcar.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c index 7f18509a1d39..567b096a24e9 100644 --- a/drivers/usb/host/xhci-rcar.c +++ b/drivers/usb/host/xhci-rcar.c @@ -80,7 +80,6 @@ MODULE_FIRMWARE(XHCI_RCAR_FIRMWARE_NAME_V3); /* For soc_device_attribute */ #define RCAR_XHCI_FIRMWARE_V2 BIT(0) /* FIRMWARE V2 */ -#define RCAR_XHCI_FIRMWARE_V3 BIT(1) /* FIRMWARE V3 */ static const struct soc_device_attribute rcar_quirks_match[] = { { @@ -152,8 +151,6 @@ static int xhci_rcar_download_firmware(struct usb_hcd *hcd) if (quirks & RCAR_XHCI_FIRMWARE_V2) firmware_name = XHCI_RCAR_FIRMWARE_NAME_V2; - else if (quirks & RCAR_XHCI_FIRMWARE_V3) - firmware_name = XHCI_RCAR_FIRMWARE_NAME_V3; else firmware_name = priv->firmware_name; From patchwork Tue Mar 7 16:30:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 65716 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2541165wrd; Tue, 7 Mar 2023 09:00:05 -0800 (PST) X-Google-Smtp-Source: AK7set8Ch9rKJD0DNH9FB+Mk88Usn2esfnf06S27ooF2kaLPWuLZdNuQy14H1rX0IXNkJZgo3A5t X-Received: by 2002:a17:906:cccf:b0:870:94e:13f9 with SMTP id ot15-20020a170906cccf00b00870094e13f9mr14614262ejb.0.1678208405246; Tue, 07 Mar 2023 09:00:05 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678208405; cv=none; d=google.com; s=arc-20160816; b=ujrF4RYLSjFgMvAjpLMRsU7osS9gYjjc+3bwRBruCzuYEZIbMac4kXnXOqH1PXn/Pk BYZJsrd8KNqGijf7Fr+Z36d34vKhQ9B1ktMLKO2OErBYx12zUQ7eOaqYd83jTKibNy1V glVknPVQCVv+8l01f9ZTSxNKbEqVSiQPhaQm2WQs+QHUq4Sl3xaFrHeafU9YdHpccgmQ nVtcH16V4UP8hhR0qJwP8tXIrZFnGv+8Xf0KeWjGy0Ujl2ry1DbiK+8NGDLFokvrTtqp hwY3LnXS2qpchxUyZP5WiMQHJImLqkWbwvn/Qw48IFV7zSFuwPca02i9Hpwn3gmTNG14 8zLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=aMCBLUd5LymxuJmrOWMsjdhVHO3UibsdT//txEQ7JQM=; b=GGaq66IVE1ORsAW9TvwM3iP4jhF4SdVezygxfGa2bR9dM2VUOe0syG8cgVofmXu/sI CXi6cR2ye1FiZSgYCu2fYDCpiiqX2ATKs5EvZSLhqMzipFLjDFD+ZW5VJooAR8PM2COR CfFbri22CGh1skoelnLbZ9caBsyjMnU6tyAYwILiT8WdP1M6cwzppCiM4fyW7nY1KCmp Rvc9wP501Xq6u2n006eLzkinkqtgKsIpPpLUuuyPMFkH6wDxTMwxNE1LLxRywifcNJim MVSGDBf2VPY9ccmJbJ8/7PQ3PQhIPV1/npQPiTgjD6zsUiKoMTO95cxiEM/P5mko9BLo Xptg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail (test mode) header.i=@sang-engineering.com header.s=k1 header.b=3lkWw1PH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id jp23-20020a170906f75700b008e386ef4d06si11955906ejb.921.2023.03.07.08.59.41; Tue, 07 Mar 2023 09:00:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail (test mode) header.i=@sang-engineering.com header.s=k1 header.b=3lkWw1PH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231265AbjCGQcM (ORCPT + 99 others); Tue, 7 Mar 2023 11:32:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39622 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229621AbjCGQbf (ORCPT ); Tue, 7 Mar 2023 11:31:35 -0500 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F13E687DB7 for ; Tue, 7 Mar 2023 08:31:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=k1; bh=juPKvg3mXsPI+d KK+OfMfbvis/2IhqLMDrHF/YQ7PsQ=; b=3lkWw1PH2ESzdu3ChWiC3w9aDSEBH7 pQir+nKMoHWKsaU1AarnaMTWjb3cU52GhXObeKKQevM/KoLNJhAoUdBBieIvEesl 33+0VqNGSJz7gJ+IsWZqbiJs+XsMzHzjhdtUm47IebC9fvhS0cXn+arvU2qdUuie MJJYshY1vj544= Received: (qmail 752176 invoked from network); 7 Mar 2023 17:31:09 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 7 Mar 2023 17:31:09 +0100 X-UD-Smtp-Session: l3s3148p1@QeZb8FH2iI0gAQnoAFQ+AGEn9EY5VOxJ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Wolfram Sang , Laurent Pinchart , Geert Uytterhoeven , Mathias Nyman , Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 10/11] usb: host: xhci-rcar: remove R-Car H3 ES1.* handling Date: Tue, 7 Mar 2023 17:30:38 +0100 Message-Id: <20230307163041.3815-11-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> References: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_NONE, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759729056629630460?= X-GMAIL-MSGID: =?utf-8?q?1759729056629630460?= R-Car H3 ES1.* was only available to an internal development group and needed a lot of quirks and workarounds. These become a maintenance burden now, so our development group decided to remove upstream support and disable booting for this SoC. Public users only have ES2 onwards. Reviewed-by: Laurent Pinchart Reviewed-by: Geert Uytterhoeven Signed-off-by: Wolfram Sang --- Please apply individually per subsystem. There are no dependencies and the SoC doesn't boot anymore since v6.3-rc1. drivers/usb/host/xhci-rcar.c | 31 ++----------------------------- 1 file changed, 2 insertions(+), 29 deletions(-) diff --git a/drivers/usb/host/xhci-rcar.c b/drivers/usb/host/xhci-rcar.c index 567b096a24e9..c4925f8d6b06 100644 --- a/drivers/usb/host/xhci-rcar.c +++ b/drivers/usb/host/xhci-rcar.c @@ -12,26 +12,22 @@ #include #include #include -#include #include "xhci.h" #include "xhci-plat.h" #include "xhci-rzv2m.h" #define XHCI_RCAR_FIRMWARE_NAME_V1 "r8a779x_usb3_v1.dlmem" -#define XHCI_RCAR_FIRMWARE_NAME_V2 "r8a779x_usb3_v2.dlmem" #define XHCI_RCAR_FIRMWARE_NAME_V3 "r8a779x_usb3_v3.dlmem" /* -* - The V3 firmware is for almost all R-Car Gen3 (except r8a7795 ES1.x) -* - The V2 firmware is for r8a7795 ES1.x. +* - The V3 firmware is for all R-Car Gen3 * - The V2 firmware is possible to use on R-Car Gen2. However, the V2 causes * performance degradation. So, this driver continues to use the V1 if R-Car * Gen2. * - The V1 firmware is impossible to use on R-Car Gen3. */ MODULE_FIRMWARE(XHCI_RCAR_FIRMWARE_NAME_V1); -MODULE_FIRMWARE(XHCI_RCAR_FIRMWARE_NAME_V2); MODULE_FIRMWARE(XHCI_RCAR_FIRMWARE_NAME_V3); /*** Register Offset ***/ @@ -78,17 +74,6 @@ MODULE_FIRMWARE(XHCI_RCAR_FIRMWARE_NAME_V3); #define RCAR_USB3_RX_POL_VAL BIT(21) #define RCAR_USB3_TX_POL_VAL BIT(4) -/* For soc_device_attribute */ -#define RCAR_XHCI_FIRMWARE_V2 BIT(0) /* FIRMWARE V2 */ - -static const struct soc_device_attribute rcar_quirks_match[] = { - { - .soc_id = "r8a7795", .revision = "ES1.*", - .data = (void *)RCAR_XHCI_FIRMWARE_V2, - }, - { /* sentinel */ } -}; - static void xhci_rcar_start_gen2(struct usb_hcd *hcd) { /* LCLK Select */ @@ -134,9 +119,6 @@ static int xhci_rcar_download_firmware(struct usb_hcd *hcd) const struct firmware *fw; int retval, index, j; u32 data, val, temp; - u32 quirks = 0; - const struct soc_device_attribute *attr; - const char *firmware_name; /* * According to the datasheet, "Upon the completion of FW Download, @@ -145,17 +127,8 @@ static int xhci_rcar_download_firmware(struct usb_hcd *hcd) if (readl(regs + RCAR_USB3_DL_CTRL) & RCAR_USB3_DL_CTRL_FW_SUCCESS) return 0; - attr = soc_device_match(rcar_quirks_match); - if (attr) - quirks = (uintptr_t)attr->data; - - if (quirks & RCAR_XHCI_FIRMWARE_V2) - firmware_name = XHCI_RCAR_FIRMWARE_NAME_V2; - else - firmware_name = priv->firmware_name; - /* request R-Car USB3.0 firmware */ - retval = request_firmware(&fw, firmware_name, dev); + retval = request_firmware(&fw, priv->firmware_name, dev); if (retval) return retval; From patchwork Tue Mar 7 16:30:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfram Sang X-Patchwork-Id: 65706 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp2540006wrd; Tue, 7 Mar 2023 08:57:39 -0800 (PST) X-Google-Smtp-Source: AK7set+te0D62zgHr/bomvXzpskvKU5f3q/NgALTFsKJ8QQp2HUJhw3wL8uzXBOmHWYeTcMdSeuY X-Received: by 2002:a17:906:bfc9:b0:88d:ba89:1837 with SMTP id us9-20020a170906bfc900b0088dba891837mr17027680ejb.8.1678208258906; Tue, 07 Mar 2023 08:57:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678208258; cv=none; d=google.com; s=arc-20160816; b=VVvKF0k16o6J2tFCOuN9/pFjaz89Kpmrs2utOHttMuC/CC1g198Ki9YcMyCNaILVP5 OKq7koVPwMO8qvQ27X//daZ4L+1Dcowbue6sNyRcYBb1JxjAWwn/LjK8QQ+abMWU3y6e ojyjn2n8KvCuNdTjSmy8otXqIpQaCCkmQBgX90ggYED7ZjI7Q5nUGe1zmuSN8ftdCnND oKLlzlqtQavyi2GaaLSFQsOKiN18jHpBM2iAulTuUGyuZgB4JlEFZq6IiCyYyuV5Pse3 1/DPFWj/iqtHov8EpXe4az6f7fLW0vznEBI6VuedYkUrIcLXyTgNh8tX00nSVy7bOF1U h6Og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=zySOyfgktI5WG53EAITHVyVtAjr2n4slIHfkSpQIrAM=; b=mAz5hKxRnj+D7K/2sauSU190xSlRDL+FnL3CpTMafuLhGiJTZZ9q1KFkpcTguvqOn5 ILKw2Etuj5hruY6UwrpdjlQL0vxSZdTgkcoM7AP5JWJXGsYNHkgbjZ8LJ22pWyIhtq3B WxAAC9whgS1znV6ORWIJ4PsGSaccIiedtKQcY7vlkcPJt3cyL7sHw17j0PcwwKEEgGf+ Q7dCWa4CrMYsOWcGZ0BN6bxiDfrJHkUMKktw7sx7nscHec996ga0f8qhfO0DIqvNp5YQ XIQYfxgfUIgFlW6R4q4CRU5FoXJut6tTGLZBL8rK0JDF3S2Yzy03UASY4naefnS9wrnT nM8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail (test mode) header.i=@sang-engineering.com header.s=k1 header.b=lVTYO2h0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g19-20020a1709061e1300b008e0363188ebsi13045994ejj.929.2023.03.07.08.57.13; Tue, 07 Mar 2023 08:57:38 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=fail (test mode) header.i=@sang-engineering.com header.s=k1 header.b=lVTYO2h0; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230409AbjCGQcZ (ORCPT + 99 others); Tue, 7 Mar 2023 11:32:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40522 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230367AbjCGQbh (ORCPT ); Tue, 7 Mar 2023 11:31:37 -0500 Received: from mail.zeus03.de (www.zeus03.de [194.117.254.33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1869B8ABFB for ; Tue, 7 Mar 2023 08:31:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=simple; d=sang-engineering.com; h= from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=k1; bh=FoqjTA8Za4V7Be 7RYCx6I7pfuapKZ/gfbeqrJ+oZq7U=; b=lVTYO2h09AuGHmx0lS5IH2B2gRy/0H EZD0zooyaK8UpeBrlro8t4Tzzbzcz4t9pOD+XRaWvoigrKiZgaGBHxlTPDr7IlC8 VzNsnewjdkjffMs9YN5AVi8287uiSh8D+GZn/VX/mx8ejokS/1pNbbDjHEUBQLKl jwU1HcVVWmawE= Received: (qmail 752222 invoked from network); 7 Mar 2023 17:31:09 +0100 Received: by mail.zeus03.de with ESMTPSA (TLS_AES_256_GCM_SHA384 encrypted, authenticated); 7 Mar 2023 17:31:09 +0100 X-UD-Smtp-Session: l3s3148p1@ggVo8FH2io0gAQnoAFQ+AGEn9EY5VOxJ From: Wolfram Sang To: linux-renesas-soc@vger.kernel.org Cc: Wolfram Sang , Laurent Pinchart , Geert Uytterhoeven , Greg Kroah-Hartman , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 11/11] usb: gadget: udc: renesas_usb3: remove R-Car H3 ES1.* handling Date: Tue, 7 Mar 2023 17:30:39 +0100 Message-Id: <20230307163041.3815-12-wsa+renesas@sang-engineering.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> References: <20230307163041.3815-1-wsa+renesas@sang-engineering.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FORGED_SPF_HELO, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_NONE, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759728903040183893?= X-GMAIL-MSGID: =?utf-8?q?1759728903040183893?= R-Car H3 ES1.* was only available to an internal development group and needed a lot of quirks and workarounds. These become a maintenance burden now, so our development group decided to remove upstream support and disable booting for this SoC. Public users only have ES2 onwards. Reviewed-by: Laurent Pinchart Reviewed-by: Geert Uytterhoeven Signed-off-by: Wolfram Sang --- Please apply individually per subsystem. There are no dependencies and the SoC doesn't boot anymore since v6.3-rc1. drivers/usb/gadget/udc/renesas_usb3.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c index bee6bceafc4f..f2ac6447b748 100644 --- a/drivers/usb/gadget/udc/renesas_usb3.c +++ b/drivers/usb/gadget/udc/renesas_usb3.c @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -2781,13 +2780,6 @@ static void renesas_usb3_init_ram(struct renesas_usb3 *usb3, struct device *dev, } } -static const struct renesas_usb3_priv renesas_usb3_priv_r8a7795_es1 = { - .ramsize_per_ramif = SZ_16K, - .num_ramif = 2, - .ramsize_per_pipe = SZ_4K, - .workaround_for_vbus = true, -}; - static const struct renesas_usb3_priv renesas_usb3_priv_gen3 = { .ramsize_per_ramif = SZ_16K, .num_ramif = 4, @@ -2829,14 +2821,6 @@ static const struct of_device_id usb3_of_match[] = { }; MODULE_DEVICE_TABLE(of, usb3_of_match); -static const struct soc_device_attribute renesas_usb3_quirks_match[] = { - { - .soc_id = "r8a7795", .revision = "ES1.*", - .data = &renesas_usb3_priv_r8a7795_es1, - }, - { /* sentinel */ } -}; - static const unsigned int renesas_usb3_cable[] = { EXTCON_USB, EXTCON_USB_HOST, @@ -2854,13 +2838,8 @@ static int renesas_usb3_probe(struct platform_device *pdev) struct renesas_usb3 *usb3; int irq, ret; const struct renesas_usb3_priv *priv; - const struct soc_device_attribute *attr; - attr = soc_device_match(renesas_usb3_quirks_match); - if (attr) - priv = attr->data; - else - priv = of_device_get_match_data(&pdev->dev); + priv = of_device_get_match_data(&pdev->dev); irq = platform_get_irq(pdev, 0); if (irq < 0)