From patchwork Mon Jun 10 09:31:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Philipp Stanner X-Patchwork-Id: 13691733 X-Patchwork-Delegate: bhelgaas@google.com Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CF5C275811 for ; Mon, 10 Jun 2024 09:32:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718011929; cv=none; b=H6VXOUkDwldPiuFMREKlhoRG27A2pmAx1AOb2wv9LUfxWvunSNlBk5PVuCtx4lbnASgdoHj6QaOz2C5u6a2ZTYhtW6O8/rnmixzt52Zps6Rysblc6bolm6jO+l6ce6dE0X8F/zj4qPkkMoL5bRVmc7l4c0X9695elFzSHp8WMQA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1718011929; c=relaxed/simple; bh=uxWR+cyvQnS6F+Ku7i7pYs3ZA+OagBoxvbut16jkiT8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RD7U2P7vTXpW7l9B3LCM8TybI8tkOmU1hUSqy9l2aMc8IUFLTjGxw+5dF1JUbSG7l3QCJaXQmntaw9+yn5tL4aEZpvpo4DJES4mEIVnQLGiOeZ+aZLfk0l+awbiEFemT85YWhRCc8b8MU2OyxveACco5tf3q4iIXSgagyAV16sI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=ZZRsvQRg; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ZZRsvQRg" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1718011926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Oyizp71aDVZTVSj1hEgGPWD4Zgvxaje3MhAhMHAAQDo=; b=ZZRsvQRgOW/sPoZVX3HkjvZ9O6y2SudAbOvl8t6zTdup0rfd+C1ZPxjO72PjFWD3XlY/yV scmFECoqenjOPwiX9J9s1toxC+ffthXCFUUwTuDwZ8sN5eW118mKt7yGO2+RBn4pWWMVsR 1CX1oMPgjIIElfoS9m6YuSCjbYJ6Pq4= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-363-Vz8_xMEAOtGhnUvE_c9VaA-1; Mon, 10 Jun 2024 05:32:02 -0400 X-MC-Unique: Vz8_xMEAOtGhnUvE_c9VaA-1 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-42180ddc0b9so1691705e9.0 for ; Mon, 10 Jun 2024 02:32:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1718011921; x=1718616721; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Oyizp71aDVZTVSj1hEgGPWD4Zgvxaje3MhAhMHAAQDo=; b=FQ6XNS4LesOi2isCMNXdQwHfWNFWg9OuRUPeyfhnusvaHoIgeAhByOFjRK/bGS/2RN sCU5gjEBO6wFim1nA++aNihaX2COqUuZJaOep0/RedAxiKPNa7Ti+Mm6/2/X0L0dBMRs 9V+mmnEpYUJ5qBidtLyLSwGNxgVVZxjpi8mZapuYLfExTwgJse5RNM951hl0C0Z7fiT7 w9An2bYFMFjuHJFacRipVfR3Dg+fkeTaRrjH4mCmRiuggswtQBUTRpRtDK/r95ZyXxC6 MxwnUMNH5u3bBifJ8DNX54TGzwp6cg1OAGUAyvB+n91beTAhjk6R9//3ukm7KtQwRx2i 7xxA== X-Forwarded-Encrypted: i=1; AJvYcCXvuek2BXsagllnCV25L2qYa6v0FoKgpWqUm5DbS82oAZ7YPfmFkCakEW//QOU76A62w1Pfk4tDq3e76zrMXZHVN5eWLxFXX4Wc X-Gm-Message-State: AOJu0YwJqDNPcnrqh1kAPAHv+quCotuZdRf2OQjXc3qerHz3hYRUN56g qFW9p11FvLUtbqBO7U8kOys+TJBsBSjJBxU511IROtq/ATLctlrKISXQcObRaFVCXjbqqTyTa5p lRmsd4TS8+CTuasK0qSfAB9iTJWZivX/aiPnySS7ZB6XIlF4ohbUSqeT6OA== X-Received: by 2002:a5d:64cb:0:b0:354:e778:3665 with SMTP id ffacd0b85a97d-35efee307bamr7423569f8f.5.1718011920872; Mon, 10 Jun 2024 02:32:00 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHBB6YZLiS2HIy0dE82G5S8NImrCKfK+wiAnir8JXLqf86PoMnWoXCllIT/8+SHiawccCY93w== X-Received: by 2002:a5d:64cb:0:b0:354:e778:3665 with SMTP id ffacd0b85a97d-35efee307bamr7423555f8f.5.1718011920534; Mon, 10 Jun 2024 02:32:00 -0700 (PDT) Received: from pstanner-thinkpadt14sgen1.muc.redhat.com (nat-pool-muc-t.redhat.com. [149.14.88.26]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-35f0ce4b62fsm7257545f8f.80.2024.06.10.02.31.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Jun 2024 02:32:00 -0700 (PDT) From: Philipp Stanner To: Hans de Goede , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Bjorn Helgaas , Sam Ravnborg , dakr@redhat.com Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-pci@vger.kernel.org, Philipp Stanner Subject: [PATCH v8 01/13] PCI: Add and use devres helper for bit masks Date: Mon, 10 Jun 2024 11:31:23 +0200 Message-ID: <20240610093149.20640-2-pstanner@redhat.com> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240610093149.20640-1-pstanner@redhat.com> References: <20240610093149.20640-1-pstanner@redhat.com> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The current derves implementation uses manual shift operations to check whether a bit in a mask is set. The code can be made more readable by writing a small helper function for that. Implement mask_contains_bar() and use it where applicable. Link: https://lore.kernel.org/r/20240605081605.18769-3-pstanner@redhat.com Signed-off-by: Philipp Stanner Signed-off-by: Bjorn Helgaas --- drivers/pci/devres.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/pci/devres.c b/drivers/pci/devres.c index 2c562b9eaf80..f13edd4a3873 100644 --- a/drivers/pci/devres.c +++ b/drivers/pci/devres.c @@ -161,6 +161,10 @@ int pcim_set_mwi(struct pci_dev *dev) } EXPORT_SYMBOL(pcim_set_mwi); +static inline bool mask_contains_bar(int mask, int bar) +{ + return mask & BIT(bar); +} static void pcim_release(struct device *gendev, void *res) { @@ -169,7 +173,7 @@ static void pcim_release(struct device *gendev, void *res) int i; for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) - if (this->region_mask & (1 << i)) + if (mask_contains_bar(this->region_mask, i)) pci_release_region(dev, i); if (this->mwi) @@ -363,7 +367,7 @@ int pcim_iomap_regions(struct pci_dev *pdev, int mask, const char *name) for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) { unsigned long len; - if (!(mask & (1 << i))) + if (!mask_contains_bar(mask, i)) continue; rc = -EINVAL; @@ -386,7 +390,7 @@ int pcim_iomap_regions(struct pci_dev *pdev, int mask, const char *name) pci_release_region(pdev, i); err_inval: while (--i >= 0) { - if (!(mask & (1 << i))) + if (!mask_contains_bar(mask, i)) continue; pcim_iounmap(pdev, iomap[i]); pci_release_region(pdev, i); @@ -438,7 +442,7 @@ void pcim_iounmap_regions(struct pci_dev *pdev, int mask) return; for (i = 0; i < PCIM_IOMAP_MAX; i++) { - if (!(mask & (1 << i))) + if (!mask_contains_bar(mask, i)) continue; pcim_iounmap(pdev, iomap[i]);