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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 73DB5C433EF for ; Fri, 22 Apr 2022 10:07:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Uqym5YPiUhTJiEKD+k0BTiVHAsMgb4G/iTxLUYwUPns=; b=Kfkd2Z+m9Uf2GN yEY5jHrcNHuG0elxZoeQPE9sfHnZG+CHeMsXXhJ/UWeGHIUrmp8MXpXBrOWGiJ+w7xaXFDUeNX6t6 MBiS2YEpUO6ZVBWIRVACU+hk33ZXKpr9N4hdDPiaYHDVkGUlguKERB/+7+5lZyx5CEl1WFOVw15sd ZGkYZeMegySwgqySOZQRzlZNZsHejysEAEaxNPniPKFPPx4s4hYamPfBqhGAX7o4QTlqWa8uvC+HJ dnQI24J4VNu/yFHgeCzidA0BBQQ0byazeXaIIbzZk1Yx8y2FKQzawQYPxdM1sT1SPtiq6io/ydWQj QiVkTa1mICaqpseThFhg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nhqB9-00HWKT-62; Fri, 22 Apr 2022 10:06:19 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nhqB5-00HWKA-5O for linux-arm-kernel@lists.infradead.org; Fri, 22 Apr 2022 10:06:17 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 06DF01477; Fri, 22 Apr 2022 03:06:12 -0700 (PDT) Received: from lpieralisi (unknown [10.57.12.153]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 50E6B3F766; Fri, 22 Apr 2022 03:06:10 -0700 (PDT) Date: Fri, 22 Apr 2022 11:06:04 +0100 From: Lorenzo Pieralisi To: Pali =?iso-8859-1?Q?Roh=E1r?= Cc: Bjorn Helgaas , Bjorn Helgaas , Rob Herring , Andrew Lunn , Thomas Petazzoni , Krzysztof =?utf-8?Q?Wilczy=C5=84ski?= , Marek =?iso-8859-1?Q?Beh=FAn?= , Russell King , linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v5 3/4] PCI: Add function for parsing 'slot-power-limit-milliwatt' DT property Message-ID: <20220422100604.GA500@lpieralisi> References: <20220412094946.27069-4-pali@kernel.org> <20220413202433.GA688099@bhelgaas> <20220421201413.hwpfby4i5tvhwxqv@pali> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220421201413.hwpfby4i5tvhwxqv@pali> User-Agent: Mutt/1.9.4 (2018-02-28) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220422_030615_336474_5EA3A41F X-CRM114-Status: GOOD ( 30.90 ) 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-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, Apr 21, 2022 at 10:14:13PM +0200, Pali Roh=E1r wrote: > On Wednesday 13 April 2022 15:24:33 Bjorn Helgaas wrote: > > On Tue, Apr 12, 2022 at 11:49:45AM +0200, Pali Roh=E1r wrote: > > > Add function of_pci_get_slot_power_limit(), which parses the > > > 'slot-power-limit-milliwatt' DT property, returning the value in > > > milliwatts and in format ready for the PCIe Slot Capabilities Registe= r. > > > = > > > Signed-off-by: Pali Roh=E1r > > > Signed-off-by: Marek Beh=FAn > > > Reviewed-by: Rob Herring > > = > > Looks good to me! Thank you! > > = > > Reviewed-by: Bjorn Helgaas > = > Perfect! > = > Lorenzo, is this patch series OK now for merging? Yes it is. I have a related question (ie how to check whether a binding has been accepted into the DT schema) but I will sort that out with Rob. Thanks, Lorenzo > > > --- > > > Changes in v4: > > > * Set 239 W when DT slot-power-limit-milliwatt is between 239 W and 2= 50 W > > > * Fix returning power limit value > > > Changes in v3: > > > * Set 600 W when DT slot-power-limit-milliwatt > 600 W > > > Changes in v2: > > > * Added support for PCIe 6.0 slot power limit encodings > > > * Round down slot power limit value > > > --- > > > drivers/pci/of.c | 70 +++++++++++++++++++++++++++++++++++++++++++++= ++ > > > drivers/pci/pci.h | 15 ++++++++++ > > > 2 files changed, 85 insertions(+) > > > = > > > diff --git a/drivers/pci/of.c b/drivers/pci/of.c > > > index cb2e8351c2cc..6c1b81304665 100644 > > > --- a/drivers/pci/of.c > > > +++ b/drivers/pci/of.c > > > @@ -633,3 +633,73 @@ int of_pci_get_max_link_speed(struct device_node= *node) > > > return max_link_speed; > > > } > > > EXPORT_SYMBOL_GPL(of_pci_get_max_link_speed); > > > + > > > +/** > > > + * of_pci_get_slot_power_limit - Parses the "slot-power-limit-milliw= att" > > > + * property. > > > + * > > > + * @node: device tree node with the slot power limit information > > > + * @slot_power_limit_value: pointer where the value should be stored= in PCIe > > > + * Slot Capabilities Register format > > > + * @slot_power_limit_scale: pointer where the scale should be stored= in PCIe > > > + * Slot Capabilities Register format > > > + * > > > + * Returns the slot power limit in milliwatts and if @slot_power_lim= it_value > > > + * and @slot_power_limit_scale pointers are non-NULL, fills in the v= alue and > > > + * scale in format used by PCIe Slot Capabilities Register. > > > + * > > > + * If the property is not found or is invalid, returns 0. > > > + */ > > > +u32 of_pci_get_slot_power_limit(struct device_node *node, > > > + u8 *slot_power_limit_value, > > > + u8 *slot_power_limit_scale) > > > +{ > > > + u32 slot_power_limit_mw; > > > + u8 value, scale; > > > + > > > + if (of_property_read_u32(node, "slot-power-limit-milliwatt", > > > + &slot_power_limit_mw)) > > > + slot_power_limit_mw =3D 0; > > > + > > > + /* Calculate Slot Power Limit Value and Slot Power Limit Scale */ > > > + if (slot_power_limit_mw =3D=3D 0) { > > > + value =3D 0x00; > > > + scale =3D 0; > > > + } else if (slot_power_limit_mw <=3D 255) { > > > + value =3D slot_power_limit_mw; > > > + scale =3D 3; > > > + } else if (slot_power_limit_mw <=3D 255*10) { > > > + value =3D slot_power_limit_mw / 10; > > > + scale =3D 2; > > > + slot_power_limit_mw =3D slot_power_limit_mw / 10 * 10; > > > + } else if (slot_power_limit_mw <=3D 255*100) { > > > + value =3D slot_power_limit_mw / 100; > > > + scale =3D 1; > > > + slot_power_limit_mw =3D slot_power_limit_mw / 100 * 100; > > > + } else if (slot_power_limit_mw <=3D 239*1000) { > > > + value =3D slot_power_limit_mw / 1000; > > > + scale =3D 0; > > > + slot_power_limit_mw =3D slot_power_limit_mw / 1000 * 1000; > > > + } else if (slot_power_limit_mw < 250*1000) { > > > + value =3D 0xEF; > > > + scale =3D 0; > > > + slot_power_limit_mw =3D 239*1000; > > > + } else if (slot_power_limit_mw <=3D 600*1000) { > > > + value =3D 0xF0 + (slot_power_limit_mw / 1000 - 250) / 25; > > > + scale =3D 0; > > > + slot_power_limit_mw =3D slot_power_limit_mw / (1000*25) * (1000*25= ); > > > + } else { > > > + value =3D 0xFE; > > > + scale =3D 0; > > > + slot_power_limit_mw =3D 600*1000; > > > + } > > > + > > > + if (slot_power_limit_value) > > > + *slot_power_limit_value =3D value; > > > + > > > + if (slot_power_limit_scale) > > > + *slot_power_limit_scale =3D scale; > > > + > > > + return slot_power_limit_mw; > > > +} > > > +EXPORT_SYMBOL_GPL(of_pci_get_slot_power_limit); > > > diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h > > > index 3d60cabde1a1..e10cdec6c56e 100644 > > > --- a/drivers/pci/pci.h > > > +++ b/drivers/pci/pci.h > > > @@ -627,6 +627,9 @@ struct device_node; > > > int of_pci_parse_bus_range(struct device_node *node, struct resource= *res); > > > int of_get_pci_domain_nr(struct device_node *node); > > > int of_pci_get_max_link_speed(struct device_node *node); > > > +u32 of_pci_get_slot_power_limit(struct device_node *node, > > > + u8 *slot_power_limit_value, > > > + u8 *slot_power_limit_scale); > > > void pci_set_of_node(struct pci_dev *dev); > > > void pci_release_of_node(struct pci_dev *dev); > > > void pci_set_bus_of_node(struct pci_bus *bus); > > > @@ -653,6 +656,18 @@ of_pci_get_max_link_speed(struct device_node *no= de) > > > return -EINVAL; > > > } > > > = > > > +static inline u32 > > > +of_pci_get_slot_power_limit(struct device_node *node, > > > + u8 *slot_power_limit_value, > > > + u8 *slot_power_limit_scale) > > > +{ > > > + if (slot_power_limit_value) > > > + *slot_power_limit_value =3D 0; > > > + if (slot_power_limit_scale) > > > + *slot_power_limit_scale =3D 0; > > > + return 0; > > > +} > > > + > > > static inline void pci_set_of_node(struct pci_dev *dev) { } > > > static inline void pci_release_of_node(struct pci_dev *dev) { } > > > static inline void pci_set_bus_of_node(struct pci_bus *bus) { } > > > -- = > > > 2.20.1 > > > = > > > = > > > _______________________________________________ > > > linux-arm-kernel mailing list > > > linux-arm-kernel@lists.infradead.org > > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel