From: "Andrey Jr. Melnikov" <temnota.am@gmail.com>
To: linux-kernel@vger.kernel.org
Cc: linux-scsi@vger.kernel.org
Subject: Re: [PATCH 1/1] scsi: aacraid: resurrect correct arc ctrl checks for Series-6
Date: Sun, 7 Jul 2019 13:09:39 +0300 [thread overview]
Message-ID: <10t8vf-fq.ln1@banana.localnet> (raw)
In-Reply-To: <20190627161408.10295-2-khorenko@virtuozzo.com>
In gmane.linux.scsi Konstantin Khorenko <khorenko@virtuozzo.com> wrote:
> This partially reverts ms commit
> 395e5df79a95 ("scsi: aacraid: Remove reference to Series-9")
> The patch above not only drops Series-9 cards checks but also
> changes logic for Series-6 controllers which leads to controller
> hangs/resets under high io load.
> So revert to original arc ctrl checks for Series-6 controllers.
> https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1777586
> https://bugzilla.redhat.com/show_bug.cgi?id=1724077
> https://jira.sw.ru/browse/PSBM-95736
> Fixes: 395e5df79a95 ("scsi: aacraid: Remove reference to Series-9")
> Cc: stable@vger.kernel.org
> Signed-off-by: Konstantin Khorenko <khorenko@virtuozzo.com>
> ---
> drivers/scsi/aacraid/aacraid.h | 11 -----------
> drivers/scsi/aacraid/comminit.c | 14 ++++++++++----
> drivers/scsi/aacraid/commsup.c | 4 +++-
> drivers/scsi/aacraid/linit.c | 7 +++++--
> 4 files changed, 18 insertions(+), 18 deletions(-)
> diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
> index 3fa03230f6ba..b674fb645523 100644
> --- a/drivers/scsi/aacraid/aacraid.h
> +++ b/drivers/scsi/aacraid/aacraid.h
> @@ -2729,17 +2729,6 @@ int _aac_rx_init(struct aac_dev *dev);
> int aac_rx_select_comm(struct aac_dev *dev, int comm);
> int aac_rx_deliver_producer(struct fib * fib);
>
> -static inline int aac_is_src(struct aac_dev *dev)
> -{
> - u16 device = dev->pdev->device;
> -
> - if (device == PMC_DEVICE_S6 ||
> - device == PMC_DEVICE_S7 ||
> - device == PMC_DEVICE_S8)
> - return 1;
> - return 0;
> -}
> -
Why remove helper?
> static inline int aac_supports_2T(struct aac_dev *dev)
> {
> return (dev->adapter_info.options & AAC_OPT_NEW_COMM_64);
> diff --git a/drivers/scsi/aacraid/comminit.c b/drivers/scsi/aacraid/comminit.c
> index d4fcfa1e54e0..b8046b6c1239 100644
> --- a/drivers/scsi/aacraid/comminit.c
> +++ b/drivers/scsi/aacraid/comminit.c
> @@ -41,7 +41,9 @@ static inline int aac_is_msix_mode(struct aac_dev *dev)
> {
> u32 status = 0;
>
> - if (aac_is_src(dev))
> + if (dev->pdev->device == PMC_DEVICE_S6 ||
> + dev->pdev->device == PMC_DEVICE_S7 ||
> + dev->pdev->device == PMC_DEVICE_S8)
> status = src_readl(dev, MUnit.OMR);
> return (status & AAC_INT_MODE_MSIX);
> }
> @@ -349,7 +351,8 @@ int aac_send_shutdown(struct aac_dev * dev)
> /* FIB should be freed only after getting the response from the F/W */
> if (status != -ERESTARTSYS)
> aac_fib_free(fibctx);
Fix this
> - if (aac_is_src(dev) &&
> + if ((dev->pdev->device == PMC_DEVICE_S7 ||
> + dev->pdev->device == PMC_DEVICE_S8) &&
> dev->msi_enabled)
> aac_set_intx_mode(dev);
> return status;
> @@ -605,7 +608,8 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev)
> dev->max_fib_size = status[1] & 0xFFE0;
> host->sg_tablesize = status[2] >> 16;
> dev->sg_tablesize = status[2] & 0xFFFF;
this one
> - if (aac_is_src(dev)) {
> + if (dev->pdev->device == PMC_DEVICE_S7 ||
> + dev->pdev->device == PMC_DEVICE_S8) {
> if (host->can_queue > (status[3] >> 16) -
> AAC_NUM_MGT_FIB)
> host->can_queue = (status[3] >> 16) -
> @@ -624,7 +628,9 @@ struct aac_dev *aac_init_adapter(struct aac_dev *dev)
> pr_warn("numacb=%d ignored\n", numacb);
> }
>
> - if (aac_is_src(dev))
> + if (dev->pdev->device == PMC_DEVICE_S6 ||
> + dev->pdev->device == PMC_DEVICE_S7 ||
> + dev->pdev->device == PMC_DEVICE_S8)
> aac_define_int_mode(dev);
> /*
> * Ok now init the communication subsystem
> diff --git a/drivers/scsi/aacraid/commsup.c b/drivers/scsi/aacraid/commsup.c
> index 2142a649e865..705e003caa95 100644
> --- a/drivers/scsi/aacraid/commsup.c
> +++ b/drivers/scsi/aacraid/commsup.c
> @@ -2574,7 +2574,9 @@ void aac_free_irq(struct aac_dev *dev)
> {
> int i;
>
> - if (aac_is_src(dev)) {
> + if (dev->pdev->device == PMC_DEVICE_S6 ||
> + dev->pdev->device == PMC_DEVICE_S7 ||
> + dev->pdev->device == PMC_DEVICE_S8) {
> if (dev->max_msix > 1) {
> for (i = 0; i < dev->max_msix; i++)
> free_irq(pci_irq_vector(dev->pdev, i),
> diff --git a/drivers/scsi/aacraid/linit.c b/drivers/scsi/aacraid/linit.c
> index 644f7f5c61a2..3b7968b17169 100644
> --- a/drivers/scsi/aacraid/linit.c
> +++ b/drivers/scsi/aacraid/linit.c
> @@ -1560,7 +1560,9 @@ static void __aac_shutdown(struct aac_dev * aac)
>
> aac_adapter_disable_int(aac);
>
> - if (aac_is_src(aac)) {
> + if (aac->pdev->device == PMC_DEVICE_S6 ||
> + aac->pdev->device == PMC_DEVICE_S7 ||
> + aac->pdev->device == PMC_DEVICE_S8) {
> if (aac->max_msix > 1) {
> for (i = 0; i < aac->max_msix; i++) {
> free_irq(pci_irq_vector(aac->pdev, i),
> @@ -1835,7 +1837,8 @@ static int aac_acquire_resources(struct aac_dev *dev)
> aac_adapter_enable_int(dev);
>
>
and this.
> - if (aac_is_src(dev))
> + if (dev->pdev->device == PMC_DEVICE_S7 ||
> + dev->pdev->device == PMC_DEVICE_S8)
> aac_define_int_mode(dev);
>
> if (dev->msi_enabled)
next prev parent reply other threads:[~2019-07-07 10:43 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-27 16:14 [PATCH 0/1] aacraid: Host adapter Adaptec 6405 constantly resets under high io load Konstantin Khorenko
2019-06-27 16:14 ` [PATCH 1/1] scsi: aacraid: resurrect correct arc ctrl checks for Series-6 Konstantin Khorenko
2019-07-07 10:09 ` Andrey Jr. Melnikov [this message]
2019-07-07 23:49 ` Finn Thain
2019-07-10 9:24 ` Konstantin Khorenko
2019-07-10 9:31 ` [PATCH v2 0/2] aacraid: Host adapter Adaptec 6405 constantly resets under high io load Konstantin Khorenko
2019-07-10 9:31 ` [PATCH v2 1/2] Revert "scsi: aacraid: Remove reference to Series-9" Konstantin Khorenko
2019-07-10 9:31 ` [PATCH v2 2/2] scsi: aacraid: Remove references to Series-9 (only) Konstantin Khorenko
2019-07-12 1:30 ` Martin K. Petersen
2019-08-19 16:35 ` [PATCH v3 0/1] aacraid: Host adapter Adaptec 6405 constantly resets under high io load Konstantin Khorenko
2019-08-19 16:35 ` [PATCH v3 1/1] scsi: aacraid: resurrect correct arc ctrl checks for Series-6 Konstantin Khorenko
2019-08-29 21:52 ` [PATCH v3 0/1] aacraid: Host adapter Adaptec 6405 constantly resets under high io load Martin K. Petersen
2021-05-06 22:22 ` James Hilliard
[not found] ` <ffdb2223-eed3-75b4-a003-4e4c96b49947@grossegger.com>
2022-02-23 2:41 ` Martin K. Petersen
2022-10-10 12:31 ` James Hilliard
2022-10-19 18:00 ` Konstantin Khorenko
2022-10-26 20:10 ` James Hilliard
[not found] ` <BYAPR11MB36066925274C38555F20FB17FA339@BYAPR11MB3606.namprd11.prod.outlook.com>
2022-11-13 18:42 ` James Hilliard
2022-11-15 14:05 ` Sagar.Biradar
2022-11-16 21:55 ` James Hilliard
2022-11-18 3:36 ` Sagar.Biradar
2022-12-03 23:55 ` James Hilliard
2022-12-06 5:59 ` Sagar.Biradar
2022-12-16 20:44 ` Sagar.Biradar
2022-12-20 1:12 ` James Hilliard
2022-12-20 19:44 ` Konstantin Khorenko
2024-10-30 15:01 ` Dirk Tilger
2024-11-02 12:25 ` Christian Großegger
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=10t8vf-fq.ln1@banana.localnet \
--to=temnota.am@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®