| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 14 Sep 2022 22:42:45 +0200
From: Matthias Brugger <matthias.bgg@...il.com>
To: "Jason-JH.Lin" <jason-jh.lin@...iatek.com>,
Chun-Kuang Hu <chunkuang.hu@...nel.org>,
Rob Herring <robh+dt@...nel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@...aro.org>,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@...labora.com>
Cc: CK Hu <ck.hu@...iatek.com>, Rex-BC Chen <rex-bc.chen@...iatek.com>,
Singo Chang <singo.chang@...iatek.com>,
Nancy Lin <nancy.lin@...iatek.com>,
dri-devel@...ts.freedesktop.org,
linux-mediatek@...ts.infradead.org, devicetree@...r.kernel.org,
linux-kernel@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
Project_Global_Chrome_Upstream_Group@...iatek.com
Subject: Re: [PATCH 2/5] soc: mediatek: change compatible name for mt8195
On 14/09/2022 20:23, Jason-JH.Lin wrote:
> In mt8195, vdosys0 and vdosys1 are 2 different function blocks
> for mediatek-drm, so using 2 compatible instead of identifying
> multiple mmsys by io_start.
>
> Fixes: b804923b7ccb ("soc: mediatek: add mtk-mmsys support for mt8195 vdosys0")
> Signed-off-by: Jason-JH.Lin <jason-jh.lin@...iatek.com>
From what I have seen we can just revert the commit. No fixes tag needed, it
does not fix any (runtime) bug.
Regards,
Matthias
> ---
> drivers/soc/mediatek/mtk-mmsys.c | 141 +++++--------------------------
> drivers/soc/mediatek/mtk-mmsys.h | 6 --
> 2 files changed, 21 insertions(+), 126 deletions(-)
>
> diff --git a/drivers/soc/mediatek/mtk-mmsys.c b/drivers/soc/mediatek/mtk-mmsys.c
> index 06d8e83a2cb5..e1c653f3abc0 100644
> --- a/drivers/soc/mediatek/mtk-mmsys.c
> +++ b/drivers/soc/mediatek/mtk-mmsys.c
> @@ -26,61 +26,26 @@ static const struct mtk_mmsys_driver_data mt2701_mmsys_driver_data = {
> .num_routes = ARRAY_SIZE(mmsys_default_routing_table),
> };
>
> -static const struct mtk_mmsys_match_data mt2701_mmsys_match_data = {
> - .num_drv_data = 1,
> - .drv_data = {
> - &mt2701_mmsys_driver_data,
> - },
> -};
> -
> static const struct mtk_mmsys_driver_data mt2712_mmsys_driver_data = {
> .clk_driver = "clk-mt2712-mm",
> .routes = mmsys_default_routing_table,
> .num_routes = ARRAY_SIZE(mmsys_default_routing_table),
> };
>
> -static const struct mtk_mmsys_match_data mt2712_mmsys_match_data = {
> - .num_drv_data = 1,
> - .drv_data = {
> - &mt2712_mmsys_driver_data,
> - },
> -};
> -
> static const struct mtk_mmsys_driver_data mt6779_mmsys_driver_data = {
> .clk_driver = "clk-mt6779-mm",
> };
>
> -static const struct mtk_mmsys_match_data mt6779_mmsys_match_data = {
> - .num_drv_data = 1,
> - .drv_data = {
> - &mt6779_mmsys_driver_data,
> - },
> -};
> -
> static const struct mtk_mmsys_driver_data mt6797_mmsys_driver_data = {
> .clk_driver = "clk-mt6797-mm",
> };
>
> -static const struct mtk_mmsys_match_data mt6797_mmsys_match_data = {
> - .num_drv_data = 1,
> - .drv_data = {
> - &mt6797_mmsys_driver_data,
> - },
> -};
> -
> static const struct mtk_mmsys_driver_data mt8167_mmsys_driver_data = {
> .clk_driver = "clk-mt8167-mm",
> .routes = mt8167_mmsys_routing_table,
> .num_routes = ARRAY_SIZE(mt8167_mmsys_routing_table),
> };
>
> -static const struct mtk_mmsys_match_data mt8167_mmsys_match_data = {
> - .num_drv_data = 1,
> - .drv_data = {
> - &mt8167_mmsys_driver_data,
> - },
> -};
> -
> static const struct mtk_mmsys_driver_data mt8173_mmsys_driver_data = {
> .clk_driver = "clk-mt8173-mm",
> .routes = mmsys_default_routing_table,
> @@ -88,13 +53,6 @@ static const struct mtk_mmsys_driver_data mt8173_mmsys_driver_data = {
> .sw0_rst_offset = MT8183_MMSYS_SW0_RST_B,
> };
>
> -static const struct mtk_mmsys_match_data mt8173_mmsys_match_data = {
> - .num_drv_data = 1,
> - .drv_data = {
> - &mt8173_mmsys_driver_data,
> - },
> -};
> -
> static const struct mtk_mmsys_driver_data mt8183_mmsys_driver_data = {
> .clk_driver = "clk-mt8183-mm",
> .routes = mmsys_mt8183_routing_table,
> @@ -102,13 +60,6 @@ static const struct mtk_mmsys_driver_data mt8183_mmsys_driver_data = {
> .sw0_rst_offset = MT8183_MMSYS_SW0_RST_B,
> };
>
> -static const struct mtk_mmsys_match_data mt8183_mmsys_match_data = {
> - .num_drv_data = 1,
> - .drv_data = {
> - &mt8183_mmsys_driver_data,
> - },
> -};
> -
> static const struct mtk_mmsys_driver_data mt8186_mmsys_driver_data = {
> .clk_driver = "clk-mt8186-mm",
> .routes = mmsys_mt8186_routing_table,
> @@ -116,13 +67,6 @@ static const struct mtk_mmsys_driver_data mt8186_mmsys_driver_data = {
> .sw0_rst_offset = MT8186_MMSYS_SW0_RST_B,
> };
>
> -static const struct mtk_mmsys_match_data mt8186_mmsys_match_data = {
> - .num_drv_data = 1,
> - .drv_data = {
> - &mt8186_mmsys_driver_data,
> - },
> -};
> -
> static const struct mtk_mmsys_driver_data mt8192_mmsys_driver_data = {
> .clk_driver = "clk-mt8192-mm",
> .routes = mmsys_mt8192_routing_table,
> @@ -130,66 +74,29 @@ static const struct mtk_mmsys_driver_data mt8192_mmsys_driver_data = {
> .sw0_rst_offset = MT8186_MMSYS_SW0_RST_B,
> };
>
> -static const struct mtk_mmsys_match_data mt8192_mmsys_match_data = {
> - .num_drv_data = 1,
> - .drv_data = {
> - &mt8192_mmsys_driver_data,
> - },
> -};
> -
> static const struct mtk_mmsys_driver_data mt8195_vdosys0_driver_data = {
> - .io_start = 0x1c01a000,
> .clk_driver = "clk-mt8195-vdo0",
> .routes = mmsys_mt8195_routing_table,
> .num_routes = ARRAY_SIZE(mmsys_mt8195_routing_table),
> };
>
> static const struct mtk_mmsys_driver_data mt8195_vdosys1_driver_data = {
> - .io_start = 0x1c100000,
> .clk_driver = "clk-mt8195-vdo1",
> };
>
> -static const struct mtk_mmsys_match_data mt8195_mmsys_match_data = {
> - .num_drv_data = 2,
> - .drv_data = {
> - &mt8195_vdosys0_driver_data,
> - &mt8195_vdosys1_driver_data,
> - },
> -};
> -
> static const struct mtk_mmsys_driver_data mt8365_mmsys_driver_data = {
> .clk_driver = "clk-mt8365-mm",
> .routes = mt8365_mmsys_routing_table,
> .num_routes = ARRAY_SIZE(mt8365_mmsys_routing_table),
> };
>
> -static const struct mtk_mmsys_match_data mt8365_mmsys_match_data = {
> - .num_drv_data = 1,
> - .drv_data = {
> - &mt8365_mmsys_driver_data,
> - },
> -};
> -
> struct mtk_mmsys {
> void __iomem *regs;
> const struct mtk_mmsys_driver_data *data;
> spinlock_t lock; /* protects mmsys_sw_rst_b reg */
> struct reset_controller_dev rcdev;
> - phys_addr_t io_start;
> };
>
> -static int mtk_mmsys_find_match_drvdata(struct mtk_mmsys *mmsys,
> - const struct mtk_mmsys_match_data *match)
> -{
> - int i;
> -
> - for (i = 0; i < match->num_drv_data; i++)
> - if (mmsys->io_start == match->drv_data[i]->io_start)
> - return i;
> -
> - return -EINVAL;
> -}
> -
> void mtk_mmsys_ddp_connect(struct device *dev,
> enum mtk_ddp_comp_id cur,
> enum mtk_ddp_comp_id next)
> @@ -284,7 +191,6 @@ static int mtk_mmsys_probe(struct platform_device *pdev)
> struct device *dev = &pdev->dev;
> struct platform_device *clks;
> struct platform_device *drm;
> - const struct mtk_mmsys_match_data *match_data;
> struct mtk_mmsys *mmsys;
> struct resource *res;
> int ret;
> @@ -317,20 +223,11 @@ static int mtk_mmsys_probe(struct platform_device *pdev)
> dev_err(dev, "Couldn't get mmsys resource\n");
> return -EINVAL;
> }
> - mmsys->io_start = res->start;
> -
> - match_data = of_device_get_match_data(dev);
> - if (match_data->num_drv_data > 1) {
> - /* This SoC has multiple mmsys channels */
> - ret = mtk_mmsys_find_match_drvdata(mmsys, match_data);
> - if (ret < 0) {
> - dev_err(dev, "Couldn't get match driver data\n");
> - return ret;
> - }
> - mmsys->data = match_data->drv_data[ret];
> - } else {
> - dev_dbg(dev, "Using single mmsys channel\n");
> - mmsys->data = match_data->drv_data[0];
> +
> + mmsys->data = of_device_get_match_data(&pdev->dev);
> + if (!mmsys->data) {
> + dev_err(dev, "Couldn't get match driver data\n");
> + return -EINVAL;
> }
>
> platform_set_drvdata(pdev, mmsys);
> @@ -353,47 +250,51 @@ static int mtk_mmsys_probe(struct platform_device *pdev)
> static const struct of_device_id of_match_mtk_mmsys[] = {
> {
> .compatible = "mediatek,mt2701-mmsys",
> - .data = &mt2701_mmsys_match_data,
> + .data = &mt2701_mmsys_driver_data,
> },
> {
> .compatible = "mediatek,mt2712-mmsys",
> - .data = &mt2712_mmsys_match_data,
> + .data = &mt2712_mmsys_driver_data,
> },
> {
> .compatible = "mediatek,mt6779-mmsys",
> - .data = &mt6779_mmsys_match_data,
> + .data = &mt6779_mmsys_driver_data,
> },
> {
> .compatible = "mediatek,mt6797-mmsys",
> - .data = &mt6797_mmsys_match_data,
> + .data = &mt6797_mmsys_driver_data,
> },
> {
> .compatible = "mediatek,mt8167-mmsys",
> - .data = &mt8167_mmsys_match_data,
> + .data = &mt8167_mmsys_driver_data,
> },
> {
> .compatible = "mediatek,mt8173-mmsys",
> - .data = &mt8173_mmsys_match_data,
> + .data = &mt8173_mmsys_driver_data,
> },
> {
> .compatible = "mediatek,mt8183-mmsys",
> - .data = &mt8183_mmsys_match_data,
> + .data = &mt8183_mmsys_driver_data,
> },
> {
> .compatible = "mediatek,mt8186-mmsys",
> - .data = &mt8186_mmsys_match_data,
> + .data = &mt8186_mmsys_driver_data,
> },
> {
> .compatible = "mediatek,mt8192-mmsys",
> - .data = &mt8192_mmsys_match_data,
> + .data = &mt8192_mmsys_driver_data,
> + },
> + {
> + .compatible = "mediatek,mt8195-vdosys0",
> + .data = &mt8195_vdosys0_driver_data,
> },
> {
> - .compatible = "mediatek,mt8195-mmsys",
> - .data = &mt8195_mmsys_match_data,
> + .compatible = "mediatek,mt8195-vdosys1",
> + .data = &mt8195_vdosys1_driver_data,
> },
> {
> .compatible = "mediatek,mt8365-mmsys",
> - .data = &mt8365_mmsys_match_data,
> + .data = &mt8365_mmsys_driver_data,
> },
> { }
> };
> diff --git a/drivers/soc/mediatek/mtk-mmsys.h b/drivers/soc/mediatek/mtk-mmsys.h
> index f01ba206481d..77f37f8c715b 100644
> --- a/drivers/soc/mediatek/mtk-mmsys.h
> +++ b/drivers/soc/mediatek/mtk-mmsys.h
> @@ -87,18 +87,12 @@ struct mtk_mmsys_routes {
> };
>
> struct mtk_mmsys_driver_data {
> - const resource_size_t io_start;
> const char *clk_driver;
> const struct mtk_mmsys_routes *routes;
> const unsigned int num_routes;
> const u16 sw0_rst_offset;
> };
>
> -struct mtk_mmsys_match_data {
> - unsigned short num_drv_data;
> - const struct mtk_mmsys_driver_data *drv_data[];
> -};
> -
> /*
> * Routes in mt8173, mt2701, mt2712 are different. That means
> * in the same register address, it controls different input/output
Powered by blists - more mailing lists