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;
Received-SPF: Pass (protection.outlook.com: domain of duagon.com designates
 20.79.220.33 as permitted sender) receiver=protection.outlook.com;
 client-ip=20.79.220.33; helo=de1-emailsignatures-cloud.codetwo.com; pr=C
Received-SPF: Pass (protection.outlook.com: domain of duagon.com designates
 104.47.22.43 as permitted sender) receiver=protection.outlook.com;
 client-ip=104.47.22.43; helo=CHE01-GV0-obe.outbound.protection.outlook.com;
 pr=C
From:   =?iso-8859-1?Q?Rodr=EDguez_Barbarin=2C_Jos=E9_Javier?= 
        <JoseJavier.Rodriguez@duagon.com>
To:     "morbidrsa@gmail.com" <morbidrsa@gmail.com>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
CC:     "jth@kernel.org" <jth@kernel.org>,
        =?iso-8859-1?Q?Sanju=E1n_Garc=EDa=2C_Jorge?= 
        <Jorge.SanjuanGarcia@duagon.com>,
        =?iso-8859-1?Q?Rodr=EDguez_Barbarin=2C_Jos=E9_Javier?= 
        <JoseJavier.Rodriguez@duagon.com>
Subject: [PATCH v3 2/3] mcb-pci: Reallocate memory region to avoid memory
 overlapping
Thread-Topic: [PATCH v3 2/3] mcb-pci: Reallocate memory region to avoid memory
 overlapping
Thread-Index: AQHZYvVkH/iO56PxR0ejBYQErX9x2Q==
Date:   Thu, 30 Mar 2023 10:50:06 +0000
Message-ID: <20230330104949.21918-3-josejavier.rodriguez@duagon.com>
References: <20230330104949.21918-1-josejavier.rodriguez@duagon.com>
In-Reply-To: <20230330104949.21918-1-josejavier.rodriguez@duagon.com>
Accept-Language: es-ES, en-US
Content-Language: en-US
Authentication-Results-Original: dkim=none (message not signed)
 header.d=none;dmarc=none action=none header.from=duagon.com;
X-Microsoft-Antispam-Message-Info-Original: AD/SO1Zle8KxLhz+kvO1RhttJZ+47bGnUhSm38/QPOGdwuZG/1bwdJwyBiUfz4m3YyqjDm6GS7Gj4l6Q6TWgHR9pw4jQtMXuK8waJUexxWPN188qORBZDCDMbkDL0FCrTcXZsCb3QPsbI37/AzIJ6piP3GD7ceB3SCE+5Ja58rrl1n97nmmI+crAA5Jt7vHG3GfHNdiTr71cyyqt/zf1SdvULTd+hBnL6zXu9vlqD1et+EA8yqKOYr+RNonkasITWeJfK7s+s77gAmYoMa5R4sSvWK0GNOZNnGbiZEHIp0ZGruDxYbXgq36dZzLxv6XAjvg9jv/8Y82Gd1kPi7TXu7OvmGNYABXdCFMNp71vjUjGaurkJ3rafw3HLN3VReUlHqo6bcxA6OHHwmxOLMLFi3FEj1aGtH8aBrqGeTviE9v7UvAjCq4kYC0hJ7h9mNnE2cKYPQZQRj4/dXYgY9ruKtnVgNInLQJ+cuM+rgwKhk60Pk6bG6EvQY5EAukRuudAdddhB/UTG0VnHYE1FT+W35Tr+VCyY0p5z0IlRvq040THTQ4kYbzOqAB2FERju0H3WXCifZUfEw0qC9F6z2maq3aORV4kvsMoVmCZYJ0bhyJVUU34R7Drm+2sfjVwoys3
X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:GV0P278MB0996.CHEP278.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230028)(366004)(136003)(396003)(376002)(39850400004)(346002)(451199021)(83380400001)(2906002)(5660300002)(8936002)(36756003)(38070700005)(38100700002)(86362001)(122000001)(6512007)(6506007)(316002)(64756008)(66446008)(54906003)(4326008)(66556008)(6486002)(8676002)(66946007)(76116006)(66476007)(26005)(91956017)(186003)(1076003)(71200400001)(107886003)(478600001)(41300700001)(2616005)(110136005);DIR:OUT;SFP:1102;
Content-Type: text/plain; charset="iso-8859-1"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZR0P278MB0741
X-SM-outgoing: yes
X-EOPAttributedMessage: 1
X-MS-Exchange-SkipListedInternetSender: ip=[104.47.22.43];domain=CHE01-GV0-obe.outbound.protection.outlook.com
X-MS-Exchange-Transport-CrossTenantHeadersStripped: HE1EUR01FT097.eop-EUR01.prod.protection.outlook.com
X-MS-Office365-Filtering-Correlation-Id-Prvs: f9d430bb-e1c7-4cbf-580a-08db310c8684
X-Microsoft-Antispam-Untrusted: BCL:0;
X-Microsoft-Antispam-Message-Info-Original: cs6I/oNa8nixVGDZsbumsMlf4aUusqNz7909qO2/WRpgKC29OEuuWrp3cwZ748P/jMdVK7kcOnmib57MsiyyUFATSkj5YshAkS5r8V/BKhxZxJsWQuCQz1hXFZV85/3mv/edJl6Gxu+XYXlRIOK2jd5IEhBh1q7MiBo2wLoDbpLKfQx5XLumm4ThiHeXyZvuRvlAwufn3vBgxCKAxRa7pVnAAghXFNc2YhPHYHb1JkrE640o+7PqgJq/KLT0iGk1hBnAIIJl89hJOnt3p55RkEj3SoDe4jr4BQ9GccAZoaygZ0PYC8BUiCIuhOnDYKhf42yIHRde10Zeiw8i9OSc+PrKQuNX7sflMVJyBzrbTy+wWmuJvpxVzu1bpzgkZHE0S99Ma+nP6en/whrTwelPNgZiuHHMwDe1q4ub0q8OPbCYYiVH1QeHkFsV4wMnZxlQkxhS8+6voEnwSFf6k7mtEjuUVSWFoO2QTfLM+yMBxVgRIrokWWw3TEqUH8zKEICk+jbGHQ43wVPyYqUUw4C0Pp4aQuYaBWBt/LpC4mf+7XG4MP3EGMAUcPTulmmigl+3Xgi5qPM9t/XiwX/sWEO0Fmo0fi0oP+5qBj3/JzC8RHV7XhkEuE2eqg8ouHJfFSejqLHoxYKl9rh6hyy3YXYElOGjUZVMQGJx152/bXRFgYD0LQWFSavZWs/cfMsAiRCta994Xj8gwwkojwCclmAVkoMfQO8nUFfgmgxsurGRA9oaQ5XwYwvdvvWdnLyMTmIhhtOIn89Ti+qF7mw5af6EKtYcegEkb9HorLALaiJ25E7RNHfc/u/8wU7+X78rbSxg
X-Forefront-Antispam-Report-Untrusted: CIP:91.135.65.126;CTRY:CH;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:CHE01-GV0-obe.outbound.protection.outlook.com;PTR:mail-gv0che01lp2043.outbound.protection.outlook.com;CAT:NONE;SFS:(13230028)(136003)(346002)(39850400004)(376002)(396003)(451199021)(36840700001)(46966006)(478600001)(2616005)(6486002)(36756003)(83380400001)(47076005)(336012)(86362001)(40480700001)(156005)(36860700001)(32850700003)(7636003)(82740400003)(26005)(186003)(1076003)(6506007)(107886003)(41300700001)(2906002)(82310400005)(5660300002)(110136005)(54906003)(8936002)(316002)(4326008)(8676002)(70586007)(70206006)(6512007);DIR:OUT;SFP:1102;
X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZR0P278MB0122
X-CodeTwo-MessageID: 5c753910-5bd1-4807-acbe-521f7bda90de.20230330105011@de1-emailsignatures-cloud.codetwo.com
X-CodeTwoProcessed: true
X-MS-Exchange-Transport-CrossTenantHeadersStripped: VE1EUR01FT045.eop-EUR01.prod.protection.outlook.com
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id-Prvs: 094d5eed-b024-4a6a-c23d-08db310c886f
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: 9+pXJhzklMbDj9ZGeZRa7Rdhe0/OdLftFnLxHjK9WOqjQuTabu0yIewUJjEp3US/4CJuBXvrSnsch30iJVoSfsUXdZnKDzJjjx9Gj/+uqQXL/dAKpG33h0Kvf+tKaFLWdMn/WK9a8icp3t4GElBcZQXrzsECf6oNkLWvz0JvK6MRTt3syyx4dtuZdkjHDNF4vi8a1OImC6yO2S5lRPeUF17hszjNIBFoNETMbNpUvpm1E2QCNBqoY+0whsKLJ3B6JtZTXiTHULEz8bmwsyLghjDFOw8IrBHJhKWuSOx5Oigf/n9iMNq5XTooE4oAv3dWGDp59XBuvtxLmwAD2uZQvnKRDSuToA+JPPhOQURLMC6ohn3kVMV0mAfpouXilhsyAfChao/gWOEu83luwRXSu83ka0Rcv1lsmJ5WcqrlszY6C67a6YXlhHutzztlNxWQI7C3P+BNFGgZ7aoWDmxHxh7t/kPjd/lso5qWhcdqLUMonNWNHqq1rQzNAnRS3AYQWAXQ1Gutmr7iOULjqEHR04KT3a0h23uR8M+QhGLXhoQ38jPCGwtdEAJMQhRlIqzVeStVAqb7Ip4NtS0QhPSHSGcweu/e5UFt+iPhQKjBdtVF1492KzcHf7WnZ9C5rIUwaShcO+Kj1pDblQvWFegOEMX+BdII0B75wtZo8De8uKA=
X-Forefront-Antispam-Report: CIP:20.79.220.33;CTRY:DE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:de1-emailsignatures-cloud.codetwo.com;PTR:de1-emailsignatures-cloud.codetwo.com;CAT:NONE;SFS:(13230028)(396003)(376002)(346002)(136003)(39850400004)(451199021)(36840700001)(46966006)(336012)(47076005)(2616005)(82310400005)(83380400001)(36860700001)(6486002)(478600001)(316002)(54906003)(110136005)(186003)(26005)(107886003)(6506007)(6512007)(2906002)(1076003)(5660300002)(4326008)(36756003)(7636003)(7596003)(8936002)(8676002)(70206006)(70586007)(82740400003)(41300700001)(40480700001)(86362001);DIR:OUT;SFP:1102;
X-OriginatorOrg: duagon.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Mar 2023 10:50:12.7881
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: cd882885-0997-4dbb-f92e-08db310c8a0e
X-MS-Exchange-CrossTenant-Id: e5e7e96e-8a28-45d6-9093-a40dd5b51a57
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=e5e7e96e-8a28-45d6-9093-a40dd5b51a57;Ip=[20.79.220.33];Helo=[de1-emailsignatures-cloud.codetwo.com]
X-MS-Exchange-CrossTenant-AuthSource: VE1EUR01FT045.eop-EUR01.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: GV0P278MB0161
X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
        DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,
        SPF_HELO_PASS,SPF_PASS 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: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

mcb-pci requests a fixed-size memory region to parse the chameleon
table, however, if the chameleon table is smaller that the allocated
region, it could overlap with the IP Cores' memory regions.

After parsing the chameleon table, drop/reallocate the memory region
with the actual chameleon table size.

Co-developed-by: Jorge Sanjuan Garcia <jorge.sanjuangarcia@duagon.com>
Signed-off-by: Jorge Sanjuan Garcia <jorge.sanjuangarcia@duagon.com>
Signed-off-by: Javier Rodriguez <josejavier.rodriguez@duagon.com>
---
 drivers/mcb/mcb-pci.c | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/drivers/mcb/mcb-pci.c b/drivers/mcb/mcb-pci.c
index dc88232d9af8..53d9202ff9a7 100644
--- a/drivers/mcb/mcb-pci.c
+++ b/drivers/mcb/mcb-pci.c
@@ -31,7 +31,7 @@ static int mcb_pci_probe(struct pci_dev *pdev, const stru=
ct pci_device_id *id)
 {
 	struct resource *res;
 	struct priv *priv;
-	int ret;
+	int ret, table_size;
 	unsigned long flags;
=20
 	priv =3D devm_kzalloc(&pdev->dev, sizeof(struct priv), GFP_KERNEL);
@@ -90,7 +90,30 @@ static int mcb_pci_probe(struct pci_dev *pdev, const str=
uct pci_device_id *id)
 	if (ret < 0)
 		goto out_mcb_bus;
=20
-	dev_dbg(&pdev->dev, "Found %d cells\n", ret);
+	table_size =3D ret;
+
+	if (table_size < CHAM_HEADER_SIZE) {
+		/* Release the previous resources */
+		devm_iounmap(&pdev->dev, priv->base);
+		devm_release_mem_region(&pdev->dev, priv->mapbase, CHAM_HEADER_SIZE);
+
+		/* Then, allocate it again with the actual chameleon table size */
+		res =3D devm_request_mem_region(&pdev->dev, priv->mapbase,
+						table_size,
+						KBUILD_MODNAME);
+		if (!res) {
+			dev_err(&pdev->dev, "Failed to request PCI memory\n");
+			ret =3D -EBUSY;
+			goto out_mcb_bus;
+		}
+
+		priv->base =3D devm_ioremap(&pdev->dev, priv->mapbase, table_size);
+		if (!priv->base) {
+			dev_err(&pdev->dev, "Cannot ioremap\n");
+			ret =3D -ENOMEM;
+			goto out_mcb_bus;
+		}
+	}
=20
 	mcb_bus_add_devices(priv->bus);
=20
--=20
2.34.1