From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.2 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A7C4EC4338F for ; Sun, 22 Aug 2021 08:55:38 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 6FB6A6024A for ; Sun, 22 Aug 2021 08:55:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 6FB6A6024A Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:Content-Type: Content-Transfer-Encoding:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:Date:Message-ID:From: References:Cc:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=GyukqLxYOcHGUBwhTMlPgjzdldiIir+sXUBFCxoNPTU=; b=teGIvHJxJnxe2e9V3NxSybMlL9 GGQE7P4jW5Ef3TQj90XOo0a0uUGJ/SdCC9XKPSzE9wZjS3X4mZ6PpTcZ+7ZoiXukbA2b7GIlXXCPl dmiJdxJXzNEtCZ8WIMWH9REka5NCGHwtlMsLPu38CF7rq9v8DeLGdoNXN4c0zJlcAoTjZODMRS84T zIYrUexqN+E6pFIRNIAwEnKBPI+D6VW6NXhlJTYqgv764vKuROtQLJmHfGxFA8uJukgDHOUsqZnN6 /cd/WCBOEcOWP+PIT2ykcVjLfO9NgldVT1xNyh4yDuIdbOh3IWHyDwSjfpB+jLOV7eWQTCjqKgZH5 LsLKeTqQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mHjEa-00Djo9-NB; Sun, 22 Aug 2021 08:53:40 +0000 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mHjEX-00DjnE-3w; Sun, 22 Aug 2021 08:53:38 +0000 Received: by mail-wr1-x431.google.com with SMTP id z9so21114089wrh.10; Sun, 22 Aug 2021 01:53:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=hWrdUXFFT1hy7MQnE8Mf414YBD13mw+SDcsxULeOOEk=; b=rLgB4VALwSt44QTvaGD+817BpwPkoc8LU+mbN6W3sImV+OQ0RE7v03MbvyvI0qyzAZ 5PsS4vEkUI39luGUxGYvw2gWjRelIji6wXOs56I/EZHtVxlhM+wsMFVpeyVKVPvJQO78 qT+j6MmOVIzPEBkW4o0xSXVyBVHgHy5Z1kvScY54YyvVOkKndozqD1EBGd//Wtrz2Cyj rV7HkptEjvP1WCPzApY5zLx/jGB6YgnznLJGhBZcIiPXaVxmOR4JibVX3JGzqQkJAO8s q+CFf3WJFdDg0yTDkEFM0Q1CvPtYgf9ZHvcVuFwLQxtswYrPXS3Tf5HgZGI9KVBN6IPd eulg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=hWrdUXFFT1hy7MQnE8Mf414YBD13mw+SDcsxULeOOEk=; b=F+9OHd3jYEgMpjLuR/SXHS4H5HuCxoWQFSTylX1p3jphL+SsvfwObo/zHMoK63nl9k 5CgDzHT2GV2NMGK5xQmhuvss/U47G6a1jyEsxVYC7CIAN5uikTeCypp9l8HX9IRBVBCn Ayph3iuhdjw9ihPmkDBnIOcVhV9UVjRuNNGy0UVOvDucXQZBkFy0B9yHgMxQuX2jeygS PWUY1wCCfPZG5/dzocw3HmA9oCC34jsnhe4IqVo7mR9zwwG4lOoAyaCgqCRp6n3iRGuG L/3eGcHOl5D6ikC+zTSbdGkh9WIHom3NC5Vmsbalz2rxwKL8a+yojpogmbQeYeC69f0H bh0A== X-Gm-Message-State: AOAM532khm6pcbuduqrUW4qK+9gD9U6bvbsz53nnAiYqVR8rxJBJVhld B9r32h+3JvkCBhhoraRWjo4= X-Google-Smtp-Source: ABdhPJy+9G/NDjSWeS03fUSf+0DXsM7P8UyIim0rVCaTq5iEuraxkSpc5tou6dJOpdol80OEeomilg== X-Received: by 2002:adf:f748:: with SMTP id z8mr7770989wrp.25.1629622414727; Sun, 22 Aug 2021 01:53:34 -0700 (PDT) Received: from [192.168.1.22] (amarseille-551-1-7-65.w92-145.abo.wanadoo.fr. [92.145.152.65]) by smtp.gmail.com with ESMTPSA id e14sm6620743wrr.6.2021.08.22.01.53.34 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 22 Aug 2021 01:53:34 -0700 (PDT) Subject: Re: [PATCH v2 3/4] PCI/ACPI: Add Broadcom bcm2711 MCFG quirk To: Jeremy Linton , linux-pci@vger.kernel.org Cc: lorenzo.pieralisi@arm.com, nsaenz@kernel.org, bhelgaas@google.com, rjw@rjwysocki.net, lenb@kernel.org, robh@kernel.org, kw@linux.com, sdonthineni@nvidia.com, stefan.wahren@i2se.com, bcm-kernel-feedback-list@broadcom.com, linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org, linux-kernel@vger.kernel.org References: <20210819215655.84866-1-jeremy.linton@arm.com> <20210819215655.84866-4-jeremy.linton@arm.com> From: Florian Fainelli Message-ID: <9796674a-5870-135c-2fdc-fb0d5347d7c7@gmail.com> Date: Sun, 22 Aug 2021 10:53:33 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:78.0) Gecko/20100101 Thunderbird/78.12.0 MIME-Version: 1.0 In-Reply-To: <20210819215655.84866-4-jeremy.linton@arm.com> Content-Language: en-US X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210822_015337_229141_4E6E5CAF X-CRM114-Status: GOOD ( 20.17 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On 8/19/2021 11:56 PM, Jeremy Linton wrote: > Now that there is a bcm2711 quirk, it needs to be enabled when the > MCFG is missing. Use an ACPI namespace _DSD property > "linux-ecam-quirk-id" as an alternative to the MCFG OEM. > > Signed-off-by: Jeremy Linton > --- > drivers/acpi/pci_mcfg.c | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > > diff --git a/drivers/acpi/pci_mcfg.c b/drivers/acpi/pci_mcfg.c > index 53cab975f612..4b991ee5c66c 100644 > --- a/drivers/acpi/pci_mcfg.c > +++ b/drivers/acpi/pci_mcfg.c > @@ -169,6 +169,9 @@ static struct mcfg_fixup mcfg_quirks[] = { > ALTRA_ECAM_QUIRK(1, 13), > ALTRA_ECAM_QUIRK(1, 14), > ALTRA_ECAM_QUIRK(1, 15), > + > + { "bcm2711", "", 0, 0, MCFG_BUS_ANY, &bcm2711_pcie_ops, > + DEFINE_RES_MEM(0xFD500000, 0xA000) }, > }; > > static char mcfg_oem_id[ACPI_OEM_ID_SIZE]; > @@ -198,8 +201,18 @@ static void pci_mcfg_apply_quirks(struct acpi_pci_root *root, > u16 segment = root->segment; > struct resource *bus_range = &root->secondary; > struct mcfg_fixup *f; > + const char *soc; > int i; > > + /* > + * This may be a machine with a PCI/SMC conduit, which means it doesn't > + * have an MCFG. Use an ACPI namespace definition instead. > + */ > + if (!fwnode_property_read_string(acpi_fwnode_handle(root->device), > + "linux-ecam-quirk-id", &soc)) { > + memcpy(mcfg_oem_id, soc, ACPI_OEM_ID_SIZE); Being super paranoid here, can we use one of the "safe" string copy routines here just in case? > + } > + > for (i = 0, f = mcfg_quirks; i < ARRAY_SIZE(mcfg_quirks); i++, f++) { > if (pci_mcfg_quirk_matches(f, segment, bus_range)) { > if (f->cfgres.start) > -- Florian _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel