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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 14075CDB474 for ; Mon, 16 Oct 2023 12:56:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233572AbjJPM4M (ORCPT ); Mon, 16 Oct 2023 08:56:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47240 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233501AbjJPM4E (ORCPT ); Mon, 16 Oct 2023 08:56:04 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DE43BAD; Mon, 16 Oct 2023 05:56:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1697460962; x=1728996962; h=date:from:to:cc:subject:in-reply-to:message-id: references:mime-version; bh=L+WApuyahikeC/ONjZM0yJBCNYeGV+unFwJga+bJWwk=; b=aargCBS+ovtYUVEd8iPLQT8acgziPO7elpg1a4QIXmMe4Raktip+3dJk 9AA0j0AZdXfPs0bBpj5XZLy8rJID7Wy9C66QV5tfbdrjXtu7++I/b6rBF b7R36+EtzZZNs8OcELAGbVUu+WBJMkQXhmFjPMulaskHRQ5yjAQZzI93E cFVALib9oeQNf9fl7F9JZv0dPvkUZmZ6ZtnQlNtv+RgbNWDQmf+wD1Z4y NiH70tF6ZrJfZziLt//CYcJIz1ak3g1A9hQ35XopLgsw3p1tBO5MnxKT3 7HnR3Ob/mROzQrpkxMxdE0bIOZhT05r8HvQWIa3IgJCFbIwNE27h4B1tt Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10863"; a="471742466" X-IronPort-AV: E=Sophos;i="6.03,229,1694761200"; d="scan'208";a="471742466" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Oct 2023 05:56:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.03,229,1694761200"; d="scan'208";a="3524820" Received: from rhaeussl-mobl.ger.corp.intel.com (HELO bhoerz-mobl1.ger.corp.intel.com) ([10.252.59.103]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 16 Oct 2023 05:54:55 -0700 Date: Mon, 16 Oct 2023 15:55:57 +0300 (EEST) From: =?ISO-8859-15?Q?Ilpo_J=E4rvinen?= To: Bjorn Helgaas cc: linux-pci@vger.kernel.org, Jonathan Cameron , =?ISO-8859-2?Q?Krzysztof_Wilczy=F1ski?= , Lorenzo Pieralisi , LKML , Bjorn Helgaas Subject: Re: [PATCH 06/10] PCI/DPC: Use FIELD_GET() In-Reply-To: <20231013200249.GA1123559@bhelgaas> Message-ID: <3df6c8ea-888e-faa-5bae-e26b1f446ab3@linux.intel.com> References: <20231013200249.GA1123559@bhelgaas> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="8323329-1675609082-1697460962=:1986" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --8323329-1675609082-1697460962=:1986 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8BIT On Fri, 13 Oct 2023, Bjorn Helgaas wrote: > On Wed, Oct 11, 2023 at 02:01:13PM +0300, Ilpo Järvinen wrote: > > On Tue, 10 Oct 2023, Bjorn Helgaas wrote: > > > From: Bjorn Helgaas > > > > > > Use FIELD_GET() to remove dependences on the field position, i.e., the > > > shift value. No functional change intended. > > > > > > Signed-off-by: Bjorn Helgaas > > > --- > > > drivers/pci/pcie/dpc.c | 9 +++++---- > > > drivers/pci/quirks.c | 2 +- > > > include/uapi/linux/pci_regs.h | 1 + > > > 3 files changed, 7 insertions(+), 5 deletions(-) > > > > > > diff --git a/drivers/pci/pcie/dpc.c b/drivers/pci/pcie/dpc.c > > > index 3ceed8e3de41..6e551f34ec63 100644 > > > --- a/drivers/pci/pcie/dpc.c > > > +++ b/drivers/pci/pcie/dpc.c > > > @@ -8,6 +8,7 @@ > > > > > > #define dev_fmt(fmt) "DPC: " fmt > > > > > > +#include > > > #include > > > #include > > > #include > > > @@ -202,7 +203,7 @@ static void dpc_process_rp_pio_error(struct pci_dev *pdev) > > > > > > /* Get First Error Pointer */ > > > pci_read_config_word(pdev, cap + PCI_EXP_DPC_STATUS, &dpc_status); > > > - first_error = (dpc_status & 0x1f00) >> 8; > > > + first_error = FIELD_GET(PCI_EXP_DPC_STATUS_FIRST_ERR, dpc_status); > > > > > > for (i = 0; i < ARRAY_SIZE(rp_pio_error_string); i++) { > > > if ((status & ~mask) & (1 << i)) > > > @@ -270,8 +271,8 @@ void dpc_process_error(struct pci_dev *pdev) > > > pci_info(pdev, "containment event, status:%#06x source:%#06x\n", > > > status, source); > > > > > > - reason = (status & PCI_EXP_DPC_STATUS_TRIGGER_RSN) >> 1; > > > - ext_reason = (status & PCI_EXP_DPC_STATUS_TRIGGER_RSN_EXT) >> 5; > > > + reason = FIELD_GET(PCI_EXP_DPC_STATUS_TRIGGER_RSN, status); > > > + ext_reason = FIELD_GET(PCI_EXP_DPC_STATUS_TRIGGER_RSN_EXT, status); > > > pci_warn(pdev, "%s detected\n", > > > (reason == 0) ? "unmasked uncorrectable error" : > > > (reason == 1) ? "ERR_NONFATAL" : > > > > BTW, it seems we're doing overlapping work here with many of these > > patches. It takes some time to think these through one by one, I don't > > just autorun through them with coccinelle so I've not posted my changes > > yet. > > > > I went to a different direction here and named all the reasons too with > > defines and used & to get the reason in order to be able to compare with > > the named reasons. > > > > You also missed convering one 0xfff4 to use define (although I suspect it > > never was your goal to go beyond FIELD_GET() here). > > Pure FIELD_GET() and FIELD_PREP() was my goal. > > If you have patches you prefer, I'll drop mine. I did these about a > year ago and it seemed like the time to do something with them since > you did the PCI_EXP_LNKSTA_NLW ones and to try to prevent overlapping > work. Since we've started, I'd like to get as much of it done this > cycle as possible. Okay, I suggest you keep your FIELD_GET/PREP() patch since mine is getting more and more complicated. I can build a nice set of small changes about what remains to do in DPC on top of your patch. -- i. --8323329-1675609082-1697460962=:1986--